Change final backup check to use du again, not ls -l.

Reviewed-on: #6

files/scripts/backup_system.sh

@@ -0,0 +1,57 @@
+#!/usr/bin/env bash
+
+## Variables ##
+
+if [[ -z "$HOSTNAME" ]]; then
+	echo "*** Pulling Hostname From Command ***"
+	export HOSTNAME="`hostname`"
+fi
+if [[ -z "$HOSTNAME" ]]; then
+	echo "*** Pulling Hostname From /etc/ File ***"
+	export HOSTNAME="`cat /etc/hostname`"
+fi
+
+EXTRA="$1"
+TAG="System"
+DATE="`date "+%Y%m%d-%H%M%S"`"
+BACKUP_DIR="/srv/backup"
+BASENAME="Backup"
+BACKUP="$BACKUP_DIR/$BASENAME.$DATE.$HOSTNAME.$TAG.zip"
+
+## Initialization ##
+
+echo "*** Creating Backup Directory ***"
+sudo mkdir -pv "$BACKUP_DIR"
+sudo mkdir -pv "$BACKUP_DIR/TRASH"
+sudo chmod -Rv 775 "$BACKUP_DIR"
+sudo chown -Rv root:root "$BACKUP_DIR"
+
+## Cleanup ##
+
+echo "*** Removing Old Backups ***"
+cd "$BACKUP_DIR"
+sudo mv -v "$BASENAME"*"$TAG"* TRASH/
+sudo rm -v TRASH/*
+
+## Main
+
+echo "*** Creating backup at '$BACKUP' ***"
+sudo zip -rv "$BACKUP" \
+	/etc /var/{log,mail,spool} /srv /boot \
+	/usr/local/etc $EXTRA \
+	-x "/srv/backup/*"
+status="$?"
+
+if [[ "$status" != 0 ]]; then
+	echo "*** ERROR: Failed to create '$BACKUP', file may be incorrect. ***"
+fi
+
+if [[ -e "$BACKUP" ]]; then
+	ls -alh "$BACKUP"
+	echo "*** '$BACKUP' created successfully! ***"
+else
+	echo "*** '$BACKUP' not found! ***"
+	exit 1
+fi
+
+exit 0

tasks/general/acct_mgmt/provision_config.yml

@@ -132,7 +132,7 @@
     pentesting: "{{ lookup('ini', 'pentesting file={{gen_file}} default=false') | bool }}"
     no_telem:   "{{ lookup('ini', 'no_telem   file={{gen_file}} default=false') | bool }}"
     battery:    "{{ lookup('ini', 'battery    file={{gen_file}} default=false') | bool }}"
-    swap_block: "{{ lookup('ini', 'swap_block file={{gen_file}} default=false') | bool }}"
+    swap_block: "{{ lookup('ini', 'swap_block file={{gen_file}} default=false') }}"
     swap_count: "{{ lookup('ini', 'swap_count file={{gen_file}} default=1') }}"
     swap_file:  "{{ lookup('ini', 'swap_file  file={{gen_file}} default=/swapfile') }}"
     sshd_port:  "{{ lookup('ini', 'sshd_port  file={{gen_file}} default=22') }}"
@@ -215,7 +215,7 @@
     workstation: "{{ lookup('ini', 'enable  file={{wrk_file}} default=false') | bool }}"
     coding:      "{{ lookup('ini', 'coding  file={{wrk_file}} default=false') | bool }}"
     sdks:        "{{ lookup('ini', 'sdks    file={{wrk_file}} default=false') | bool }}"
-    editing:     "{{ lookup('ini', 'editing file={{wrk_file}} default=false') | bool }}"
+    editing:     "{{ lookup('ini', 'editing file={{wrk_file}} default=false') }}"
     gaming:      "{{ lookup('ini', 'gaming  file={{wrk_file}} default=false') | bool }}"
     rdp:         "{{ lookup('ini', 'rdp     file={{wrk_file}} default=false') | bool }}"
     vnc:         "{{ lookup('ini', 'vnc     file={{wrk_file}} default=false') | bool }}"

tasks/general/acct_mgmt/users.yml

@@ -283,6 +283,19 @@
       alias edit-config-wrk="sudo $EDITOR {{ wrk_file }}"
       alias edit-config-mnr="sudo $EDITOR {{ mnr_file }}"
       alias edit-config-srv="sudo $EDITOR {{ srv_file }}"
+    function_clean_trashed: |
+      function clean-trashed {
+        dir="$1"
+        if [[ -z $dir ]]; then
+          dir="./"
+        fi
+        cd $dir
+        dir="`pwd`"
+        echo "Removing '.trashed*' files in '$dir'."
+        find "$dir" -name ".trashed*" -exec du -h {} \; -delete | sort -h
+      }
+      alias trashed-cleanup="clean-trashed"
+      alias trashed-clean="clean-trashed"
     function_check_trash: |
       function check-trash() {
         unset OPTIND
@@ -378,6 +391,9 @@
         fi
         echo "Checking but not cleaning /var/mail..."
         du -ha /var/mail | sort -h
+        if [[ $clean == "Y" ]]; then
+          clean-trashed "~/"
+        fi
         return 0
       }
       alias check_trash="check-trash"
@@ -386,18 +402,20 @@
     alias_trash_clean: alias trash-clean='trash-check --clean'
     alias_clean_dir: |
       function clean-dir() {
+        sudo du -hs
         clean_dir="`date '+%Y%m%d_%H%M%S'`_CLEANED"
         trash_dir="$HOME/TRASH/$clean_dir"
         curr_dir="`pwd`"
         mkdir -pv "$trash_dir"
         echo "$curr_dir is being cleaned at `date`." | tee "$trash_dir"/INFO.txt
         mv -v ..?* .[!.]* * "$trash_dir"/ | tee -a "$trash_dir"/INFO.txt
+        sudo du -hs
       }
     function_clean: |
       function clean() {
-        sudo du -hs
-        clean-dir
-        sudo du -hs
+        clean-trash
+        clean-code
+        clean-backups
       }
     function_flatpak_usage: |
       function flatpak-usage() {
@@ -546,6 +564,16 @@
           echo -e "\n*** `basename $project` ***"
           cd $project
           if [[ -d .git ]]; then
+            git ls-remote --exit-code --heads origin dev
+            dev_exists="$?"
+            if [[ "$dev_exists" == 0 ]]; then
+              git switch dev
+            elif [[ "$dev_exists" == 2 ]]; then
+              git switch main
+            else
+              echo "ERROR: Unknown status for dev_exists, '$dev_exists'."
+              continue
+            fi
             git pull
             git push
           else
@@ -577,6 +605,11 @@
           env-obtainium-hyperling dev
           nodejs-website dev
           ebook-health-protocol dev
+          ebook-freedom-flyer dev
+          ebook-technology-alternatives dev
+          ebook-narcissism-healing dev
+          ebook-forest-howto dev
+          ebook-template main
           flutter-expense-tracker dev
           flutter-social-traveler-app dev
           nodejs-social-traveler-server dev
@@ -682,6 +715,9 @@
         done
         cd
 
+        echo -e "******* PDFs *******"
+        find ~/Code/ebook-* -name "*.pdf" -exec du -h {} \; -delete | sort -h
+
         echo -e "\n*** Done! ***"
       }
       alias code-clean="clean-code"
@@ -742,6 +778,7 @@
     alias_ls: |
       alias l='ls'
       alias ll='ls -alh'
+      alias lh='ls -ash'
     alias_progs: |
       alias progs='ps -ef'
     alias_nethogs: |
@@ -750,47 +787,101 @@
       alias ansible-facts='ansible localhost -m setup --connection=local'
     function_now: |
       function now {
-        date "+%Y%m%d_%H%M%S"
+        date "+%Y%m%d-%H%M%S"
+      }
+      function today {
+        date "+%Y%m%d"
       }
     function_backup: |
+      export BACKUP_DIR="/srv/backup"
       function backup {
-        EXTRA="$1"
-        BACKUP_DIR="/tmp"
-        BACKUP_FILENAME="Backup-`now`.zip"
-        BACKUP="$BACKUP_DIR/$BACKUP_FILENAME"
-        echo "*** Creating backup at '$BACKUP' ***"
-        sudo zip -rv "$BACKUP" \
-          /etc /var/{log,mail,spool} /srv /boot \
-          /usr/local/etc $EXTRA
+        /usr/local/bin/backup_system.sh
+      }
+      alias backup-system="backup"
+      alias system-backup="backup"
+      alias check-backups="ll $BACKUP_DIR"
+      function clean-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 "*** ERROR: Failed to create '$BACKUP', file may be incorrect. ***"
-        fi
-        if [[ -e "$BACKUP" ]]; then
-          ls -alh "$BACKUP"
-          echo "*** '$BACKUP' created successfully! ***"
+        if [[ "$status" == "0" ]]; then
+          echo "File already downloaded, skipping."
+          return 0
         else
-          echo "*** '$BACKUP' not found! ***"
+          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"
+      }
+      function blog {
+        echo -e "\n\n$1\n\n"
       }
     function_debian_upgrade: |
       function debian-upgrade {
         typeset -l OLD NEW
         OLD="$1"
         NEW="$2"
-        echo "*** Upgrading from '$OLD' to '$NEW' ***"
+        blog "*** Upgrading from '$OLD' to '$NEW' ***"
         if [[ -z "$OLD" || -z "$NEW" ]]; then
           echo -n "ERROR: Please pass the OLD and NEW version names"
           echo ", such as 'debian-upgrade bookworm trixie'. "
           return 1
         fi
 
-        echo "*** Running 'backup' before starting upgrade. ***"
+        blog "*** Running 'backup' before starting upgrade. ***"
         sleep 1
 
         backup
 
-        echo "*** Listing the current apt listing for '$OLD' ***"
+        blog "*** Listing the current apt listing for '$OLD' ***"
         sudo grep "$OLD" /etc/apt/sources.list /etc/apt/sources.list.d/*
 
         echo -en "\nAre these the entries you'd like changed to '$NEW'? (y/N) "
@@ -798,49 +889,130 @@
         read confirm_change
 
         if [[ -z "$confirm_change" || "$confirm_change" == "N"* ]]; then
-          echo "*** Aborting upgrade, change rejected. ***"
+          blog "*** Aborting upgrade, change rejected. ***"
           return 1
         fi
         unset confirm_change
 
-        echo "*** Continuing with upgrade. ***"
+        blog "*** Continuing with upgrade. ***"
         sudo sed -i "s/$OLD/$NEW/g" /etc/apt/sources.list
-        find /etc/apt/sources.list.d -name "*.list" \
+        find /etc/apt/sources.list.d/ -name "*.list" \
+          -exec sudo sed -i "s/$OLD/$NEW/g" {} \;
+        find /etc/apt/sources.list.d/ -name "*.sources" \
           -exec sudo sed -i "s/$OLD/$NEW/g" {} \;
 
-        sudo grep $OLD /etc/apt/sources.list /etc/apt/sources.list.d/*
-        sudo grep $NEW /etc/apt/sources.list /etc/apt/sources.list.d/*
+        sudo grep $OLD /etc/apt/sources.list /etc/apt/sources.list.d/*.{list,sources}
+        sudo grep $NEW /etc/apt/sources.list /etc/apt/sources.list.d/*.{list,sources}
 
         echo -en "\nDo the source files look correct? (y/N) "
         typeset -u confirm_correct
         read confirm_correct
 
         if [[ -z "$confirm_correct" || "$confirm_correct" == "N"* ]]; then
-          echo "*** Aborting upgrade, confirmation rejected. ***"
+          blog "*** Aborting upgrade, confirmation rejected. ***"
           return 1
         fi
         unset confirm_correct
 
-        echo "*** Starting the upgrade. ***"
+        blog "*** Starting the upgrade. ***"
         sleep 1
 
         sudo apt update
         sudo apt upgrade --without-new-pkgs
 
-        echo "*** Upgrades complete, now add new packages. ***"
+        blog -e "*** Upgrades complete, now add new packages. ***"
         sleep 1
         sudo apt full-upgrade
 
-        echo "*** New packages complete, clean apt files. ***"
+        blog "*** New packages complete, clean apt files. ***"
         sleep 1
         sudo apt autoremove --purge
         sudo apt clean
 
-        echo "*** All done! '$OLD' is now '$NEW'. Please reboot. ***"
+        blog "*** All done! '$OLD' is now '$NEW'. Please reboot. ***"
         sleep 1
         unset OLD NEW
       }
       alias upgrade-debian="debian-upgrade"
+    function_ebook_convert: |
+      # Regenerate all eBook projects at once.
+      function ebook-convert {
+        find ~/Code/ebook-* -name "*.pdf" -print -delete
+        find ~/Code/ebook-* -name convert.sh -print -exec bash "{}" \;
+      }
+      alias ebooks="ebook-convert"
+      alias convert="ebook-convert"
+    alias_sudo: |
+      # Allows for alias expansions when using sudo, such as doing "sudo ll".
+      alias sudo="sudo "
+    function_load_branch: |
+      # Change a branch to point at another.
+      function load-branch {
+        rcvr="$1" # branch which we want to modify
+        base="$2" # branch with the changes we want
+
+        if [[ "$rcvr" == "main" ]]; then
+          echo "*** ERROR: Are you nuts, fool!? Not main! Do it manually! ***"
+          exit 1
+        fi
+
+        if [[ -z "$base" ]]; then
+          if [[ "$rcvr" == "prod" ]]; then
+            base="stage"
+          elif [[ "$rcvr" == "stage" ]]; then
+            base="dev"
+          else
+            echo "* Unsure which branch to use for '$rcvr'. Please specify."
+            exit 1
+          fi
+          echo "* Base was not specified, using '$base' for '$rcvr'."
+        else
+          echo "* Requested pointing '$rcvr' branch to '$base'."
+        fi
+
+        echo -e "\n* Ensuring we are on base branch '$base'." &&
+        git switch "$base" &&
+        echo -e "\n* Changing pointer for '$rcvr' to '$base'." &&
+        git branch -f "$rcvr" "$base" &&
+        #echo -e "\n* Switching to branch '$rcvr'." &&
+        #git switch "$rcvr" &&
+        echo -e "\n* Forcing push on branch '$rcvr'." &&
+        git push --force --set-upstream origin "$rcvr" &&
+        echo -e "\n* Done! Displaying list of remote branches." &&
+        git ls-remote --heads | sort
+
+        if [[ "$base" != "dev" ]]; then
+          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."
+        git branch
+      }
+      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 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:
@@ -878,6 +1050,7 @@
       {{ metasploit_aliases }}
       {{ show_config_aliases }}
       {{ edit_config_aliases }}
+      {{ function_clean_trashed }}
       {{ function_check_trash }}
       {{ function_clean }}
       {{ function_flatpak_usage }}
@@ -911,7 +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

@@ -1,12 +1,18 @@
 ---
 # Jobs relating to the ansible user.
 
+# $RANDOM is anywhere from 0 to 32767 in BASH. This would be up to ~9 hours.
+# $RANDOM /  10 can be up to about 3200 seconds, or ~55 minutes.
+# $RANDOM /  20 can be up to about 1600 seconds, or ~27 minutes.
+# $RANDOM /  50 can be up to about  650 seconds, or ~11 minutes.
+# $RANDOM / 100 can be up to about  320 seconds, or  ~5 minutes.
+# This prevents multiple systems from hitting it at the exact same time.
 - name: General | Cron | Ansible | Create Subscriber Job
   cron:
     user: ansible
     name: "Ansible Sync"
     minute: "*/30"
-    job: "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' }}"
 
@@ -14,7 +20,7 @@
   cron:
     user: ansible
     name: "Ansible Weekly Forced Sync"
-    special_time: weekly
-    job: "{{ user_root.home }}/bin/scm.sh"
+    special_time: daily
+    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/general/software/services.yml

@@ -120,3 +120,10 @@
   until: ntp_status.state == "started"
   retries: 3
   delay: 3
+
+## Timezone ##
+
+# TBD/TODO:
+# Add a field to general.yml config file which gets applied via timedatectl and /etc/localtime.
+# Example of what to do to file:
+#    /etc/localtime -> ../usr/share/zoneinfo/America/Phoenix

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'