.forgejo/workflows/deploy-preprod.yml

@@ -37,28 +37,18 @@ jobs:
         run: |
           cd dist
 
-          echo "Deploying site/"
+          rsync_deploy() {
-          sshpass -p "$PASSWORD" rsync -az --delete -O \
+            local src=$1
-            --include 'accounts/' \
+            local dst=$2
-            --exclude 'accounts/*' \
+            local exclude=$3
-            --include 'sessions/' \
+            cmd="sshpass -p \"$PASSWORD\" rsync -az --delete -O"
-            --exclude 'sessions/*' \
+            [[ -n $exclude ]] && cmd="$cmd $exclude"
-            --include 'cache/' \
+            cmd="$cmd -e 'ssh -p 2244 -o StrictHostKeyChecking=no' $src $USERNAME@$HOST:$dst"
-            --exclude 'cache/*' \
+            echo "Deploying $src to $dst"
-            -e 'ssh -p 2244 -o StrictHostKeyChecking=no' \
+            eval $cmd
-            site/ $USERNAME@$HOST:$PREPROD_PATH/site/
+          }
 
-          echo "Deploying vendor/"
+          rsync_deploy site/ "$PREPROD_PATH/site/" "--exclude 'accounts/' --exclude 'cache/' --exclude 'sessions/'"
-          sshpass -p "$PASSWORD" rsync -az --delete -O \
+          rsync_deploy vendor/ "$PREPROD_PATH/vendor/"
-            -e 'ssh -p 2244 -o StrictHostKeyChecking=no' \
+          rsync_deploy kirby/ "$PREPROD_PATH/kirby/"
-            vendor/ $USERNAME@$HOST:$PREPROD_PATH/vendor/
+          rsync_deploy assets/ "$PREPROD_PATH/assets/" "--exclude 'tiles/'"
-
-          echo "Deploying kirby/"
-          sshpass -p "$PASSWORD" rsync -az --delete -O \
-            -e 'ssh -p 2244 -o StrictHostKeyChecking=no' \
-            kirby/ $USERNAME@$HOST:$PREPROD_PATH/kirby/
-
-          echo "Deploying assets/"
-          sshpass -p "$PASSWORD" rsync -az --delete -O \
-            -e 'ssh -p 2244 -o StrictHostKeyChecking=no' \
-            assets/ $USERNAME@$HOST:$PREPROD_PATH/assets/

.forgejo/workflows/deploy-prod.yml

@@ -37,28 +37,18 @@ jobs:
         run: |
           cd dist
 
-          echo "Deploying site/"
+          rsync_deploy() {
-          sshpass -p "$PASSWORD" rsync -az --delete -O \
+            local src=$1
-            --exclude 'accounts/*' \
+            local dst=$2
-            --exclude 'cache/*' \
+            local exclude=$3
-            --exclude 'sessions/*' \
+            cmd="sshpass -p \"$PASSWORD\" rsync -az --delete -O"
-            --include 'accounts/' \
+            [[ -n $exclude ]] && cmd="$cmd $exclude"
-            --include 'cache/' \
+            cmd="$cmd -e 'ssh -p 2244 -o StrictHostKeyChecking=no' $src $USERNAME@$HOST:$dst"
-            --include 'sessions/' \
+            echo "Deploying $src to $dst"
-            -e 'ssh -p 2244 -o StrictHostKeyChecking=no' \
+            eval $cmd
-            site/ $USERNAME@$HOST:$PROD_PATH/site/
+          }
 
-          echo "Deploying vendor/"
+          rsync_deploy site/ "$PROD_PATH/site/" "--exclude 'accounts/' --exclude 'cache/' --exclude 'sessions/'"
-          sshpass -p "$PASSWORD" rsync -az --delete -O \
+          rsync_deploy vendor/ "$PROD_PATH/vendor/"
-            -e 'ssh -p 2244 -o StrictHostKeyChecking=no' \
+          rsync_deploy kirby/ "$PROD_PATH/kirby/"
-            vendor/ $USERNAME@$HOST:$PROD_PATH/vendor/
+          rsync_deploy assets/ "$PROD_PATH/assets/" "--exclude 'tiles/'"
-
-          echo "Deploying kirby/"
-          sshpass -p "$PASSWORD" rsync -az --delete -O \
-            -e 'ssh -p 2244 -o StrictHostKeyChecking=no' \
-            kirby/ $USERNAME@$HOST:$PROD_PATH/kirby/
-
-          echo "Deploying assets/"
-          sshpass -p "$PASSWORD" rsync -az --delete -O \
-            -e 'ssh -p 2244 -o StrictHostKeyChecking=no' \
-            assets/ $USERNAME@$HOST:$PROD_PATH/assets/

.gitignore

@@ -62,21 +62,18 @@ public/.idea
 
 public/site/cache/*
 !public/site/cache/index.html
-!public/site/cache/.gitkeep
 
 # Accounts
 # ---------------
 
 public/site/accounts/*
 !public/site/accounts/index.html
-!public/site/accounts/.gitkeep
 
 # Sessions
 # ---------------
 
 public/site/sessions/*
 !public/site/sessions/index.html
-!public/site/sessions/.gitkeep
 
 # License
 # ---------------

public/site/config/config.php

@@ -25,7 +25,6 @@ return [
     'css'      => 'assets/css/panel.css',
     'favicon'  => 'favicon.svg',
     'menu'     => require(__DIR__ . '/menu.php'),
-    'install' => 'true'
   ],
   'routes' => [
     require(__DIR__ . '/routes/logout.php'),