aboutsummaryrefslogtreecommitdiff
path: root/environments/global
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2018-03-13 13:23:17 +0100
committerIsmaël Bouya <ismael.bouya@normalesup.org>2018-03-13 22:51:36 +0100
commit0a21fb6c2c52ca5cc2dfdfc41ca0a51c0d81296c (patch)
tree95af1b06a4b8d67759628071f163b3d42c9c7f22 /environments/global
parent96d61e22a20255c2b437eb3a3b81f9b44a1814de (diff)
downloadPuppet-0a21fb6c2c52ca5cc2dfdfc41ca0a51c0d81296c.tar.gz
Puppet-0a21fb6c2c52ca5cc2dfdfc41ca0a51c0d81296c.tar.zst
Puppet-0a21fb6c2c52ca5cc2dfdfc41ca0a51c0d81296c.zip
Start to cleanup the files
Diffstat (limited to 'environments/global')
-rw-r--r--environments/global/common.yaml4
-rw-r--r--environments/global/roles/cryptoportfolio.yaml17
-rw-r--r--environments/global/types/s1-2.yaml2
-rw-r--r--environments/global/types/vps-ovhssd-1.yaml2
4 files changed, 22 insertions, 3 deletions
diff --git a/environments/global/common.yaml b/environments/global/common.yaml
index 5b21dca..05d12ad 100644
--- a/environments/global/common.yaml
+++ b/environments/global/common.yaml
@@ -6,6 +6,8 @@ lookup_options:
6 merge: deep 6 merge: deep
7 base_installation::system_users: 7 base_installation::system_users:
8 merge: unique 8 merge: unique
9 letsencrypt::hosts:
10 merge: unique
9 11
10classes: 12classes:
11 stdlib: ~ 13 stdlib: ~
@@ -35,3 +37,5 @@ base_installation::system_users:
35 key_type: "ssh-rsa" 37 key_type: "ssh-rsa"
36xmr_stak::mining_pool: "pool.minexmr.com:7777" 38xmr_stak::mining_pool: "pool.minexmr.com:7777"
37xmr_stak::wallet: "44CA8TxTFYbQqN2kLyk8AnB6Ghz4mcbGpYC2EyXW7A8H9QspvWnTjDn39XUZDPrFwPa5JNwt4TmAxcooPWv4SaJqL87Bcdo" 39xmr_stak::wallet: "44CA8TxTFYbQqN2kLyk8AnB6Ghz4mcbGpYC2EyXW7A8H9QspvWnTjDn39XUZDPrFwPa5JNwt4TmAxcooPWv4SaJqL87Bcdo"
40letsencrypt::email: "sites+letsencrypt@mail.immae.eu"
41letsencrypt::try_for_real_hostname: true
diff --git a/environments/global/roles/cryptoportfolio.yaml b/environments/global/roles/cryptoportfolio.yaml
index 3d36e71..f875c1b 100644
--- a/environments/global/roles/cryptoportfolio.yaml
+++ b/environments/global/roles/cryptoportfolio.yaml
@@ -1,4 +1,19 @@
1--- 1---
2classes: 2classes:
3 role::cryptoportfolio: ~ 3 role::cryptoportfolio: ~
4cryptoportfolio::slack_webhook: "%{ldapvar.self.vars.cf_slack_webhook.0}" 4letsencrypt::hosts: "%{lookup('base_installation::system_hostname')}"
5role::cryptoportfolio::user: "cryptoportfolio"
6role::cryptoportfolio::group: "cryptoportfolio"
7role::cryptoportfolio::home: "/home/cryptoportfolio"
8role::cryptoportfolio::env: "prod"
9role::cryptoportfolio::webhook_url: "%{ldapvar.self.vars.cf_slack_webhook.0}"
10role::cryptoportfolio::pg_db: "cryptoportfolio"
11role::cryptoportfolio::pg_user: "cryptoportfolio"
12role::cryptoportfolio::pg_user_replication: "cryptoportfolio_replication"
13role::cryptoportfolio::web_host: "%{lookup('base_installation::system_hostname')}"
14role::cryptoportfolio::web_port: ""
15role::cryptoportfolio::web_ssl: true
16base_installation::system_users:
17 - username: "%{lookup('role::cryptoportfolio::user')}"
18 system: true
19 password: "!!"
diff --git a/environments/global/types/s1-2.yaml b/environments/global/types/s1-2.yaml
index 496b741..a7ba753 100644
--- a/environments/global/types/s1-2.yaml
+++ b/environments/global/types/s1-2.yaml
@@ -6,4 +6,4 @@ classes:
6base_installation::system_hostname: "%{ldapvar.self.vars.host.0}" 6base_installation::system_hostname: "%{ldapvar.self.vars.host.0}"
7base_installation::real_hostname: "%{facts.ec2_metadata.hostname}.v.immae.eu" 7base_installation::real_hostname: "%{facts.ec2_metadata.hostname}.v.immae.eu"
8base_installation::ldap_cert_path: "/etc/ssl/certs/ca-certificates.crt" 8base_installation::ldap_cert_path: "/etc/ssl/certs/ca-certificates.crt"
9ssl::try_letsencrypt_for_real_hostname: true 9letsencrypt::try_for_real_hostname: true
diff --git a/environments/global/types/vps-ovhssd-1.yaml b/environments/global/types/vps-ovhssd-1.yaml
index 73f7a45..68534dc 100644
--- a/environments/global/types/vps-ovhssd-1.yaml
+++ b/environments/global/types/vps-ovhssd-1.yaml
@@ -7,4 +7,4 @@ base_installation::system_hostname: "%{ldapvar.self.vars.host.0}"
7base_installation::real_hostname: "%{facts.ec2_metadata.hostname}.ovh.net" 7base_installation::real_hostname: "%{facts.ec2_metadata.hostname}.ovh.net"
8base_installation::grub_device: "/dev/sdb" 8base_installation::grub_device: "/dev/sdb"
9base_installation::ldap_cert_path: "/etc/ssl/certs/ca-certificates.crt" 9base_installation::ldap_cert_path: "/etc/ssl/certs/ca-certificates.crt"
10ssl::try_letsencrypt_for_real_hostname: false 10letsencrypt::try_for_real_hostname: false