Create the config directory so that tee can create the files.

setup.sh

@@ -9,13 +9,18 @@ LOCAL=$DIR/local.yml
 URL="https://git.hyperling.com/me/env-ansible"
 BRANCH="main"
 
+config_dir="/usr/local/etc/hyperling-scm"
+general_config="$config_dir/general.ini"
+workstation_config="$config_dir/workstation.ini"
+server_config="$config_dir/server.ini"
+
 ## Functions ##
 
 # Accepts 1 parameter, it is used as the exit status.
 function usage {
 	cat <<- EOF
 
-	  $PROG [-l] [-b branch_name] [-h]
+	  $PROG [-l] [-b branch_name] [-g] [-w] [-s] [-h]
 	    Program to initialize synchronization with Hyperling's Ansible configuration.
 	      $URL
 
@@ -23,7 +28,10 @@ function usage {
 	      -l : Run the local playbook associated with this $PROG.
 	             This is helpful for development or just saving bandwidth.
 	             It also provides prettier colors than the plaintext from ansible-pull. ;)
-	      -b branch_name: Download and run a specific branch. Default is $BRANCH.
+	      -b branch_name : Download and run a specific branch. Default is $BRANCH.
+	      -g : Enable the General config with test contents.
+	      -w : Enable the Workstation config with test contents.
+	      -s : Enable the Server config with test contents.
 	      -h : Display this help text
 
 	EOF
@@ -32,10 +40,13 @@ function usage {
 
 ## Parameter Parsing ##
 
-while getopts ":lb:h" arg; do
+while getopts ":lb:gwsh" arg; do
 	case $arg in
 		l) local="Y" && echo "Running $LOCAL as the playbook." ;;
 		b) branch="$OPTARG" && echo "Using branch $branch instead of $BRANCH." ;;
+		g) create_general="Y" && echo "Requested '$general_config'." ;;
+		w) create_workstation="Y" && echo "Requested '$workstation_config'." ;;
+		s) create_server="Y" && echo "Requested '$server_config'." ;;
 		h) usage ;;
 		*) echo "ERROR: Parameter $OPTARG was not recognized." && usage 1 ;;
 	esac
@@ -47,15 +58,32 @@ if [[ ! -z $1 && $1 != "-"* ]]; then
 	usage 1
 fi
 
-if [[ $branch == "" ]]; then
+if [[ -z "$local" && "$branch" == "" ]]; then
 	echo "Using default branch $BRANCH."
 	branch="$BRANCH"
 fi
 
+if [[ -n "$create_general" && -f "$general_config" ]]; then
+	echo "WARNING: General configuration already exists, will not overwrite."
+	ls -lh "$general"
+fi
+if [[ -n "$create_workstation" && -f "$workstation_config" ]]; then
+	echo "WARNING: Workstation configuration already exists, will not overwrite."
+	ls -lh "$workstation_config"
+fi
+if [[ -n "$create_server" && -f "$server_config" ]]; then
+	echo "WARNING: Server configuration already exists, will not overwrite."
+	ls -lh "$server_config"
+fi
+
 ## Main ##
 
 os="$(cat /etc/os-release)"
-os="$os $(uname -a)"
+if [[ ! -f /.dockerenv ]]; then
+	# If we are not in a Docker container, also check what the kernel says.
+	os="$os $(uname -a)"
+	# Docker containers use the host kernel which gives an incorrect reading.
+fi
 
 echo "Making sure all necessary packages are installed..."
 if [[ `which ansible > /dev/null; echo $?` != 0 ]]; then
@@ -101,6 +129,53 @@ echo "Installed!"
 #ansible-galaxy collection install community.general
 #echo "Added!"
 
