diff options
| author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-04-14 10:40:04 +0200 |
|---|---|---|
| committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-04-14 10:40:04 +0200 |
| commit | bb0e1f38162aa143666ad66c113675c2589fa57b (patch) | |
| tree | 256552636edfd276fa10c07693a7e81817721799 /environments | |
| parent | 8426269875e5dd62e8c8fd464b1955263b4d1cef (diff) | |
| parent | c2f33e53cf694819878f95b7200c3a3abebe52dc (diff) | |
| download | Puppet-bb0e1f38162aa143666ad66c113675c2589fa57b.tar.gz Puppet-bb0e1f38162aa143666ad66c113675c2589fa57b.tar.zst Puppet-bb0e1f38162aa143666ad66c113675c2589fa57b.zip | |
Merge branch 'dev'
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/global/common.yaml | 4 | ||||
| -rw-r--r-- | environments/global/types/s1-2.yaml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/environments/global/common.yaml b/environments/global/common.yaml index 2dfe0aa..3cc75fa 100644 --- a/environments/global/common.yaml +++ b/environments/global/common.yaml | |||
| @@ -33,8 +33,8 @@ base_installation::notify_xmpp: {} | |||
| 33 | profile::fstab::mounts: | 33 | profile::fstab::mounts: |
| 34 | - "%{facts.ldapvar.self.vars.mounts.0}" | 34 | - "%{facts.ldapvar.self.vars.mounts.0}" |
| 35 | - "%{facts.ldapvar.self.vars.mounts.1}" | 35 | - "%{facts.ldapvar.self.vars.mounts.1}" |
| 36 | profile::xmr_stak::mining_pool: "" # Fetched via ldap | 36 | profile::xmr_stak::mining_pool: "" |
| 37 | profile::xmr_stak::wallet: "" # Fetched via ldap | 37 | profile::xmr_stak::wallet: "" |
| 38 | profile::mail::mailhub: "" # Fetched via ldap | 38 | profile::mail::mailhub: "" # Fetched via ldap |
| 39 | role::backup::mailto: "" # Fetched via ldap | 39 | role::backup::mailto: "" # Fetched via ldap |
| 40 | role::backup::backups: [] # Fetched via ldap | 40 | role::backup::backups: [] # Fetched via ldap |
diff --git a/environments/global/types/s1-2.yaml b/environments/global/types/s1-2.yaml index 5bfdf9a..fb0d663 100644 --- a/environments/global/types/s1-2.yaml +++ b/environments/global/types/s1-2.yaml | |||
| @@ -7,4 +7,4 @@ base_installation::system_hostname: "%{ldapvar.self.vars.host.0}" | |||
| 7 | base_installation::real_hostname: "%{facts.ec2_metadata.hostname}.v.immae.eu" | 7 | base_installation::real_hostname: "%{facts.ec2_metadata.hostname}.v.immae.eu" |
| 8 | base_installation::ldap_cert_path: "/etc/ssl/certs/ca-certificates.crt" | 8 | base_installation::ldap_cert_path: "/etc/ssl/certs/ca-certificates.crt" |
| 9 | letsencrypt::try_for_real_hostname: true | 9 | letsencrypt::try_for_real_hostname: true |
| 10 | profile::xmr_stak::cpulimit: "30" | 10 | profile::xmr_stak::cpulimit: "0" |