chore: fix perms in aio config files

.github/workflows/dockerhub-release-aio.yml

@@ -4,6 +4,7 @@ on:
  push:
  branches:
  - develop
+ - pcnc/update-adminmgr
  paths:
  - ".github/workflows/dockerhub-release-aio.yml"
  - "docker/all-in-one/*"

.github/workflows/dockerhub-release.yml

@@ -4,6 +4,7 @@ on:
  push:
  branches:
  - develop
+ - pcnc/update-adminmgr
  paths:
  - ".github/workflows/dockerhub-release.yml"
  - "common.vars*"

common.vars.pkr.hcl

@@ -1 +1 @@
-postgres-version = "15.1.0.153"
+postgres-version = "15.1.0.152"

docker/all-in-one/init/configure-adminapi.sh

@@ -51,5 +51,5 @@ if [ "${DATA_VOLUME_MOUNTPOINT}" ]; then
  chown -R adminapi:adminapi "/etc/adminapi"
 
  chown -R adminapi:adminapi "${ADMINAPI_CUSTOM_DIR}"
- chmod g+rx "${ADMINAPI_CUSTOM_DIR}"
+ chmod g+wrx "${ADMINAPI_CUSTOM_DIR}"
 fi

docker/all-in-one/init/configure-autoshutdown.sh

@@ -15,6 +15,7 @@ if [ "${DATA_VOLUME_MOUNTPOINT}" ]; then
 
  rm -f "/etc/supa-shutdown/shutdown.conf"
  ln -s "${AUTOSHUTDOWN_CUSTOM_CONFIG_FILE_PATH}" "/etc/supa-shutdown/shutdown.conf"
+ chmod g+wrx "${AUTOSHUTDOWN_CUSTOM_DIR}"
  chown -R adminapi:adminapi "/etc/supa-shutdown/shutdown.conf"
  chown -R adminapi:adminapi "${AUTOSHUTDOWN_CUSTOM_CONFIG_FILE_PATH}"
 fi

docker/all-in-one/init/configure-gotrue.sh

@@ -10,6 +10,7 @@ GOTRUE_CUSTOM_CONFIG_FILE_PATH="${DATA_VOLUME_MOUNTPOINT}/etc/gotrue/gotrue.env"
 
 if [ "${DATA_VOLUME_MOUNTPOINT}" ]; then
  mkdir -p "${GOTRUE_CUSTOM_DIR}"
+ chmod g+wrx "${GOTRUE_CUSTOM_DIR}"
  chown adminapi:adminapi "${GOTRUE_CUSTOM_DIR}"
 
  if [ ! -f "${CONFIGURED_FLAG_PATH}" ]; then

docker/all-in-one/init/configure-kong.sh

@@ -2,6 +2,8 @@
 set -eou pipefail
 
 KONG_CONF=/etc/kong/kong.yml
+KONG_CUSTOM_DIR="${DATA_VOLUME_MOUNTPOINT}/etc/kong"
+
 touch /var/log/services/kong.log
 
 if [ -f "${INIT_PAYLOAD_PATH:-}" ]; then
@@ -29,3 +31,18 @@ sed -i -e "s|anon_key|$ANON_KEY|g" \
 # Update kong ports
 sed -i "s|:80 |:$KONG_HTTP_PORT |g" /etc/kong/kong.conf
 sed -i "s|:443 |:$KONG_HTTPS_PORT |g" /etc/kong/kong.conf
+
+if [ "${DATA_VOLUME_MOUNTPOINT}" ]; then
+ mkdir -p "${KONG_CUSTOM_DIR}"
+ if [ ! -f "${CONFIGURED_FLAG_PATH}" ]; then
+ echo "Copying existing custom kong config from /etc/kong/kong.yml to ${KONG_CUSTOM_DIR}"
+ cp /etc/kong/kong.yml "${KONG_CUSTOM_DIR}/kong.yml"
+ fi
+
+ rm -rf "/etc/kong/kong.yml"
+ ln -s "${KONG_CUSTOM_DIR}/kong.yml" "/etc/kong/kong.yml"
+ chown -R adminapi:adminapi "/etc/kong/kong.yml"
+
+ chown -R adminapi:adminapi "${KONG_CUSTOM_DIR}"
+ chmod g+wrx "${KONG_CUSTOM_DIR}"
+fi

docker/all-in-one/init/configure-pgbouncer.sh

@@ -42,5 +42,5 @@ if [ "${DATA_VOLUME_MOUNTPOINT}" ]; then
  ln -s "${PGBOUNCER_DIR}" "/etc/pgbouncer"
  chown -R pgbouncer:pgbouncer "/etc/pgbouncer"
  chown -R pgbouncer:pgbouncer "${PGBOUNCER_DIR}"
- chmod -R g+rx "${PGBOUNCER_DIR}"
+ chmod -R g+wrx "${PGBOUNCER_DIR}"
 fi

docker/all-in-one/init/configure-postgrest.sh

@@ -32,7 +32,7 @@ if [ "${DATA_VOLUME_MOUNTPOINT}" ]; then
  chown -R postgrest:postgrest "/etc/postgrest"
 
  chown -R postgrest:postgrest "${POSTGREST_CUSTOM_DIR}"
- chmod g+rx "${POSTGREST_CUSTOM_DIR}"
+ chmod g+wrx "${POSTGREST_CUSTOM_DIR}"
 fi
 
 PGRST_CONF=/etc/postgrest/generated.conf