diff --git a/ansible/roles/hedgedoc/docker-stack.yml.j2 b/ansible/roles/hedgedoc/docker-stack.yml.j2 index 6a03c41..2af951b 100644 --- a/ansible/roles/hedgedoc/docker-stack.yml.j2 +++ b/ansible/roles/hedgedoc/docker-stack.yml.j2 @@ -17,7 +17,7 @@ services: image: quay.io/hedgedoc/hedgedoc:1.9.7 environment: - CMD_DB_URL=postgres://hedgedoc:{{ database_passwords.hedgedoc }}@192.168.30.10:5432/hedgedoc - - CMD_DOMAIN=md.pim.kunis.nl + - CMD_DOMAIN=md.kun.is - CMD_PORT=3000 - CMD_URL_ADDPORT=false - CMD_ALLOW_ANONYMOUS=true @@ -36,7 +36,7 @@ services: labels: - traefik.enable=true - traefik.http.routers.hedgedoc.entrypoints=websecure - - traefik.http.routers.hedgedoc.rule=Host(`md.pim.kunis.nl`) + - traefik.http.routers.hedgedoc.rule=Host(`md.kun.is`) - traefik.http.routers.hedgedoc.tls=true - traefik.http.routers.hedgedoc.tls.certresolver=letsencrypt - traefik.http.routers.hedgedoc.service=hedgedoc diff --git a/ansible/roles/hedgedoc/tasks/main.yml b/ansible/roles/hedgedoc/tasks/main.yml index 10c8f08..e3ca514 100644 --- a/ansible/roles/hedgedoc/tasks/main.yml +++ b/ansible/roles/hedgedoc/tasks/main.yml @@ -1,6 +1,3 @@ -- name: asdfasdf - debug: - msg: "{{ lookup('template', '{{ role_path }}/docker-stack.yml.j2') | from_yaml }}" - name: Deploy Docker stack docker_stack: name: hedgedoc diff --git a/ansible/roles/nextcloud/docker-stack.yml.j2 b/ansible/roles/nextcloud/docker-stack.yml.j2 index 395556c..6cc8d55 100644 --- a/ansible/roles/nextcloud/docker-stack.yml.j2 +++ b/ansible/roles/nextcloud/docker-stack.yml.j2 @@ -22,7 +22,7 @@ services: volume: nocopy: true environment: - - POSTGRES_USER=swarm + - POSTGRES_USER=nextcloud - POSTGRES_DB=nextcloud - POSTGRES_PASSWORD={{ database_passwords.nextcloud }} - POSTGRES_HOST=192.168.30.10 diff --git a/ansible/roles/overleaf/docker-stack.yml.j2 b/ansible/roles/overleaf/docker-stack.yml.j2 index 020dc99..67ab872 100644 --- a/ansible/roles/overleaf/docker-stack.yml.j2 +++ b/ansible/roles/overleaf/docker-stack.yml.j2 @@ -54,28 +54,15 @@ services: # see https://github.com/overleaf/overleaf/issues/695 TEXMFVAR: /var/lib/sharelatex/tmp/texmf-var - ## Set for SSL via nginx-proxy - #VIRTUAL_HOST: 103.112.212.22 - SHARELATEX_SITE_URL: https://latex.pim.kunis.nl - # SHARELATEX_NAV_TITLE: Our ShareLaTeX Instance - # SHARELATEX_HEADER_IMAGE_URL: http://somewhere.com/mylogo.png SHARELATEX_ADMIN_EMAIL: pim@kunis.nl - # SHARELATEX_LEFT_FOOTER: '[{"text": "Powered by ShareLaTeX 2016"},{"text": "Another page I want to link to can be found here"} ]' - # SHARELATEX_RIGHT_FOOTER: '[{"text": "Hello I am on the Right"} ]' - SHARELATEX_EMAIL_FROM_ADDRESS: "noreply@kunis.nl" SHARELATEX_EMAIL_SMTP_HOST: "smtp.tweak.nl" SHARELATEX_EMAIL_SMTP_PORT: 587 SHARELATEX_EMAIL_SMTP_USER: "" SHARELATEX_EMAIL_SMTP_PASS: "" - # SHARELATEX_EMAIL_SMTP_TLS_REJECT_UNAUTH: true - # SHARELATEX_EMAIL_SMTP_IGNORE_TLS: false - # SHARELATEX_EMAIL_SMTP_NAME: '127.0.0.1' - # SHARELATEX_EMAIL_SMTP_LOGGER: true - # SHARELATEX_CUSTOM_EMAIL_FOOTER: "This system is run by department x" overleaf-mongodb: image: mongo:4.4