diff --git a/lxc-apps/kanboard/app b/lxc-apps/kanboard/app index f6c3e59..ee82fd6 100644 --- a/lxc-apps/kanboard/app +++ b/lxc-apps/kanboard/app @@ -13,14 +13,14 @@ "kanboard-postgres" ], "mounts": { - "kanboard/kanboard_data": "/srv/kanboard/data/files", - "kanboard/kanboard_conf/config.php": "file:/srv/kanboard/config.php" + "kanboard/kanboard_data": "srv/kanboard/data/files", + "kanboard/kanboard_conf/config.php": "srv/kanboard/config.php:file" } }, "kanboard-postgres": { "image": "postgres_12.1.0-200207", "mounts": { - "kanboard/postgres_data": "/var/lib/postgresql" + "kanboard/postgres_data": "var/lib/postgresql" } } } diff --git a/lxc-apps/kanboard/install.sh b/lxc-apps/kanboard/install.sh index 8a237f6..aa59d58 100755 --- a/lxc-apps/kanboard/install.sh +++ b/lxc-apps/kanboard/install.sh @@ -1,38 +1,45 @@ #!/bin/sh set -ev +# Prepare variables +POSTGRES_DATA_DIR=${VOLUMES_DIR}/kanboard/postgres_data +KANBOARD_DATA_DIR=${VOLUMES_DIR}/kanboard/kanboard_data +KANBOARD_CONF_DIR=${VOLUMES_DIR}/kanboard/kanboard_conf +POSTGRES_NSUID=100070 +POSTGRES_NSGID=100070 +KANBOARD_NSUID=100102 +KANBOARD_NSGID=100102 + # Create Postgres instance -mkdir -p /srv/kanboard/postgres_data -chown -R 105432:105432 /srv/kanboard/postgres_data -chmod 700 /srv/kanboard/postgres_data -lxc-execute -n kanboard-postgres -- initdb -D /var/lib/postgresql +install -d -o ${POSTGRES_NSUID} -g ${POSTGRES_NSGID} -m 700 ${POSTGRES_DATA_DIR} +spoc-container exec kanboard-postgres -- initdb -D /var/lib/postgresql # Configure Postgres -cp postgres_data/postgresql.conf /srv/kanboard/postgres_data/postgresql.conf -cp postgres_data/pg_hba.conf /srv/kanboard/postgres_data/pg_hba.conf +cp postgres_data/postgresql.conf ${POSTGRES_DATA_DIR}/postgresql.conf +cp postgres_data/pg_hba.conf ${POSTGRES_DATA_DIR}/pg_hba.conf # Configure Kanboard -mkdir -p /srv/kanboard/kanboard_conf /srv/kanboard/kanboard_data -chown -R 108080:108080 /srv/kanboard/kanboard_data -envsubst /srv/kanboard/kanboard_conf/config.php +export KANBOARD_PWD=$(head -c 18 /dev/urandom | base64 | tr -d '+/=') +mkdir -p ${KANBOARD_CONF_DIR} ${KANBOARD_DATA_DIR} +envsubst ${KANBOARD_CONF_DIR}/config.php +chown -R ${KANBOARD_NSUID}:${KANBOARD_NSGID} ${KANBOARD_CONF_DIR} ${KANBOARD_DATA_DIR} # Populate database -export KANBOARD_PWD=$(head -c 18 /dev/urandom | base64 | tr -d '+/=') -service lxc-kanboard-postgres start -envsubst