bero/test
1
0
Fork 0
Code Issues 52 Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Added Plus changes for traefik, postgresql, listmonk

Browse Source
This commit is contained in:
root 2025-01-14 17:07:34 +00:00
parent 446b328307
commit 14d44df5f5
3 changed files with 149 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/listmonk.sh
View File

@ -3,10 +3,11 @@
# Listmonk Service # Listmonk Service
PATH=$HOME/.docker/cli-plugins:/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin PATH=$HOME/.docker/cli-plugins:/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
. /etc/federated
get_appvars get_appvars
config_listmonk() { config_listmonk() {
echo -ne "\n* Configuring /federated/apps/listmonk container.." echo -ne "* Configuring listmonk container.."
if [ ! -d "/federated/apps/listmonk" ]; then if [ ! -d "/federated/apps/listmonk" ]; then
mkdir -p /federated/apps/listmonk/data/listmonk/static /federated/apps/listmonk/data/listmonk/uploads mkdir -p /federated/apps/listmonk/data/listmonk/static /federated/apps/listmonk/data/listmonk/uploads
@ -15,8 +16,6 @@ config_listmonk() {
LISTMONK_SECRET=$(create_password) LISTMONK_SECRET=$(create_password)
cat > /federated/apps/listmonk/docker-compose.yml <<EOF cat > /federated/apps/listmonk/docker-compose.yml <<EOF
version: "3.7"
services: services:
listmonk: listmonk:
image: listmonk/listmonk:\${IMAGE_VERSION} image: listmonk/listmonk:\${IMAGE_VERSION}
@ -48,6 +47,28 @@ IMAGE_VERSION="v2.4.0"
TZ=Etc/UTC TZ=Etc/UTC
EOF EOF
[[ "${PLUS}" = "true" ]] && sed -i "s/letsencrypt/httpresolver/g" /federated/apps/listmonk/docker-compose.yml
if [[ "${PLUS}" = "true" ]]; then
cat > /federated/apps/listmonk/data/listmonk/config.toml <<EOF
[app]
address = "0.0.0.0:9000"
admin_username = "admin@$DOMAIN"
admin_password = "$ADMINPASS"
# Database.
[db]
host = "postgresql.$DOMAIN"
port = 5432
user = "listmonk"
password = "$LISTMONK_SECRET"
database = "listmonk"
ssl_mode = "disable"
max_open = 25
max_idle = 25
max_lifetime = "300s"
EOF
else
cat > /federated/apps/listmonk/data/listmonk/config.toml <<EOF cat > /federated/apps/listmonk/data/listmonk/config.toml <<EOF
[app] [app]
address = "0.0.0.0:9000" address = "0.0.0.0:9000"
@ -66,6 +87,7 @@ max_open = 25
max_idle = 25 max_idle = 25
max_lifetime = "300s" max_lifetime = "300s"
EOF EOF
fi
chmod 600 /federated/apps/listmonk/data/listmonk/config.toml /federated/apps/listmonk/.env chmod 600 /federated/apps/listmonk/data/listmonk/config.toml /federated/apps/listmonk/.env
# Create database and user in postgresql # Create database and user in postgresql
@ -73,7 +95,7 @@ docker exec postgresql psql -U postgres -c "CREATE USER listmonk WITH PASSWORD '
docker exec postgresql psql -U postgres -c "CREATE DATABASE listmonk" &> /dev/null docker exec postgresql psql -U postgres -c "CREATE DATABASE listmonk" &> /dev/null
docker exec postgresql psql -U postgres -c "GRANT ALL PRIVILEGES ON DATABASE listmonk TO listmonk" &> /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() { start_listmonk() {
# Install the database scheme first # Install the database scheme first
@ -94,8 +116,6 @@ start_listmonk() {
} }
email_listmonk() { email_listmonk() {
echo -ne "* Sending email to customer.." echo -ne "* Sending email to customer.."
spin &
SPINPID=$!
cat > /federated/apps/mail/data/root/certs/mailfile <<EOF cat > /federated/apps/mail/data/root/certs/mailfile <<EOF
<html> <html>
@ -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" 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 rm /federated/apps/mail/data/root/certs/mailfile
kill -9 $SPINPID &> /dev/null
echo -ne "done.\n" echo -ne "done.\n"
} }
uninstall_listmonk() { uninstall_listmonk() {
echo -ne "* Uninstalling listmonk container.." echo -ne "* Uninstalling listmonk container.."
spin &
SPINPID=$!
# First stop the service # First stop the service
cd /federated/apps/listmonk && docker compose -f docker-compose.yml -p listmonk down &> /dev/null 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 # Delete the app directory
rm -rf /federated/apps/listmonk rm -rf /federated/apps/listmonk
kill -9 $SPINPID &> /dev/null
echo -ne "done.\n" echo -ne "done.\n"
} }

51
lib/postgresql.sh
View File

@ -3,21 +3,32 @@
# Postgresql Service # Postgresql Service
PATH=$HOME/.docker/cli-plugins:/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin PATH=$HOME/.docker/cli-plugins:/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
. /etc/federated
config_postgresql() { 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 if [ ! -d "/federated/apps/postgresql" ]; then
mkdir -p /federated/apps/postgresql/data/var/lib/postgresql /federated/apps/postgresql/data/docker-entrypoint-initdb.d mkdir -p /federated/apps/postgresql/data/var/lib/postgresql /federated/apps/postgresql/data/docker-entrypoint-initdb.d
if [[ "${PLUS}" = "false" ]]; then
cp /federated/certs/certs/$DOMAIN.crt /federated/apps/postgresql/data/var/lib/postgresql/server.crt 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 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 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 chmod 600 /federated/apps/postgresql/data/var/lib/postgresql/server.crt /federated/apps/postgresql/data/var/lib/postgresql/server.key
fi fi
fi
if [[ "${PLUS}" = "false" ]]; then
cat > /federated/apps/postgresql/docker-compose.yml <<EOF cat > /federated/apps/postgresql/docker-compose.yml <<EOF
version: "3.7"
services: services:
postgresql: postgresql:
image: postgres:\${IMAGE_VERSION} image: postgres:\${IMAGE_VERSION}
@ -53,6 +64,38 @@ networks:
core: core:
external: true external: true
EOF EOF
else
cat > /federated/apps/postgresql/docker-compose.yml <<EOF
services:
postgresql:
image: postgres:\${IMAGE_VERSION}
container_name: postgresql
hostname: postgresql.$DOMAIN
restart: always
networks:
core:
ipv4_address: 192.168.0.14
volumes:
- ./data/var/lib/postgresql/data:/var/lib/postgresql/data
- ./data/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
env_file:
- ./.env
secrets:
- federated_psql_password
healthcheck:
test: ["CMD-SHELL", "pg_isready -U postgres"]
interval: 10s
timeout: 5s
retries: 5
secrets:
federated_psql_password:
file: ./.postgresql.secret
networks:
core:
external: true
EOF
fi
cat > /federated/apps/postgresql/.env <<EOF cat > /federated/apps/postgresql/.env <<EOF
IMAGE_VERSION="14" IMAGE_VERSION="14"
@ -67,7 +110,7 @@ PSQL_SECRET=$(create_password);
echo "$PSQL_SECRET" > /federated/apps/postgresql/.postgresql.secret echo "$PSQL_SECRET" > /federated/apps/postgresql/.postgresql.secret
chmod 600 /federated/apps/postgresql/.postgresql.secret chmod 600 /federated/apps/postgresql/.postgresql.secret
echo -ne "done." echo -ne "done.\n"
} }
start_postgresql() { start_postgresql() {
# Start service with command to make sure it's up before proceeding # Start service with command to make sure it's up before proceeding

74
lib/traefik.sh
View File

@ -3,9 +3,10 @@
# Traefik Service # Traefik Service
PATH=$HOME/.docker/cli-plugins:/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin PATH=$HOME/.docker/cli-plugins:/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
. /etc/federated
config_traefik() { config_traefik() {
echo -ne "\n* Configuring /federated/apps/traefik container.." echo -ne "* Configuring traefik container.."
if [ ! -d "/federated/apps/traefik" ]; then if [ ! -d "/federated/apps/traefik" ]; then
mkdir -p /federated/apps/traefik/data/letsencrypt 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) TRAEFIK_HTTPAUTH_STRING=$(echo `htpasswd -nb admin $ADMINPASS` | sed -e s/\\$/\\$\\$/g)
if [[ "${PLUS}" = "true" ]]; then
cat > /federated/apps/traefik/docker-compose.yml <<EOF cat > /federated/apps/traefik/docker-compose.yml <<EOF
version: "3.7" services:
traefik:
image: traefik:\${IMAGE_VERSION}
container_name: traefik
hostname: traefik.$DOMAIN
restart: always
networks:
core:
ipv4_address: 192.168.0.13
command:
# Tell Traefik to discover containers using the Docker API
- --providers.docker=true
# Enable the Trafik dashboard
- --api.dashboard=true
# Set up LetsEncrypt
#- --certificatesresolvers.letsencrypt.acme.dnschallenge=true
#- --certificatesresolvers.letsencrypt.acme.dnschallenge.provider=pdns
#- --certificatesresolvers.letsencrypt.acme.email=hostmaster@$DOMAIN
#- --certificatesresolvers.letsencrypt.acme.storage=/letsencrypt/acme.json
#- --certificatesresolvers.letsencrypt.acme.dnschallenge.DisablePropagationCheck=true
# --certificatesresolvers.letsencrypt.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory
# Added HTTP challenge
- --certificatesresolvers.httpresolver.acme.httpchallenge=true
- --certificatesresolvers.httpresolver.acme.httpchallenge.entrypoint=web
#- "--certificatesresolvers.httpresolver.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory"
- --certificatesresolvers.httpresolver.acme.email=hostmaster@$DOMAIN
- --certificatesresolvers.httpresolver.acme.storage=/letsencrypt/httpacme.json
- --log.level=DEBUG
# Set up an insecure listener that redirects all traffic to HTTPS
- --entrypoints.web.address=:80
- --entrypoints.websecure.address=:443
- --entrypoints.web.http.redirections.entrypoint.to=websecure
- --entrypoints.web.http.redirections.entrypoint.scheme=https
# Set up the TLS configuration for our websecure listener
- --entrypoints.websecure.http.tls=true
- --entrypoints.websecure.http.tls.certResolver=letsencrypt
- --entrypoints.websecure.http.tls.domains[0].main=$DOMAIN
- --entrypoints.websecure.http.tls.domains[0].sans=*.$DOMAIN
env_file:
- ./.env
ports:
- 80:80
- 443:443
volumes:
- /var/run/docker.sock:/var/run/docker.sock:ro
- ./data/letsencrypt:/letsencrypt
labels:
- "traefik.enable=true"
- "traefik.http.routers.traefik.rule=Host(\`traefik.$DOMAIN\`)"
- "traefik.http.routers.traefik.entrypoints=websecure"
- "traefik.http.routers.traefik.tls.certresolver=letsencrypt"
- "traefik.http.routers.traefik.service=api@internal"
- "traefik.http.routers.traefik.middlewares=strip"
- "traefik.http.middlewares.strip.stripprefix.prefixes=/traefik"
- "traefik.http.routers.traefik.middlewares=traefik-auth"
- "traefik.http.middlewares.traefik-auth.basicauth.users=$TRAEFIK_HTTPAUTH_STRING"
networks:
core:
external: true
EOF
else
cat > /federated/apps/traefik/docker-compose.yml <<EOF
services: services:
traefik: traefik:
image: traefik:\${IMAGE_VERSION} image: traefik:\${IMAGE_VERSION}
@ -77,6 +140,7 @@ networks:
core: core:
external: true external: true
EOF EOF
fi
PDNS_APIKEY=`grep PDNS_api_key /federated/apps/pdns/.env | awk -F= '{ print $2 }'` PDNS_APIKEY=`grep PDNS_api_key /federated/apps/pdns/.env | awk -F= '{ print $2 }'`
@ -87,11 +151,15 @@ PDNS_API_URL=http://pdns.$DOMAIN:8081
EOF EOF
chmod 600 /federated/apps/traefik/.env chmod 600 /federated/apps/traefik/.env
echo -ne "done." echo -ne "done.\n"
} }
start_traefik() { start_traefik() {
# Start service with command to make sure it's up before proceeding # Start service with command to make sure it's up before proceeding
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" 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() { start_traefik_old() {
echo -ne "\n* Starting /federated/apps/traefik service.." echo -ne "\n* Starting /federated/apps/traefik service.."