Compare commits

..

No commits in common. "fce600d56ce889f5cc11dca5b5986f08263b8899" and "6a47214cd66857f0ed8e380c9318d7636f8aab9f" have entirely different histories.

4 changed files with 15 additions and 23 deletions

View file

@ -17,7 +17,7 @@
- gitea
- postfix
- matrix_riot
- privatebin
- pastebin
smtp_host: postfix
smtp_port: 587

View file

@ -1,6 +1,3 @@
nginx:
volume_folder: "{{ volume_root_folder }}/nginx"
ldap:
domain: "ldap.{{ base_domain }}"

View file

@ -1,10 +1,8 @@
---
- name: create nginx-proxy volume folders
file:
name: "{{ nginx.volume_folder }}/{{ volume }}"
state: directory
loop:
- docker_volume:
name: "{{ volume }}"
with_items:
- conf
- vhost
- html
@ -24,11 +22,11 @@
- "80:80"
- "443:443"
volumes:
- "{{ nginx.volume_folder }}/conf:/etc/nginx/conf.d"
- "{{ nginx.volume_folder }}/vhost:/etc/nginx/vhost.d"
- "{{ nginx.volume_folder }}/html:/usr/share/nginx/html"
- "{{ nginx.volume_folder }}/dhparam:/etc/nginx/dhparam"
- "{{ nginx.volume_folder }}/certs:/etc/nginx/certs:ro"
- conf:/etc/nginx/conf.d
- vhost:/etc/nginx/vhost.d
- html:/usr/share/nginx/html
- dhparam:/etc/nginx/dhparam
- certs:/etc/nginx/certs:ro
- /var/run/docker.sock:/tmp/docker.sock:ro
- name: nginx letsencrypt container
@ -37,11 +35,10 @@
image: jrcs/letsencrypt-nginx-proxy-companion
restart_policy: always
volumes:
- "{{ nginx.volume_folder }}/vhost:/etc/nginx/vhost.d"
- "{{ nginx.volume_folder }}/html:/usr/share/nginx/html"
- "{{ nginx.volume_folder }}/dhparam:/etc/nginx/dhparam:ro"
- "{{ nginx.volume_folder }}/certs:/etc/nginx/certs"
- vhost:/etc/nginx/vhost.d
- html:/usr/share/nginx/html
- dhparam:/etc/nginx/dhparam:ro
- certs:/etc/nginx/certs
- /var/run/docker.sock:/var/run/docker.sock:ro
env:
NGINX_PROXY_CONTAINER: nginx-proxy

View file

@ -2,13 +2,11 @@
- name: create privatebin volume folders
file:
name: "{{ privatebin.volume_folder }}/{{ volume }}"
name: "{{ privatebin.volume_folder }}/{{ item }}"
state: directory
loop:
with_items:
- cfg
- data
loop_control:
loop_var: volume
- name: upload privatebin config
template: