diff options
| m--------- | docker-acid-banger | 0 | ||||
| -rw-r--r-- | grafana/compose.yaml | 18 | ||||
| -rw-r--r-- | roundcube/.env.template | 38 | ||||
| -rw-r--r-- | roundcube/compose.yaml | 33 | ||||
| m--------- | searxng-docker | 0 |
5 files changed, 52 insertions, 37 deletions
diff --git a/docker-acid-banger b/docker-acid-banger -Subproject a6df26dd80b55d49bbcabef50770deff66d47d0 +Subproject c83de0cf14552bafcefe32f74b6105d683b6bf0 diff --git a/grafana/compose.yaml b/grafana/compose.yaml index 489cc58..1f7e191 100644 --- a/grafana/compose.yaml +++ b/grafana/compose.yaml @@ -12,30 +12,18 @@ services: volumes: - grafana-data:/var/lib/grafana - ${GRAFANA_CONFIG_PATH}:/etc/grafana/grafana.ini + env_file: + - .env # Load all variables from .env automatically restart: unless-stopped environment: - # Static values (unchanged from your original) + # Static configurations (not in .env) GF_AUTH_GENERIC_OAUTH_ENABLED: "true" GF_AUTH_GENERIC_OAUTH_NAME: authentik GF_AUTH_GENERIC_OAUTH_SCOPES: openid profile email - # Optionally enable auto-login (bypasses Grafana login screen) GF_AUTH_OAUTH_AUTO_LOGIN: "true" - # Optionally map user groups to Grafana roles GF_AUTH_GENERIC_OAUTH_ROLE_ATTRIBUTE_PATH: > contains(groups, 'Grafana Admins') && 'Admin' || contains(groups, 'Grafana Editors') && 'Editor' || 'Viewer' - # Dynamic values (from .env) - GF_AUTH_GENERIC_OAUTH_CLIENT_ID: ${GF_AUTH_GENERIC_OAUTH_CLIENT_ID} - GF_AUTH_GENERIC_OAUTH_CLIENT_SECRET: ${GF_AUTH_GENERIC_OAUTH_CLIENT_SECRET} - # Behind a reverse proxy : - GF_SERVER_ROOT_URL: ${GF_SERVER_ROOT_URL} - GF_AUTH_GENERIC_OAUTH_AUTH_URL: ${GF_AUTH_GENERIC_OAUTH_AUTH_URL} - GF_AUTH_GENERIC_OAUTH_TOKEN_URL: ${GF_AUTH_GENERIC_OAUTH_TOKEN_URL} - GF_AUTH_GENERIC_OAUTH_API_URL: ${GF_AUTH_GENERIC_OAUTH_API_URL} - GF_AUTH_SIGNOUT_REDIRECT_URL: ${GF_AUTH_SIGNOUT_REDIRECT_URL} - - env_file: - - .env networks: {} ... diff --git a/roundcube/.env.template b/roundcube/.env.template new file mode 100644 index 0000000..1a61b19 --- /dev/null +++ b/roundcube/.env.template @@ -0,0 +1,38 @@ +# ====================================== +# Roundcube Configuration Template +# Copy to '.env' and replace values +# ====================================== + +# ------------------------------ +# Database Configuration +# ------------------------------ +MYSQL_ROOT_PASSWORD=your_strong_db_root_password +MYSQL_DATABASE=roundcubemail + +# ------------------------------ +# Roundcube Settings +# ------------------------------ +ROUNDCUBEMAIL_DB_TYPE=mysql +ROUNDCUBEMAIL_DB_HOST=roundcubedb +ROUNDCUBEMAIL_DB_PASSWORD=${MYSQL_ROOT_PASSWORD} +ROUNDCUBEMAIL_SKIN=elastic +ROUNDCUBEMAIL_DEFAULT_HOST=tls://your.mail.server +ROUNDCUBEMAIL_SMTP_SERVER=tls://your.mail.server + +# ------------------------------ +# Paths (Relative to compose file) +# ------------------------------ +DB_DATA_PATH=./db/mysql +WWW_DATA_PATH=./www + +# ------------------------------ +# Port Mapping +# ------------------------------ +MYSQL_PORT=33006 +ROUNDCUBE_PORT=9001 + +# ============================================= +# Security Notice: +# 1. Never commit real .env to version control +# 2. Change all credentials in production +# ============================================= diff --git a/roundcube/compose.yaml b/roundcube/compose.yaml index f81b153..61cc114 100644 --- a/roundcube/compose.yaml +++ b/roundcube/compose.yaml @@ -5,36 +5,25 @@ services: container_name: roundcubedb restart: unless-stopped volumes: - - ./db/mysql:/var/lib/mysql + - ${DB_DATA_PATH}:/var/lib/mysql ports: - - 10.0.0.1:34010:5432 - - 10.0.0.1:33006:3306 + - 10.0.0.1:${MYSQL_PORT}:3306 environment: - - MYSQL_ROOT_PASSWORD=roundcube-mysql-pw - - MYSQL_DATABASE=roundcubemail + - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} + - MYSQL_DATABASE=${MYSQL_DATABASE} + roundcubemail: image: roundcube/roundcubemail:1.6.9-apache container_name: roundcubemail restart: unless-stopped depends_on: - roundcubedb - links: - - roundcubedb volumes: - - ./www:/var/www/html + - ${WWW_DATA_PATH}:/var/www/html ports: - - 10.0.0.1:9001:80 - environment: - - ROUNDCUBEMAIL_DB_TYPE=mysql - - ROUNDCUBEMAIL_DB_HOST=roundcubedb - - ROUNDCUBEMAIL_DB_PASSWORD=roundcube-mysql-pw - - ROUNDCUBEMAIL_SKIN=elastic - - ROUNDCUBEMAIL_DEFAULT_HOST=tls://mail.adjutor.xyz - - ROUNDCUBEMAIL_SMTP_SERVER=tls://mail.adjutor.xyz -networks: {} + - 10.0.0.1:${ROUNDCUBE_PORT}:80 + env_file: + - .env -### Optional: add a full mail server stack to use with Roundcube like https://github.com/docker-mailserver/docker-mailserver -# mailserver: -# image: mailserver/docker-mailserver:14.0.0 -# hostname: mail.example.org -# ... # for more options see https://github.com/docker-mailserver/docker-mailserver#examples +networks: {} +... diff --git a/searxng-docker b/searxng-docker -Subproject 0df19147063a1727f1f79acbe7551d691482bd5 +Subproject 3e632173678093cb4bd69277a59f155f89f8c35 |