[sputnik] Ho, you lost the wiki, we lost the wiki too
parent
356f574a31
commit
263e512801
|
@ -30,9 +30,6 @@ loc_slapd:
|
|||
replica: true
|
||||
replica_rid: 4
|
||||
|
||||
loc_moinmoin:
|
||||
main: false
|
||||
|
||||
loc_certbot:
|
||||
- mail: root@crans.org
|
||||
certname: adm.crans.org
|
||||
|
@ -60,64 +57,22 @@ loc_service_certbot:
|
|||
secret: "{{ vault.bind.rfc2136_keys['certbot_adm_challenge.'].secret }}"
|
||||
algorithm: HMAC-SHA512
|
||||
|
||||
loc_nginx:
|
||||
service_name: wiki
|
||||
ssl:
|
||||
- name: adm.crans.org
|
||||
cert: /etc/letsencrypt/live/adm.crans.org/fullchain.pem
|
||||
cert_key: /etc/letsencrypt/live/adm.crans.org/privkey.pem
|
||||
trusted_cert: /etc/letsencrypt/live/adm.crans.org/chain.pem
|
||||
- name: crans.org
|
||||
cert: /etc/letsencrypt/live/crans.org/fullchain.pem
|
||||
cert_key: /etc/letsencrypt/live/crans.org/privkey.pem
|
||||
trusted_cert: /etc/letsencrypt/live/crans.org/chain.pem
|
||||
servers:
|
||||
- server_name:
|
||||
- "wiki2.crans.org"
|
||||
ssl: "crans.org"
|
||||
access_log: "/var/log/nginx/wiki.log combined"
|
||||
error_log: "/var/log/nginx/wiki.error.log"
|
||||
additional_params:
|
||||
- "rewrite ^/$ $scheme://wiki2.crans.org/PageAccueil"
|
||||
- "client_max_body_size 15M"
|
||||
|
||||
locations:
|
||||
- filter: "/wiki"
|
||||
params:
|
||||
- "alias /var/local/wiki/htdocs/"
|
||||
|
||||
- filter: "/robots.txt"
|
||||
params:
|
||||
- "alias /var/local/wiki/robots.txt"
|
||||
|
||||
- filter: "/favicon.ico"
|
||||
params:
|
||||
- "alias /var/local/wiki/favicon.ico"
|
||||
|
||||
- filter: "/www-sitemap.xml"
|
||||
params:
|
||||
- "alias /var/local/wiki/www-sitemap.xml"
|
||||
|
||||
- filter: "/"
|
||||
params:
|
||||
- "uwsgi_pass unix:///var/run/uwsgi/app/moinmoin/socket"
|
||||
- "include uwsgi_params"
|
||||
|
||||
loc_reverseproxy:
|
||||
reverseproxy_sites:
|
||||
- {from: status.crans.org, to: "127.0.0.1:8080"}
|
||||
- {from: git2.crans.org, to: "127.0.0.1:3000"}
|
||||
- {from: git2.adm.crans.org, to: "127.0.0.1:3000", ssl: adm.crans.org}
|
||||
|
||||
redirect_sites: []
|
||||
|
||||
static_sites: []
|
||||
|
||||
|
||||
loc_bind:
|
||||
default:
|
||||
type: slave
|
||||
primaries: "{{ query('ldap', 'ip', 'silice', 'adm') }}"
|
||||
|
||||
|
||||
loc_service_ssh_known_hosts:
|
||||
config:
|
||||
ldap:
|
||||
|
|
Loading…
Reference in New Issue