Merge remote-tracking branch 'origin/main' into renovate/major-jetty-packages

.github/workflows/deploy.yml

@@ -1,15 +1,18 @@
 name: Deploy (Production)
 
-on: workflow_dispatch
+on: 
+  workflow_dispatch:
+    inputs:
+      hostname:
+        description: Hostname
+        type: string
+        required: true
+        default: antville.org
 
 jobs:
   deploy:
     runs-on: antville
 
-    environment:
-      name: antville.org
-      url: https://antville.org
-
     steps:
       - name: Copy files to production server
-        run: ssh staging-server deploy-helma
+        run: ssh ${{ inputs.hostname }} deploy-helma

.github/workflows/stage.yml

@@ -1,6 +1,13 @@
 name: Deploy (Staging)
 
-on: workflow_dispatch
+on: 
+  workflow_dispatch:
+    inputs:
+      hostname:
+        description: Hostname
+        type: string
+        required: true
+        default: antville.org
 
 jobs:
   stage:
@@ -8,7 +15,7 @@ jobs:
 
     environment:
       name: stage
-      url: ${{ vars.stage_url }}
+      url: ${{ inputs.hostname }}
 
     steps:
       - uses: actions/checkout@v4
@@ -16,9 +23,9 @@ jobs:
       - name: Build with Gradle
         run: ./gradlew installDist
 
-      - name: Publish to staging server
+      - name: Copy build files to server
         run: |
-          rsync ./build/install/helma/ staging-server:./ \
+          rsync ./build/install/helma/ ${{ inputs.hostname }}:./ \
             --verbose --archive --delete --compress \
             --filter '+ /bin' \
             --filter '+ /extras' \
@@ -29,4 +36,4 @@ jobs:
             --filter '- /*'
 
       - name: Restart Helma
-        run: ssh staging-server restart
+        run: ssh ${{ inputs.hostname }} restart

.gitignore

@@ -1,5 +1,7 @@
+# Generally ignore hidden files
 .*
 
+# Manage some Codium configuration
 .vscode/*
 !.vscode
 !.vscode/extensions.json
@@ -7,22 +9,22 @@
 !.vscode/settings.json
 !.vscode/tasks.json
 
-build
-
-/apps
+# Ignore files created during build or run
 /bin
 /backups
-/db
+build
 /docs
-/extras
 /lib
 /licenses
 /log
+
+# Ignore files managed in src/dist
+/*.properties
+/apps
+/db
+/extras
+/launcher.jar
 /static
 
-/*.properties
+# Manage Gradle configuration
 !/gradle.properties
-
-/launcher.jar
-/passwd
-/start.*