diff options
| author | EuAndreh <eu@euandre.org> | 2020-08-05 06:58:47 -0300 |
|---|---|---|
| committer | EuAndreh <eu@euandre.org> | 2020-08-05 06:58:47 -0300 |
| commit | 9afe00db59e733609e826f7448bb80f1c6be37b9 (patch) | |
| tree | 37f14a5fbd8f594051285923c721f117c6d393e4 | |
| parent | Update docker volume mapping configuration (diff) | |
| download | server-9afe00db59e733609e826f7448bb80f1c6be37b9.tar.gz server-9afe00db59e733609e826f7448bb80f1c6be37b9.tar.xz | |
Checkpoint: working Nextcloud installation with configured trusted domains
| -rw-r--r-- | docker-compose.env.yaml | 30 | ||||
| -rw-r--r-- | provision.env.yaml | 2 |
2 files changed, 18 insertions, 14 deletions
diff --git a/docker-compose.env.yaml b/docker-compose.env.yaml index 92075a5..a27162f 100644 --- a/docker-compose.env.yaml +++ b/docker-compose.env.yaml @@ -1,16 +1,7 @@ version: '3' -volumes: - conf: - vhost: - html: - dhparam: - certs: - networks: - default: - external: - name: nginx-proxy + nginx-proxy-network: services: nginx-proxy: @@ -27,6 +18,8 @@ services: - "${VOLUME_HOME}/docker/nginx-proxy/certs:/etc/nginx/certs:ro" - "${VOLUME_HOME}/docker/nginx-proxy/conf:/etc/nginx/conf.d" - "${VOLUME_HOME}/docker/nginx-proxy/dhparam:/etc/nginx/dhparam" + networks: + - nginx-proxy-network letsencrypt: image: jrcs/letsencrypt-nginx-proxy-companion @@ -42,6 +35,8 @@ services: - nginx-proxy environment: - NGINX_PROXY_CONTAINER=nginx-proxy + networks: + - nginx-proxy-network static: image: nginx @@ -56,22 +51,31 @@ services: - VIRTUAL_PORT=${STATIC_PORT} - LETSENCRYPT_HOST=${STATIC_TLD} - LETSENCRYPT_EMAIL=${LETSENCRYPT_EMAIL} + networks: + - nginx-proxy-network nextcloud: - image: nextcloud:fpm + image: nextcloud:latest container_name: nextcloud restart: always volumes: - - "${VOLUME_HOME}/applications/nextcloud:/var/www/html" + - "${VOLUME_HOME}/applications/nextcloud/data:/var/www/html" + - "${VOLUME_HOME}/applications/nextcloud/config:/var/www/config" + - "${VOLUME_HOME}/applications/nextcloud/apps:/var/www/apps" ports: - - "${NEXTCLOUD_PORT}:9000" + - "${NEXTCLOUD_PORT}:80" environment: - SQLITE_DATABASE=my-nextcloud-database.sqlite - NEXTCLOUD_UPDATE=1 - NEXTCLOUD_ADMIN_USER=${NEXTCLOUD_ADMIN_USER} - NEXTCLOUD_ADMIN_PASSWORD=${NEXTCLOUD_ADMIN_PASSWORD} - NEXTCLOUD_TABLE_PREFIX=${NEXTCLOUD_TABLE_PREFIX} + - NEXTCLOUD_HOSTNAME=${NEXTCLOUD_TLD} + - NEXTCLOUD_TRUSTED_DOMAINS=${NEXTCLOUD_TLD} - VIRTUAL_HOST=${NEXTCLOUD_TLD} - VIRTUAL_PORT=${NEXTCLOUD_PORT} - LETSENCRYPT_HOST=${NEXTCLOUD_TLD} - LETSENCRYPT_EMAIL=${LETSENCRYPT_EMAIL} + networks: + - nginx-proxy-network + diff --git a/provision.env.yaml b/provision.env.yaml index e03969a..39cd45e 100644 --- a/provision.env.yaml +++ b/provision.env.yaml @@ -33,7 +33,7 @@ when: lookup('env', 'DESTROY_VPS') == "1" - name: Create the required Docker network docker_network: - name: nginx-proxy + name: nginx-proxy-network - name: Start docker-compose docker_compose: project_src: /home/vps/ |