+# Create basic layouts if configs do not exist and are requested.
+if [[ -n "$create_general"
+	|| -n "$create_workstation"
+	|| -n "$create_server" ]]
+then
+	sudo mkdir -pv "$config_dir"
+fi
+if [[ -n "$create_general" && ! -f "$general_config" ]]; then
+	function print_general_contents {
+		cat <<- EOF
+			; TEST DATA
+			enable=true
+			user=test
+			user_desc=Test
+			branch=$branch
+			; TEST DATA
+		EOF
+	}
+	print_general_contents | sudo tee "$general_config"
+	ls -lh "$general_config"
+fi
+if [[ -n "$create_workstation" && ! -f "$workstation_config" ]]; then
+	function print_workstation_contents {
+		cat <<- EOF
+			; TEST DATA
+			enable=true
+			coding=true
+			editing=false
+			gaming=false
+			; TEST DATA
+		EOF
+	}
+	print_workstation_contents | sudo tee "$workstation_config"
+	ls -lh "$workstation_config"
+fi
+if [[ -n "$create_server" && ! -f "$server_config" ]]; then
+	function print_server_contents {
+		cat <<- EOF
+			; TEST DATA
+			enable=true
+			; TEST DATA
+		EOF
+	}
+	print_server_contents | sudo tee "$server_config"
+	ls -lh "$server_config"
+fi
+
 echo "Provisioning Ansible..."
 if [[ $local == "Y" ]]; then
 	sudo ansible-playbook $LOCAL

tasks/general/acct_mgmt/users.yml

@@ -793,16 +793,70 @@
         date "+%Y%m%d"
       }
     function_backup: |
+      export BACKUP_DIR="/srv/backup"
       function backup {
         /usr/local/bin/backup_system.sh
       }
       alias backup-system="backup"
       alias system-backup="backup"
-      alias check-backups="ll /srv/backup"
+      alias check-backups="ll $BACKUP_DIR"
       function clean-backup {
-        sh -c "rm -rfv /srv/backup/*"
+        sh -c "rm -rfv $BACKUP_DIR/*"
       }
       alias clean-backups="clean-backup"
