refactor: update skeleton and scripts

setup.sh

@@ -19,30 +19,23 @@ fi
 
 ## MAIN
 
-if ! [ -d "/neb" ]; then
+if ! [ -f "/etc/ixvd/version" ]; then
-    echo "setting up ixvd/neb repo"
+    echo "applying overlay..."
-    git clone \
+    cp -r skel /
-        --recurse-submodules \
+fi
-        git@git.ixvd.net:ixvd/neb \
+
-        /neb
+if ! [ -d "/etc/ixvd/secrets" ]; then
+    echo "setting up ixvd/secrets"
+    git clone git@git.ixvd.net/ixvd/secrets /etc/ixvd/secrets
 fi
 
 if ! [ -f "/root/.ssh/authorized_keys" ]; then
     echo "importing authorized_keys..."
     mkdir -p /root/.ssh
-    cp secrets/ssh/authorized_keys /root/.ssh/authorized_keys
+    cp /etc/ixvd/secrets/ssh/authorized_keys /root/.ssh/authorized_keys
 else
     if ! grep -q "# IXVD keys" /root/.ssh/authorized_keys; then
         echo "importing authorized_keys..."
-        cat secrets/ssh/authorized_keys >> /root/.ssh/authorized_keys
+        cat /etc/ixvd/secrets/ssh/authorized_keys >> /root/.ssh/authorized_keys
     fi
-fi
+fi
-
-mkdir -p /etc/cron.d
-cd common/cron
-for cronfile in *.crontab; do
-    [ -f "/etc/cron.d/$cronfile" ] && continue
-    echo "installing $cronfile..."
-    cp $cronfile /etc/cron.d/$cronfile
-done
-cd $ORIGIN_PWD

skel/etc/cron.d/restic.crontab

@@ -1,10 +1,10 @@
 # /etc/cron.d/restic.crontab
 
 # every 4 hours create a backup
-0 */4 * * * root /neb/common/restic/backup.sh
+0 */4 * * * root /opt/scripts/restic/backup.sh
 
 # every day at 2 in the morning, forget old backups
-0 2 * * * root /neb/common/restic/forget.sh
+0 2 * * * root /opt/scripts/restic/forget.sh
 
 # every 1st of the month at 2 in the morning, prune
-50 2 1 * * root /neb/common/restic/prune.sh
+50 2 1 * * root /opt/scripts/restic/prune.sh

skel/etc/ixvd/version

@@ -0,0 +1 @@
+1

skel/opt/scripts/restic/backup.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ntfy() {
-    sh /opt/ixvd/ntfy.sh -s "/neb/secrets/ntfy/ixvd-backups" -u "https://push.ixvd.net/ixvd-backups" "$@"
+    sh /opt/scripts/ntfy.sh -s "/neb/secrets/ntfy/ixvd-backups" -u "https://push.ixvd.net/ixvd-backups" "$@"
 }
 
 ntfy -m "performing backup..."

skel/opt/scripts/restic/forget.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ntfy() {
-    sh /opt/ixvd/ntfy.sh -s "/neb/secrets/ntfy/ixvd-backups" -u "https://push.ixvd.net/ixvd-backups" "$@"
+    sh /opt/scripts/ntfy.sh -s "/neb/secrets/ntfy/ixvd-backups" -u "https://push.ixvd.net/ixvd-backups" "$@"
 }
 
 ntfy -m "forgetting old backups..."

skel/opt/scripts/restic/prune.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ntfy() {
-    sh /opt/ixvd/ntfy.sh -s "/neb/secrets/ntfy/ixvd-backups" -u "https://push.ixvd.net/ixvd-backups" "$@"
+    sh /opt/scripts/ntfy.sh -s "/neb/secrets/ntfy/ixvd-backups" -u "https://push.ixvd.net/ixvd-backups" "$@"
 }
 
 ntfy -m "pruning old backups..."