diff options
| author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-06-28 19:52:57 +0200 |
|---|---|---|
| committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-06-28 19:52:57 +0200 |
| commit | 41790868cb155d490975e8e4480ddd2c889a3e75 (patch) | |
| tree | 746054236b28e50787ab8516874c8b5ff5776ad5 /environments | |
| parent | 8ba2695560695a1aad5c873bf9fb982933220c6f (diff) | |
| parent | c67098465daafca1ceaf6b2b3f940f843ef09edf (diff) | |
| download | Puppet-41790868cb155d490975e8e4480ddd2c889a3e75.tar.gz Puppet-41790868cb155d490975e8e4480ddd2c889a3e75.tar.zst Puppet-41790868cb155d490975e8e4480ddd2c889a3e75.zip | |
Merge branch 'etherpad_proxy' into dev
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/global/roles/etherpad.yaml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/environments/global/roles/etherpad.yaml b/environments/global/roles/etherpad.yaml index f8781e1..6210fcf 100644 --- a/environments/global/roles/etherpad.yaml +++ b/environments/global/roles/etherpad.yaml | |||
| @@ -1,3 +1,5 @@ | |||
| 1 | --- | 1 | --- |
| 2 | classes: | 2 | classes: |
| 3 | role::etherpad: ~ | 3 | role::etherpad: ~ |
| 4 | letsencrypt::hosts: "ether.%{lookup('base_installation::real_hostname')}" | ||
| 5 | role::etherpad::web_host: "ether.%{lookup('base_installation::real_hostname')}" | ||