update app and configuration deployment paths

Author: ashutoshgngwr

.github/workflows/api.yaml

@@ -232,19 +232,15 @@ jobs:
           script_stop: true
           script: |
             sudo systemctl stop noice-api.service || true
-            sudo rm -rf /usr/local/share/noice /etc/noice
+            sudo rm -rf /usr/local/share/noice-api /etc/noice-api
 
-            sudo mkdir -p /var/log/noice
-            sudo chown -R nobody:nogroup /var/log/noice
-            sudo chmod -R 755 /var/log/noice
+            sudo mv ${{ env.SCP_DEST_PATH }}/app /usr/local/share/noice-api
+            sudo chown -R nobody:nogroup /usr/local/share/noice-api
+            sudo chmod -R 755 /usr/local/share/noice-api
 
-            sudo mv ${{ env.SCP_DEST_PATH }}/app /usr/local/share/noice
-            sudo chown -R nobody:nogroup /usr/local/share/noice
-            sudo chmod -R 755 /usr/local/share/noice
-
-            sudo mv ${{ env.SCP_DEST_PATH }}/conf /etc/noice
-            sudo chown -R nobody:nogroup /etc/noice
-            sudo chmod -R 700 /etc/noice
+            sudo mv ${{ env.SCP_DEST_PATH }}/conf /etc/noice-api
+            sudo chown -R nobody:nogroup /etc/noice-api
+            sudo chmod -R 700 /etc/noice-api
 
             sudo chown root:root ${{ env.SCP_DEST_PATH }}/deploy/logrotate.d/*
             sudo chmod 644 ${{ env.SCP_DEST_PATH }}/deploy/logrotate.d/*

deploy/conf/production.properties

@@ -3,15 +3,15 @@ spring.datasource.username=${NOICE_API_PG_USER}
 spring.datasource.password=${NOICE_API_PG_PASSWORD}
 
 spring.cloud.gcp.project-id=${NOICE_API_GCP_PROJECT_ID}
-spring.cloud.gcp.credentials.location=file:/etc/noice/gcp-service-account-key.json
+spring.cloud.gcp.credentials.location=file:/etc/noice-api/gcp-service-account-key.json
 
 app.cors.allowed-origins=https://trynoice.com
 
 app.auth.hmac-secret=${NOICE_API_AUTH_HMAC_SECRET}
 app.auth.refresh-token-expiry=15d
 app.auth.cookie-domain=trynoice.com
 
-app.subscriptions.google-play-api-key-path=/etc/noice/gcp-service-account-key.json
+app.subscriptions.google-play-api-key-path=/etc/noice-api/gcp-service-account-key.json
 app.subscriptions.gcp-pubsub-sub-name=${NOICE_API_GCP_PUBSUB_SUB_NAME}
 app.subscriptions.stripe-api-key=${NOICE_API_STRIPE_API_KEY}
 app.subscriptions.stripe-webhook-secret=${NOICE_API_STRIPE_WH_SECRET}

deploy/conf/staging.properties

@@ -11,7 +11,7 @@ spring.datasource.password=${NOICE_API_PG_PASSWORD}
 server.port=8080
 
 spring.cloud.gcp.project-id=${NOICE_API_GCP_PROJECT_ID}
-spring.cloud.gcp.credentials.location=file:/etc/noice/gcp-service-account-key.json
+spring.cloud.gcp.credentials.location=file:/etc/noice-api/gcp-service-account-key.json
 
 app.cors.allowed-origins=http://localhost:[*],https://staging.trynoice.com
 
@@ -22,7 +22,7 @@ app.auth.sign-in-token-expiry=5m
 app.auth.sign-in-reattempt-max-delay=10m
 app.auth.cookie-domain=staging.trynoice.com
 
-app.subscriptions.google-play-api-key-path=/etc/noice/gcp-service-account-key.json
+app.subscriptions.google-play-api-key-path=/etc/noice-api/gcp-service-account-key.json
 app.subscriptions.gcp-pubsub-sub-name=${NOICE_API_GCP_PUBSUB_SUB_NAME}
 app.subscriptions.google-play-test-mode-enabled=true
 app.subscriptions.stripe-api-key=${NOICE_API_STRIPE_API_KEY}

deploy/systemd/noice-api.service

@@ -7,8 +7,8 @@ Wants=network-online.target
 User=nobody
 Group=nogroup
 Type=simple
-ExecStart=/usr/bin/authbind --deep /usr/bin/java -cp '/usr/local/share/noice/lib/*:/usr/local/share/noice' com.trynoice.api.Application --spring.config.additional-location=file:///etc/noice/api.properties --logging.file.name=/var/log/noice/api.log
-EnvironmentFile=/etc/noice/api.env
+ExecStart=/usr/bin/authbind --deep /usr/bin/java -cp '/usr/local/share/noice-api:/usr/local/share/noice-api/lib/*' com.trynoice.api.Application --spring.config.additional-location=file:///etc/noice-api/api.properties --logging.file.name=/var/log/noice-api/api.log
+EnvironmentFile=/etc/noice-api/api.env
 SuccessExitStatus=143
 Restart=on-failure
 

src/main/resources/application.properties

@@ -38,7 +38,7 @@ spring.cloud.gcp.project-id=
 
 # Path of a Spring Resource that is a GCP service account key for subscribing to
 # Google Play Subscription events using GCP Cloud pub/sub, e.g.
-# `file:/etc/noice/service-account-key.json`.
+# `file:/etc/noice-api/service-account-key.json`.
 spring.cloud.gcp.credentials.location=
 
 # Comma-separated list of allowed origin patterns for CORS.
@@ -89,7 +89,7 @@ app.subscriptions.android-application-id=com.github.ashutoshgngwr.noice
 
 # Path of a service account key for accessing the Google Play Developers API.
 # The service account must have access to manage subscriptions on Google Play,
-# e.g. `/etc/noice/service-account-key.json`.
+# e.g. `/etc/noice-api/service-account-key.json`.
 app.subscriptions.google-play-api-key-path=
 
 # Name (only the last part) of a GCP Cloud Pub/Sub subscription to pull Google