Loading ansible.yml +0 −1 Original line number Diff line number Diff line Loading @@ -88,7 +88,6 @@ - { path: '/mnt/repo-base/config-dynamic/letsencrypt/autorenew', owner: root } - { path: '/mnt/repo-base/config-dynamic/nginx/sites-enabled', owner: root } - { path: '/mnt/repo-base/volumes/accounts/', owner: www-data } - { path: '/mnt/repo-base/volumes/create-account/', owner: 900 } # NOTE: This does not delete files that have been deleted from the repo, need to do that manually. - name: copy static config files Loading group_vars/all +0 −1 Original line number Diff line number Diff line # MUST SPECIFY # TODO: need to do something about these variables so they are not committed to git domain: "" additional_domains: [] contact_email: "<user-email>" Loading scripts/postinstall.sh +5 −3 Original line number Diff line number Diff line #!/usr/bin/env bash set -ex # TODO: it looks like this script is executed twice when installing with ansible source /mnt/repo-base/scripts/base.sh echo -e "\nHack: restart everything to ensure that database and nextcloud are initialized" docker-compose restart printf "$(date): Waiting for Nextcloud to finish installation" sleep 300 # sleep for 300 seconds for i in {0..300}; do sleep 1 printf "." done # Create Nextcloud mysql database and user docker-compose exec -T mariadb mysql --user=root --password="$MYSQL_ROOT_PASSWORD" \ Loading templates/docker-compose/01-docker-compose-base.yml +1 −6 Original line number Diff line number Diff line Loading @@ -134,7 +134,7 @@ services: - /mnt/repo-base/config-dynamic/automx/automx.conf:/etc/automx.conf create-account: image: registry.gitlab.e.foundation:5000/e/infra/docker-create-account:1.1.0 image: registry.gitlab.e.foundation:5000/e/infra/docker-create-account:1.0.1 container_name: create-account restart: always environment: Loading @@ -143,11 +143,6 @@ services: - POSTFIXADMIN_SSH_PASSWORD=${POSTFIXADMIN_SSH_PASSWORD} - DOMAIN=${DOMAIN} - CREATE_ACCOUNT_PASSWORD=${CREATE_ACCOUNT_PASSWORD} - SMTP_HOST=${SMTP_HOST} - SMTP_FROM=${SMTP_FROM} - SMTP_PASSWORD=${SMTP_PW} volumes: - /mnt/repo-base/volumes/create-account:/data networks: - serverbase depends_on: Loading templates/nginx/sites-enabled/nextcloud.conf +0 −3 Original line number Diff line number Diff line Loading @@ -92,7 +92,4 @@ server { add_header Referrer-Policy no-referrer; access_log off; } location ~ /(delete-account|delete-account-form|confirm-delete-account) { proxy_pass http://create-account:9000; } } Loading
ansible.yml +0 −1 Original line number Diff line number Diff line Loading @@ -88,7 +88,6 @@ - { path: '/mnt/repo-base/config-dynamic/letsencrypt/autorenew', owner: root } - { path: '/mnt/repo-base/config-dynamic/nginx/sites-enabled', owner: root } - { path: '/mnt/repo-base/volumes/accounts/', owner: www-data } - { path: '/mnt/repo-base/volumes/create-account/', owner: 900 } # NOTE: This does not delete files that have been deleted from the repo, need to do that manually. - name: copy static config files Loading
group_vars/all +0 −1 Original line number Diff line number Diff line # MUST SPECIFY # TODO: need to do something about these variables so they are not committed to git domain: "" additional_domains: [] contact_email: "<user-email>" Loading
scripts/postinstall.sh +5 −3 Original line number Diff line number Diff line #!/usr/bin/env bash set -ex # TODO: it looks like this script is executed twice when installing with ansible source /mnt/repo-base/scripts/base.sh echo -e "\nHack: restart everything to ensure that database and nextcloud are initialized" docker-compose restart printf "$(date): Waiting for Nextcloud to finish installation" sleep 300 # sleep for 300 seconds for i in {0..300}; do sleep 1 printf "." done # Create Nextcloud mysql database and user docker-compose exec -T mariadb mysql --user=root --password="$MYSQL_ROOT_PASSWORD" \ Loading
templates/docker-compose/01-docker-compose-base.yml +1 −6 Original line number Diff line number Diff line Loading @@ -134,7 +134,7 @@ services: - /mnt/repo-base/config-dynamic/automx/automx.conf:/etc/automx.conf create-account: image: registry.gitlab.e.foundation:5000/e/infra/docker-create-account:1.1.0 image: registry.gitlab.e.foundation:5000/e/infra/docker-create-account:1.0.1 container_name: create-account restart: always environment: Loading @@ -143,11 +143,6 @@ services: - POSTFIXADMIN_SSH_PASSWORD=${POSTFIXADMIN_SSH_PASSWORD} - DOMAIN=${DOMAIN} - CREATE_ACCOUNT_PASSWORD=${CREATE_ACCOUNT_PASSWORD} - SMTP_HOST=${SMTP_HOST} - SMTP_FROM=${SMTP_FROM} - SMTP_PASSWORD=${SMTP_PW} volumes: - /mnt/repo-base/volumes/create-account:/data networks: - serverbase depends_on: Loading
templates/nginx/sites-enabled/nextcloud.conf +0 −3 Original line number Diff line number Diff line Loading @@ -92,7 +92,4 @@ server { add_header Referrer-Policy no-referrer; access_log off; } location ~ /(delete-account|delete-account-form|confirm-delete-account) { proxy_pass http://create-account:9000; } }