diff --git a/.env_template b/.env_template index 02ff00e..a84e8e5 100644 --- a/.env_template +++ b/.env_template @@ -1,45 +1,8 @@ - #SYSINFO TZ= UID= GID= -AUTH_SUBNET_PREFIX= -MONITOR_SUBNET_PREFIX= -NETWORKING_SUBNET_PREFIX= - -#URLS -LLDAP_SERVER= #PATHS DATA_PATH= MEDIA_PATH= - -#GLUETUN -VPN_USER= -VPN_PASS= -WG_COUNTRIES= - -#SEARXNG -SEARXNG_HOSTNAME= - -#PORTS - -AUTHELIA_PORT= - -DDNS_PORT= -KUMA_PORT= - -LLDAP_LDAP_PORT= -LLDAP_LDAPS_PORT= -LLDAP_WEBUI_PORT= - -ORGANIZR_PORT= - -NGINX_HTTP_PORT= -NGINX_WEBUI_PORT= -NGINX_HTTPS_PORT= - -WYOMING_PIPER_PORT= -WYOMING_WHISPER_PORT= - -SEARXNG_PORT= diff --git a/.gitignore b/.gitignore index 4c49bd7..cc75f65 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ .env +**/.env +**/*.env diff --git a/auth/auth.env_template b/auth/auth.env_template new file mode 100644 index 0000000..ff26446 --- /dev/null +++ b/auth/auth.env_template @@ -0,0 +1,9 @@ +#networking +AUTH_SUBNET_PREFIX= +#lldap +LLDAP_SERVER= +#ports +AUTHELIA_PORT= +LLDAP_LDAP_PORT= +LLDAP_LDAPS_PORT= +LLDAP_WEBUI_PORT= diff --git a/auth.yml b/auth/docker-compose.yml similarity index 100% rename from auth.yml rename to auth/docker-compose.yml diff --git a/monitoring.yml b/monitoring/docker-compose.yml similarity index 70% rename from monitoring.yml rename to monitoring/docker-compose.yml index 01e79cd..f84eee2 100644 --- a/monitoring.yml +++ b/monitoring/docker-compose.yml @@ -8,23 +8,8 @@ networks: config: - subnet: ${MONITOR_SUBNET_PREFIX}0/24 -volumes: - portainer_data: - name: portainer_data - services: - portainer: #Portainer is a web UI for managing your docker containers https://www.portainer.io/ - image: portainer/portainer-ce:latest - container_name: portainer - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - portainer_data:/data - ports: - - "8000:8000" - - "9443:9443" - restart: always - organizr: #organizr is a server control panel https://github.com/causefx/Organizr image: organizr/organizr container_name: organizr diff --git a/monitoring/monitoring.env_template b/monitoring/monitoring.env_template new file mode 100644 index 0000000..747cd4e --- /dev/null +++ b/monitoring/monitoring.env_template @@ -0,0 +1,5 @@ +#networking +MONITOR_SUBNET_PREFIX= +#ports +ORGANIZR_PORT= +KUMA_PORT= diff --git a/networking.yml b/networking/docker-compose.yml similarity index 82% rename from networking.yml rename to networking/docker-compose.yml index 977ccd9..d8773f5 100644 --- a/networking.yml +++ b/networking/docker-compose.yml @@ -38,4 +38,13 @@ services: - ${NGINX_HTTP_PORT}:80 - ${NGINX_WEBUI_PORT}:81 - ${NGINX_HTTPS_PORT}:443 + - ${MC_JAVA_PORT}:25565 + - ${MC_BEDROCK_PORT}:19132 + - ${MC_VOICE_PORT}:24454 + - ${TERRARIA_PORT}:7777 + - ${NC_TALK_PORT}:3478 + - ${GITEA_SSH_PORT}:1022 + - ${GITEA_SSH_PORT_ALT}:10022 + - ${SMTP_PORT}:1025 + - ${IMAP_PORT}:1143 restart: unless-stopped diff --git a/networking/networking.env_template b/networking/networking.env_template new file mode 100644 index 0000000..a8300bc --- /dev/null +++ b/networking/networking.env_template @@ -0,0 +1,18 @@ +#networking +NETWORKING_SUBNET_PREFIX= +#ports +DDNS_PORT= + +NGINX_HTTP_PORT= +NGINX_WEBUI_PORT= +NGINX_HTTPS_PORT= +#ports forwarded through nginx +MC_JAVA_PORT= +MC_BEDROCK_PORT= +MC_VOICE_PORT= +TERRARIA_PORT= +NC_TALK_PORT= +GITEA_SSH_PORT= +GITEA_SSH_PORT_ALT= +SMTP_PORT= +IMAP_PORT= diff --git a/searxng.yml b/searxng/docker-compose.yml similarity index 100% rename from searxng.yml rename to searxng/docker-compose.yml diff --git a/searxng/searxng.env_template b/searxng/searxng.env_template new file mode 100644 index 0000000..4becfe9 --- /dev/null +++ b/searxng/searxng.env_template @@ -0,0 +1,8 @@ +#vpn +VPN_USER= +VPN_PASS= +WG_COUNTRIES= +#searxng +SEARXNG_HOSTNAME= +#ports +SEARXNG_PORT= diff --git a/smarthome.yml b/smarthome/docker-compose.yml similarity index 97% rename from smarthome.yml rename to smarthome/docker-compose.yml index 2f8cddc..a702ac4 100644 --- a/smarthome.yml +++ b/smarthome/docker-compose.yml @@ -27,7 +27,7 @@ services: wyoming-whisper: #speech to text for home assistant https://github.com/rhasspy/wyoming-addons image: rhasspy/wyoming-whisper - container_name: wyoming_whisper + container_name: wyoming-whisper volumes: - ${DATA_PATH}/wyoming_whisper/data:/data ports: diff --git a/smarthome/smarthome.env_template b/smarthome/smarthome.env_template new file mode 100644 index 0000000..8be201c --- /dev/null +++ b/smarthome/smarthome.env_template @@ -0,0 +1,4 @@ +#tts/stt +WYOMING_PIPER_PORT= +WYOMING_WHISPER_PORT= + diff --git a/startall.sh b/startall.sh deleted file mode 100755 index 21c4b0c..0000000 --- a/startall.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -script_root="$( dirname $0 )" - -for y in "${script_root}"/*.yml;do - by="$(basename $y)" - sudo docker-compose -f "${y}" pull - sudo docker-compose -f "${y}" -p "${by}" up -d -done - -sudo docker image prune -f diff --git a/updategit.sh b/updategit.sh deleted file mode 100755 index 8532498..0000000 --- a/updategit.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -cp .env .env_template -sed -i 's/=.*/=/' .env_template - -git add . -git commit -m "New backup `date +'%Y-%m-%d %H:%M:%S'`" -git push