chore: Move backup and sync into aws/

Author: jpmckinney

docs/develop/style/pillar.rst

@@ -16,7 +16,7 @@ Order the top-level keys in these layers:
    -  Time: ``ntp``
    -  Monitoring: ``netdata``, ``prometheus``
    -  Logging: ``rsyslog``, ``logrotate``
-   -  Scheduling: ``cron``, ``backup``
+   -  Scheduling: ``cron``, ``backup``, ``sync``
 
 -  Application services
 

salt/backup/init.sls salt/aws/backup.slssalt/backup/init.sls renamed to salt/aws/backup.sls

@@ -7,7 +7,7 @@ include:
 
 /home/sysadmin-tools/bin/site-backup-to-s3.sh:
   file.managed:
-    - source: salt://backup/files/site-backup-to-s3.sh
+    - source: salt://aws/backup/files/site-backup-to-s3.sh
     - mode: 750
     - require:
       - file: /home/sysadmin-tools/bin

salt/backup/files/site-backup-to-s3.sh salt/aws/files/site-backup-to-s3.shsalt/backup/files/site-backup-to-s3.sh renamed to salt/aws/files/site-backup-to-s3.sh

@@ -7,7 +7,7 @@ include:
 
 /home/sysadmin-tools/bin/sync-to-s3.sh:
   file.managed:
-    - source: salt://sync/files/sync-to-s3.sh
+    - source: salt://aws/sync/files/sync-to-s3.sh
     - mode: 750
     - require:
       - file: /home/sysadmin-tools/bin

salt/sync/files/sync-to-s3.sh salt/aws/files/sync-to-s3.shsalt/sync/files/sync-to-s3.sh renamed to salt/aws/files/sync-to-s3.sh

@@ -85,10 +85,10 @@ base:
     - nginx.cloudflare
 
   'I@backup:*':
-    - backup
+    - aws.backup
 
   'I@sync:*':
-    - sync
+    - aws.sync
 
   'I@cron:*':
     - cron