diff options
| author | Micah Anderson <micah@riseup.net> | 2014-11-07 22:38:17 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2014-11-07 22:38:52 -0500 |
| commit | 04f7ca0db053c8a0326863a9bb5e5719ab617891 (patch) | |
| tree | 19d1cffa7d817075c0feef5f8e678bbada2a7b73 /hiera | |
| parent | 5b3e82d0d64b420609c4db2f2680727b10c7e4a1 (diff) | |
update from compile
Diffstat (limited to 'hiera')
| -rw-r--r-- | hiera/canvasback.yaml | 13 | ||||
| -rw-r--r-- | hiera/deer.yaml | 10 | ||||
| -rw-r--r-- | hiera/hippo.yaml | 6 | ||||
| -rw-r--r-- | hiera/tor1.yaml | 6 | ||||
| -rw-r--r-- | hiera/wallaby.yaml | 13 | ||||
| -rw-r--r-- | hiera/web1.yaml | 13 |
6 files changed, 53 insertions, 8 deletions
diff --git a/hiera/canvasback.yaml b/hiera/canvasback.yaml index 8c5dd5b..1f8d46f 100644 --- a/hiera/canvasback.yaml +++ b/hiera/canvasback.yaml @@ -237,11 +237,22 @@ webapp: password: _CatyL3Ienc4wRrfPubrhyfYCFmCyt9t salt: 1c1dd6eb78f027414f1638bd6c902a5a username: webapp - customization_dir: /srv/leap/files/files/webapp/ + customization_dir: /srv/leap/files/webapp/ default_service_level: 1 domain: cdev.bitmask.net engines: - support + forbidden_usernames: + - admin + - administrator + - arin-admin + - certmaster + - contact + - info + - maildrop + - postmaster + - ssladmin + - www-data git: revision: origin/master source: "https://leap.se/git/leap_web" diff --git a/hiera/deer.yaml b/hiera/deer.yaml index 53af5c9..3a4a547 100644 --- a/hiera/deer.yaml +++ b/hiera/deer.yaml @@ -77,12 +77,12 @@ tor: contacts: - sysdev@leap.se family: "deeruSaR9IekHdQGUGI,hippobagtc8Z3KPmfnT" - hidden_service: ~ - key: + hidden_service: + active: ~ address: ~ - private: ~ - public: ~ - type: RSA + key_type: RSA + private_key: ~ + public_key: ~ nickname: deeruSaR9IekHdQGUGI type: exit x509: diff --git a/hiera/hippo.yaml b/hiera/hippo.yaml index 77df114..bea7963 100644 --- a/hiera/hippo.yaml +++ b/hiera/hippo.yaml @@ -105,6 +105,12 @@ tor: contacts: - sysdev@leap.se family: "deeruSaR9IekHdQGUGI,hippobagtc8Z3KPmfnT" + hidden_service: + active: ~ + address: ~ + key_type: RSA + private_key: ~ + public_key: ~ nickname: hippobagtc8Z3KPmfnT x509: ca_cert: | diff --git a/hiera/tor1.yaml b/hiera/tor1.yaml index 4b0a98c..7363ed3 100644 --- a/hiera/tor1.yaml +++ b/hiera/tor1.yaml @@ -73,6 +73,12 @@ tor: contacts: - sysdev@leap.se family: "deeruSaR9IekHdQGUGI,hippobagtc8Z3KPmfnT" + hidden_service: + active: ~ + address: ~ + key_type: RSA + private_key: ~ + public_key: ~ nickname: tor1pPXtPbHH5BVHVE2 x509: ca_cert: | diff --git a/hiera/wallaby.yaml b/hiera/wallaby.yaml index d5cb95d..e9a07e1 100644 --- a/hiera/wallaby.yaml +++ b/hiera/wallaby.yaml @@ -309,11 +309,22 @@ webapp: password: LH5DH5rbLZs7zuCaIgWpDAetDpLvUAHg salt: c632af58769857bcdf108b46da9eaa44 username: webapp - customization_dir: /srv/leap/files/files/webapp/ + customization_dir: /srv/leap/files/webapp/ default_service_level: 1 domain: demo.bitmask.net engines: - support + forbidden_usernames: + - admin + - administrator + - arin-admin + - certmaster + - contact + - info + - maildrop + - postmaster + - ssladmin + - www-data git: revision: origin/master source: "https://leap.se/git/leap_web" diff --git a/hiera/web1.yaml b/hiera/web1.yaml index 54b2f51..8fed05a 100644 --- a/hiera/web1.yaml +++ b/hiera/web1.yaml @@ -265,11 +265,22 @@ webapp: password: pg9XGGdt4Dr3WcM9PYDqMmxxKHTpvsc9 salt: 7e8868f8c4775290fd37d2f520d13672 username: webapp - customization_dir: /srv/leap/files/files/webapp/ + customization_dir: /srv/leap/files/webapp/ default_service_level: 1 domain: bitmask.net engines: - support + forbidden_usernames: + - admin + - administrator + - arin-admin + - certmaster + - contact + - info + - maildrop + - postmaster + - ssladmin + - www-data git: revision: origin/master source: "https://leap.se/git/leap_web" |