diff --git a/lib/listmonk.sh b/lib/listmonk.sh index 472af8a..ca42ded 100644 --- a/lib/listmonk.sh +++ b/lib/listmonk.sh @@ -3,10 +3,11 @@ # Listmonk Service PATH=$HOME/.docker/cli-plugins:/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin +. /etc/federated get_appvars config_listmonk() { - echo -ne "\n* Configuring /federated/apps/listmonk container.." + echo -ne "* Configuring listmonk container.." if [ ! -d "/federated/apps/listmonk" ]; then mkdir -p /federated/apps/listmonk/data/listmonk/static /federated/apps/listmonk/data/listmonk/uploads @@ -15,8 +16,6 @@ config_listmonk() { LISTMONK_SECRET=$(create_password) cat > /federated/apps/listmonk/docker-compose.yml < /federated/apps/listmonk/data/listmonk/config.toml < /federated/apps/listmonk/data/listmonk/config.toml < /dev/null docker exec postgresql psql -U postgres -c "GRANT ALL PRIVILEGES ON DATABASE listmonk TO listmonk" &> /dev/null -echo -ne "done." +echo -ne "done.\n" } start_listmonk() { # Install the database scheme first @@ -94,8 +116,6 @@ start_listmonk() { } email_listmonk() { echo -ne "* Sending email to customer.." - spin & - SPINPID=$! cat > /federated/apps/mail/data/root/certs/mailfile < @@ -167,13 +187,10 @@ EOF docker exec mail bash -c "mail -r admin@$DOMAIN -a \"Content-type: text/html\" -s \"Application installed on $DOMAIN\" $EMAIL < /root/certs/mailfile" rm /federated/apps/mail/data/root/certs/mailfile - kill -9 $SPINPID &> /dev/null echo -ne "done.\n" } uninstall_listmonk() { echo -ne "* Uninstalling listmonk container.." - spin & - SPINPID=$! # First stop the service cd /federated/apps/listmonk && docker compose -f docker-compose.yml -p listmonk down &> /dev/null @@ -185,6 +202,5 @@ uninstall_listmonk() { # Delete the app directory rm -rf /federated/apps/listmonk - kill -9 $SPINPID &> /dev/null echo -ne "done.\n" } diff --git a/lib/postgresql.sh b/lib/postgresql.sh index 243000d..e92c78c 100644 --- a/lib/postgresql.sh +++ b/lib/postgresql.sh @@ -3,21 +3,32 @@ # Postgresql Service PATH=$HOME/.docker/cli-plugins:/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin +. /etc/federated config_postgresql() { - echo -ne "\n* Configuring /federated/apps/postgresql container.." + echo -ne "* Configuring postgresql container.." + +# if [[ "${POSTGRESQL_SSL}" = "true" ]]; then +# POSTGRESQL_SSL="true" +# elif [[ ! "${POSTGRESQL_SSL}" ]]; then +# POSTGRESQL_SSL="true" +# else +# POSTGRESQL_SSL="false" +# fi if [ ! -d "/federated/apps/postgresql" ]; then mkdir -p /federated/apps/postgresql/data/var/lib/postgresql /federated/apps/postgresql/data/docker-entrypoint-initdb.d - cp /federated/certs/certs/$DOMAIN.crt /federated/apps/postgresql/data/var/lib/postgresql/server.crt - cp /federated/certs/private/$DOMAIN.key /federated/apps/postgresql/data/var/lib/postgresql/server.key - chown 999 /federated/apps/postgresql/data/var/lib/postgresql/server.crt /federated/apps/postgresql/data/var/lib/postgresql/server.key - chmod 600 /federated/apps/postgresql/data/var/lib/postgresql/server.crt /federated/apps/postgresql/data/var/lib/postgresql/server.key + + if [[ "${PLUS}" = "false" ]]; then + cp /federated/certs/certs/$DOMAIN.crt /federated/apps/postgresql/data/var/lib/postgresql/server.crt + cp /federated/certs/private/$DOMAIN.key /federated/apps/postgresql/data/var/lib/postgresql/server.key + chown 999 /federated/apps/postgresql/data/var/lib/postgresql/server.crt /federated/apps/postgresql/data/var/lib/postgresql/server.key + chmod 600 /federated/apps/postgresql/data/var/lib/postgresql/server.crt /federated/apps/postgresql/data/var/lib/postgresql/server.key + fi fi +if [[ "${PLUS}" = "false" ]]; then cat > /federated/apps/postgresql/docker-compose.yml < /federated/apps/postgresql/docker-compose.yml < /federated/apps/postgresql/.env < /federated/apps/postgresql/.postgresql.secret chmod 600 /federated/apps/postgresql/.postgresql.secret -echo -ne "done." +echo -ne "done.\n" } start_postgresql() { # Start service with command to make sure it's up before proceeding diff --git a/lib/traefik.sh b/lib/traefik.sh index b3d2a47..eb06434 100644 --- a/lib/traefik.sh +++ b/lib/traefik.sh @@ -3,9 +3,10 @@ # Traefik Service PATH=$HOME/.docker/cli-plugins:/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin +. /etc/federated config_traefik() { - echo -ne "\n* Configuring /federated/apps/traefik container.." + echo -ne "* Configuring traefik container.." if [ ! -d "/federated/apps/traefik" ]; then mkdir -p /federated/apps/traefik/data/letsencrypt @@ -13,9 +14,71 @@ config_traefik() { TRAEFIK_HTTPAUTH_STRING=$(echo `htpasswd -nb admin $ADMINPASS` | sed -e s/\\$/\\$\\$/g) +if [[ "${PLUS}" = "true" ]]; then cat > /federated/apps/traefik/docker-compose.yml < /federated/apps/traefik/docker-compose.yml < /dev/null && ls /federated/certs/private/$DOMAIN.key /federated/certs/certs/$DOMAIN.crt &> /dev/null" "10" + if [[ "${PLUS}" = "true" ]]; then + start_service "traefik" "traefik-certs-dumper file --version v2 --source /federated/apps/traefik/data/letsencrypt/httpacme.json --dest /federated/certs &> /dev/null && ls /federated/certs/private/*.$DOMAIN.key /federated/certs/certs/*.$DOMAIN.crt &> /dev/null" "10" + else + start_service "traefik" "traefik-certs-dumper file --version v2 --source /federated/apps/traefik/data/letsencrypt/acme.json --dest /federated/certs &> /dev/null && ls /federated/certs/private/$DOMAIN.key /federated/certs/certs/$DOMAIN.crt &> /dev/null" "10" + fi } start_traefik_old() { echo -ne "\n* Starting /federated/apps/traefik service.."