| @@ -19,6 +19,3 @@ | |||
| [submodule "images/rpi-nginx-php"] | |||
| path = images/rpi-nginx-php | |||
| url = https://github.com/bingen/rpi-nginx-php.git | |||
| [submodule "images/rpi-zoneminder"] | |||
| path = images/rpi-zoneminder | |||
| url = https://github.com/bingen/rpi-zoneminder.git | |||
| @@ -146,37 +146,7 @@ services: | |||
| - ${NEXTCLOUD_DATA_VOLUME_PATH}:${NEXTCLOUD_DATA_PATH} | |||
| - ${NEXTCLOUD_BACKUP_VOLUME_PATH}:${NEXTCLOUD_BACKUP_PATH} | |||
| zoneminder: | |||
| build: | |||
| context: ./images/rpi-zoneminder/ | |||
| args: | |||
| - ZONEMINDER_DATA_PATH=${ZONEMINDER_DATA_PATH} | |||
| image: bingen/rpi-zoneminder:latest | |||
| shm_size: 256M | |||
| depends_on: | |||
| - db | |||
| #- haproxy | |||
| secrets: | |||
| - source: zoneminder_admin_pwd | |||
| target: admin_pwd | |||
| uid: '999' | |||
| mode: 0440 | |||
| - source: db_pwd | |||
| target: mysql_pwd | |||
| mode: 0440 | |||
| env_file: | |||
| - zoneminder.env | |||
| networks: | |||
| - default | |||
| ports: | |||
| - "8001:80" | |||
| - "8444:443" | |||
| #volumes: | |||
| #- ${ZONEMINDER_DATA_VOLUME_PATH}:${ZONEMINDER_DATA_PATH} | |||
| #padlock: | |||
| #gitlab: | |||
| #gogs: | |||
| #turtl: | |||
| @@ -200,8 +170,6 @@ secrets: | |||
| external: true | |||
| nextcloud_secret: | |||
| external: true | |||
| zoneminder_admin_pwd: | |||
| external: true | |||
| networks: | |||
| default: | |||
| driver: overlay | |||
| @@ -33,10 +33,3 @@ NEXTCLOUD_DATA_VOLUME_PATH=${VOLUMES_PATH}/nextcloud/data | |||
| NEXTCLOUD_BACKUP_PATH=/srv/nextcloud/backup | |||
| # external Volume path | |||
| NEXTCLOUD_BACKUP_VOLUME_PATH=${VOLUMES_PATH}/nextcloud/backup | |||
| # ZONEMINDER | |||
| # Internal data path | |||
| #ZONEMINDER_DATA_PATH=/srv/zoneminder/data | |||
| # external Volume path | |||
| #ZONEMINDER_DATA_VOLUME_PATH=/media/volumes/zoneminder/ | |||
| @@ -1 +0,0 @@ | |||
| Subproject commit 88976bff74db091f99292e7d72b2c2f927366e7e | |||
| @@ -64,11 +64,6 @@ echo "They are used by Passman and need to remain the same for the vaults to be | |||
| read -p "Nextcloud Pwd Salt (a random one will be generated by NC if empty): " nextcloud_salt | |||
| read -p "Nextcloud Secret (a random one will be generated by NC if empty): " nextcloud_secret | |||
| read -p "Zoneminder Admin User Pwd (a random one will be generated if empty): " zoneminder_admin_pwd | |||
| if [[ ${#zoneminder_admin_pwd} -eq 0 ]]; then | |||
| zoneminder_admin_pwd=`eval "$PWD_GEN"` | |||
| fi | |||
| echo $'\E[33m' | |||
| echo "//////////////////////////////////////////////////" | |||
| echo "///////////////// PLEASE CONFIRM /////////////////" | |||
| @@ -99,7 +94,6 @@ echo $ldap_nextcloud_pwd | docker secret create ldap_nextcloud_pwd - | |||
| echo $nextcloud_admin_pwd | docker secret create nextcloud_admin_pwd - | |||
| echo $nextcloud_salt | docker secret create nextcloud_salt - | |||
| echo $nextcloud_secret | docker secret create nextcloud_secret - | |||
| echo $zoneminder_admin_pwd | docker secret create zoneminder_admin_pwd - | |||
| echo $'\E[33m' | |||
| echo "//////////////////////////////////////////////////" | |||
| @@ -111,7 +105,6 @@ cp env.template .env | |||
| cp openldap.env.template openldap.env | |||
| cp mail.env.template mail.env | |||
| cp nextcloud.env.template nextcloud.env | |||
| cp zoneminder.env.template zoneminder.env | |||
| cp haproxy.env.template haproxy.env | |||
| for i in `ls *.env .env`; do | |||
| @@ -1,9 +0,0 @@ | |||
| ZONEMINDER_DOMAIN=${DOMAIN} | |||
| ZONEMINDER_SERVER_NAME=zoneminder | |||
| ZONEMINDER_ADMIN_PWD_FILE=/run/secrets/admin_pwd | |||
| TIMEZONE=Europe/Madrid | |||
| # DB | |||
| MYSQL_ROOT_PWD_FILE=/run/secrets/mysql_pwd | |||
| DB_HOST=db | |||
| ZONEMINDER_DB_NAME=zm | |||
| ZONEMINDER_DB_USER=zmuser | |||