diff --git a/.forgejo/workflows/deploy-preprod.yml b/.forgejo/workflows/deploy-preprod.yml index 771af75..190e138 100644 --- a/.forgejo/workflows/deploy-preprod.yml +++ b/.forgejo/workflows/deploy-preprod.yml @@ -37,18 +37,28 @@ jobs: run: | cd dist - rsync_deploy() { - local src=$1 - local dst=$2 - local exclude=$3 - cmd="sshpass -p \"$PASSWORD\" rsync -az --delete -O" - [[ -n $exclude ]] && cmd="$cmd $exclude" - cmd="$cmd -e 'ssh -p 2244 -o StrictHostKeyChecking=no' $src $USERNAME@$HOST:$dst" - echo "Deploying $src to $dst" - eval $cmd - } + echo "Deploying site/" + sshpass -p "$PASSWORD" rsync -az --delete -O \ + --include 'accounts/' \ + --exclude 'accounts/*' \ + --include 'sessions/' \ + --exclude 'sessions/*' \ + --include 'cache/' \ + --exclude 'cache/*' \ + -e 'ssh -p 2244 -o StrictHostKeyChecking=no' \ + site/ $USERNAME@$HOST:$PREPROD_PATH/site/ - rsync_deploy site/ "$PREPROD_PATH/site/" "--exclude 'accounts/' --exclude 'cache/' --exclude 'sessions/'" - rsync_deploy vendor/ "$PREPROD_PATH/vendor/" - rsync_deploy kirby/ "$PREPROD_PATH/kirby/" - rsync_deploy assets/ "$PREPROD_PATH/assets/" "--exclude 'tiles/'" + echo "Deploying vendor/" + sshpass -p "$PASSWORD" rsync -az --delete -O \ + -e 'ssh -p 2244 -o StrictHostKeyChecking=no' \ + vendor/ $USERNAME@$HOST:$PREPROD_PATH/vendor/ + + 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/ diff --git a/.forgejo/workflows/deploy-prod.yml b/.forgejo/workflows/deploy-prod.yml index 59f3937..d407912 100644 --- a/.forgejo/workflows/deploy-prod.yml +++ b/.forgejo/workflows/deploy-prod.yml @@ -37,18 +37,28 @@ jobs: run: | cd dist - rsync_deploy() { - local src=$1 - local dst=$2 - local exclude=$3 - cmd="sshpass -p \"$PASSWORD\" rsync -az --delete -O" - [[ -n $exclude ]] && cmd="$cmd $exclude" - cmd="$cmd -e 'ssh -p 2244 -o StrictHostKeyChecking=no' $src $USERNAME@$HOST:$dst" - echo "Deploying $src to $dst" - eval $cmd - } + echo "Deploying site/" + sshpass -p "$PASSWORD" rsync -az --delete -O \ + --exclude 'accounts/*' \ + --exclude 'cache/*' \ + --exclude 'sessions/*' \ + --include 'accounts/' \ + --include 'cache/' \ + --include 'sessions/' \ + -e 'ssh -p 2244 -o StrictHostKeyChecking=no' \ + site/ $USERNAME@$HOST:$PROD_PATH/site/ - rsync_deploy site/ "$PROD_PATH/site/" "--exclude 'accounts/' --exclude 'cache/' --exclude 'sessions/'" - rsync_deploy vendor/ "$PROD_PATH/vendor/" - rsync_deploy kirby/ "$PROD_PATH/kirby/" - rsync_deploy assets/ "$PROD_PATH/assets/" "--exclude 'tiles/'" + echo "Deploying vendor/" + sshpass -p "$PASSWORD" rsync -az --delete -O \ + -e 'ssh -p 2244 -o StrictHostKeyChecking=no' \ + vendor/ $USERNAME@$HOST:$PROD_PATH/vendor/ + + 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/ diff --git a/.gitignore b/.gitignore index bb14856..15c0a18 100644 --- a/.gitignore +++ b/.gitignore @@ -62,18 +62,21 @@ 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 # --------------- diff --git a/public/site/accounts/.gitkeep b/public/site/accounts/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/public/site/cache/.gitkeep b/public/site/cache/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/public/site/config/config.php b/public/site/config/config.php index 37f3a33..97ceb2c 100644 --- a/public/site/config/config.php +++ b/public/site/config/config.php @@ -25,6 +25,7 @@ return [ 'css' => 'assets/css/panel.css', 'favicon' => 'favicon.svg', 'menu' => require(__DIR__ . '/menu.php'), + 'install' => 'true' ], 'routes' => [ require(__DIR__ . '/routes/logout.php'), diff --git a/public/site/sessions/.gitkeep b/public/site/sessions/.gitkeep new file mode 100644 index 0000000..e69de29