Compare commits
No commits in common. "fce600d56ce889f5cc11dca5b5986f08263b8899" and "6a47214cd66857f0ed8e380c9318d7636f8aab9f" have entirely different histories.
fce600d56c
...
6a47214cd6
|
@ -17,7 +17,7 @@
|
||||||
- gitea
|
- gitea
|
||||||
- postfix
|
- postfix
|
||||||
- matrix_riot
|
- matrix_riot
|
||||||
- privatebin
|
- pastebin
|
||||||
|
|
||||||
smtp_host: postfix
|
smtp_host: postfix
|
||||||
smtp_port: 587
|
smtp_port: 587
|
||||||
|
|
|
@ -1,6 +1,3 @@
|
||||||
nginx:
|
|
||||||
volume_folder: "{{ volume_root_folder }}/nginx"
|
|
||||||
|
|
||||||
ldap:
|
ldap:
|
||||||
domain: "ldap.{{ base_domain }}"
|
domain: "ldap.{{ base_domain }}"
|
||||||
|
|
||||||
|
|
|
@ -1,10 +1,8 @@
|
||||||
---
|
---
|
||||||
|
|
||||||
- name: create nginx-proxy volume folders
|
- docker_volume:
|
||||||
file:
|
name: "{{ volume }}"
|
||||||
name: "{{ nginx.volume_folder }}/{{ volume }}"
|
with_items:
|
||||||
state: directory
|
|
||||||
loop:
|
|
||||||
- conf
|
- conf
|
||||||
- vhost
|
- vhost
|
||||||
- html
|
- html
|
||||||
|
@ -24,11 +22,11 @@
|
||||||
- "80:80"
|
- "80:80"
|
||||||
- "443:443"
|
- "443:443"
|
||||||
volumes:
|
volumes:
|
||||||
- "{{ nginx.volume_folder }}/conf:/etc/nginx/conf.d"
|
- conf:/etc/nginx/conf.d
|
||||||
- "{{ nginx.volume_folder }}/vhost:/etc/nginx/vhost.d"
|
- vhost:/etc/nginx/vhost.d
|
||||||
- "{{ nginx.volume_folder }}/html:/usr/share/nginx/html"
|
- html:/usr/share/nginx/html
|
||||||
- "{{ nginx.volume_folder }}/dhparam:/etc/nginx/dhparam"
|
- dhparam:/etc/nginx/dhparam
|
||||||
- "{{ nginx.volume_folder }}/certs:/etc/nginx/certs:ro"
|
- certs:/etc/nginx/certs:ro
|
||||||
- /var/run/docker.sock:/tmp/docker.sock:ro
|
- /var/run/docker.sock:/tmp/docker.sock:ro
|
||||||
|
|
||||||
- name: nginx letsencrypt container
|
- name: nginx letsencrypt container
|
||||||
|
@ -37,11 +35,10 @@
|
||||||
image: jrcs/letsencrypt-nginx-proxy-companion
|
image: jrcs/letsencrypt-nginx-proxy-companion
|
||||||
restart_policy: always
|
restart_policy: always
|
||||||
volumes:
|
volumes:
|
||||||
- "{{ nginx.volume_folder }}/vhost:/etc/nginx/vhost.d"
|
- vhost:/etc/nginx/vhost.d
|
||||||
- "{{ nginx.volume_folder }}/html:/usr/share/nginx/html"
|
- html:/usr/share/nginx/html
|
||||||
- "{{ nginx.volume_folder }}/dhparam:/etc/nginx/dhparam:ro"
|
- dhparam:/etc/nginx/dhparam:ro
|
||||||
- "{{ nginx.volume_folder }}/certs:/etc/nginx/certs"
|
- certs:/etc/nginx/certs
|
||||||
- /var/run/docker.sock:/var/run/docker.sock:ro
|
- /var/run/docker.sock:/var/run/docker.sock:ro
|
||||||
env:
|
env:
|
||||||
NGINX_PROXY_CONTAINER: nginx-proxy
|
NGINX_PROXY_CONTAINER: nginx-proxy
|
||||||
|
|
||||||
|
|
|
@ -2,13 +2,11 @@
|
||||||
|
|
||||||
- name: create privatebin volume folders
|
- name: create privatebin volume folders
|
||||||
file:
|
file:
|
||||||
name: "{{ privatebin.volume_folder }}/{{ volume }}"
|
name: "{{ privatebin.volume_folder }}/{{ item }}"
|
||||||
state: directory
|
state: directory
|
||||||
loop:
|
with_items:
|
||||||
- cfg
|
- cfg
|
||||||
- data
|
- data
|
||||||
loop_control:
|
|
||||||
loop_var: volume
|
|
||||||
|
|
||||||
- name: upload privatebin config
|
- name: upload privatebin config
|
||||||
template:
|
template:
|
||||||
|
|
Loading…
Reference in a new issue