diff options
| author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-03-19 16:21:22 +0100 |
|---|---|---|
| committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-03-19 16:21:22 +0100 |
| commit | 433e9279d165bf225c597834b5a7c7ae64c11a27 (patch) | |
| tree | 3419561c1aa1f57dc21f8665e3d9e6d0531d5df9 /environments/global/types | |
| parent | b60b98643a6da52c08ced89779964b722230a7db (diff) | |
| parent | c443842eae41fb28d5608acfd303106e5f24798a (diff) | |
| download | Puppet-433e9279d165bf225c597834b5a7c7ae64c11a27.tar.gz Puppet-433e9279d165bf225c597834b5a7c7ae64c11a27.tar.zst Puppet-433e9279d165bf225c597834b5a7c7ae64c11a27.zip | |
Merge branch 'fixes' into dev
Diffstat (limited to 'environments/global/types')
| -rw-r--r-- | environments/global/types/s1-2.yaml | 1 | ||||
| -rw-r--r-- | environments/global/types/vps-ovhssd-1.yaml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/environments/global/types/s1-2.yaml b/environments/global/types/s1-2.yaml index a7ba753..5bfdf9a 100644 --- a/environments/global/types/s1-2.yaml +++ b/environments/global/types/s1-2.yaml | |||
| @@ -7,3 +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" | ||
diff --git a/environments/global/types/vps-ovhssd-1.yaml b/environments/global/types/vps-ovhssd-1.yaml index 68534dc..8dd512c 100644 --- a/environments/global/types/vps-ovhssd-1.yaml +++ b/environments/global/types/vps-ovhssd-1.yaml | |||
| @@ -8,3 +8,4 @@ base_installation::real_hostname: "%{facts.ec2_metadata.hostname}.ovh.net" | |||
| 8 | base_installation::grub_device: "/dev/sdb" | 8 | base_installation::grub_device: "/dev/sdb" |
| 9 | base_installation::ldap_cert_path: "/etc/ssl/certs/ca-certificates.crt" | 9 | base_installation::ldap_cert_path: "/etc/ssl/certs/ca-certificates.crt" |
| 10 | letsencrypt::try_for_real_hostname: false | 10 | letsencrypt::try_for_real_hostname: false |
| 11 | profile::xmr_stak::cpulimit: "90" | ||