+    function_pull_prod_backups: |
+      export DOCKER="Docker"
+      export SYSTEM="System"
+      function pull_prod_backup {
+        if [[ -z "$1" || ("$1" != "$DOCKER" && "$1" != "$SYSTEM") ]]; then
+          echo "ERROR: Parameter 1 not correct, expecting '$DOCKER' or '$SYSTEM'."
+          return 1
+        fi
+        backup_type="$1"
+        echo "Looking for '*${backup_type}*.zip'"
+        ls -lh *${backup_type}*.zip 2>/dev/null
+        status="$?"
+        if [[ "$status" == "0" ]]; then
+          echo "File already downloaded, skipping."
+          return 0
+        else
+          echo "File still needed, downloading to local tmp/."
+        fi
+        mkdir -pv tmp
+        scp -P {{ prod_port }} \
+          {{ prod_user }}@{{ prod_host }}:"$BACKUP_DIR/*${backup_type}*.zip" \
+          tmp/
+        if [[ "$?" == "0" ]]; then
+          echo "Succeeded!"
+          mv -v tmp/*.zip ./
+          rmdir -v tmp
+        else
+          echo "Failed!"
+          mv tmp ~/TRASH/"tmp_`now`"
+        fi
+      }
+      function pull_prod_backups {
+        dir="ProductionBackups-Pulled`today`"
+        mkdir -pv "$dir"
+        cd "$dir"
+        pull_prod_backup "$DOCKER"
+        pull_prod_backup "$SYSTEM"
+        du -h *.zip | sort -h
+        status="$?"
+        cd ..
+        if [[ "$status" != 0 ]]; then
+          echo "Failed to find zip files, removing folder."
+          rmdir -v "$dir"
+          return 1
+        fi
+        echo "Done!"
+      }
+      alias pull-prod-backups="pull_prod_backups"
+      alias pull-backups="pull_prod_backups"
+      alias prod-backups="pull_prod_backups"
+      alias prod-backup="pull_prod_backups"
+      alias pull-prod="pull_prod_backups"
+      alias prod-pull="pull_prod_backups"
     function_log: |
       function log {
         echo -e "$1"
@@ -928,8 +982,18 @@
         git ls-remote --heads | sort
 
         if [[ "$base" != "dev" ]]; then
-          echo -e "\n* Switching back to dev."
-          git switch "$base"
+          echo -e "\n* Checking if a dev branch exists."
+          git ls-remote --exit-code --heads origin dev
+          dev_exists="$?"
+          if [[ "$dev_exists" == 0 ]]; then
+            echo -e "\n* Switching back to dev."
+            git switch dev
+          elif [[ "$dev_exists" == 2 ]]; then
+            echo -e "\n* Switching back to main."
+            git switch main
+          else
+            echo "*** ERROR: Unknown status for dev_exists, '$dev_exists'. ***"
+          fi
         fi
 
         echo -e "\n* Verifying which branch we're on."
@@ -938,8 +1002,17 @@
       alias load-prod="load-branch prod"
       alias load-stage="load-branch stage"
       alias rollback-prod="load-branch prod main"
-      alias rollback-stage="load-branch stage main"
-      alias rollback-dev="load-branch dev main"
+      alias rollback-stage="load-branch stage prod"
+      alias rollback-dev="load-branch dev stage"
+      alias reset-prod="load-branch prod main"
+      alias reset-stage="load-branch stage main"
+      alias reset-dev="load-branch dev main"
+    alias_reload_bash: |
+      alias reload-bash="source ~/.bashrc"
+      alias bash-reload="reload-bash"
+      alias shell-reload="reload-bash"
+      alias reload-shell="reload-bash"
+      alias reload="reload-bash"
 
 - name: General | Account Management | Users | Files | Common Variable
   set_fact:
@@ -1011,11 +1084,13 @@
       {{ alias_ansible_facts }}
       {{ function_now }}
       {{ function_backup }}
+      {{ function_pull_prod_backups }}
       {{ function_log }}
       {{ function_debian_upgrade }}
       {{ function_ebook_convert }}
       {{ alias_sudo }}
       {{ function_load_branch }}
+      {{ alias_reload_bash }}
 
 - name: General | Account Management | Users | Files | .bashrc
   blockinfile:

tasks/general/cron/ansible.yml

@@ -12,7 +12,7 @@
     user: ansible
     name: "Ansible Sync"
     minute: "*/30"
-    job: "sleep $(( $RANDOM / 20 )); sudo {{ ansible_pull_exec.stdout }} -v -o -U {{ git_repo_http }} --checkout {{ branch }}"
+    job: "bash -c 'sleep $(( $RANDOM / 20 )); sudo {{ ansible_pull_exec.stdout }} -v -o -U {{ git_repo_http }} --checkout {{ branch }}'"
     state: present
     disabled: "{{ 'yes' if no_telem else 'no' }}"
 
@@ -21,6 +21,6 @@
     user: ansible
     name: "Ansible Weekly Forced Sync"
     special_time: daily
-    job: "sleep $(( $RANDOM /  1 )); sudo {{ ansible_pull_exec.stdout }} -v    -U {{ git_repo_http }} --checkout {{ branch }}"
+    job: "bash -c 'sleep $(( $RANDOM /  1 )); sudo {{ ansible_pull_exec.stdout }} -v    -U {{ git_repo_http }} --checkout {{ branch }}'"
     state: present
     disabled: "{{ 'yes' if no_telem else 'no' }}"

tasks/workstation/linux/software/flatpaks.yml

@@ -43,6 +43,7 @@
       - { app: "org.gimp.GIMP", name: "gimp", extra: "" }
       - { app: "org.libreoffice.LibreOffice", name: "office", extra: "" }
       - { app: "com.transmissionbt.Transmission", name: "transmission", extra: "" }
+      - { app: "app.grayjay.Grayjay", name: "grayjay", extra: "" }
     flatpaks_coding:
       - { app: "com.vscodium.codium", name: "codium-flatpak", extra: "" }
       - { app: "com.google.AndroidStudio", name: "android-studio", extra: "" }

tasks/workstation/shared/settings/gnome.yml

@@ -19,6 +19,7 @@
                       , 'codium.desktop'
                       , 'org.shotcut.Shotcut.desktop'
                       , 'io.lmms.LMMS.desktop'
+                      , 'app.grayjay.Grayjay.desktop'
                       , 'io.lbry.lbry-app.desktop', 'lbry.desktop'
                       , 'com.valvesoftware.Steam.desktop'
                       , 'net.lutris.Lutris.desktop'