diff options
Diffstat (limited to 'environments/global')
-rw-r--r-- | environments/global/common.yaml | 6 | ||||
-rw-r--r-- | environments/global/roles/cryptoportfolio.yaml | 2 | ||||
-rw-r--r-- | environments/global/roles/file_store.yaml | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/environments/global/common.yaml b/environments/global/common.yaml index 3cc75fa..2f2db35 100644 --- a/environments/global/common.yaml +++ b/environments/global/common.yaml | |||
@@ -21,8 +21,8 @@ base_installation::ldap_dn: "cn=%{facts.ec2_metadata.hostname},ou=hosts,dc=immae | |||
21 | base_installation::ldap_cn: "%{facts.ec2_metadata.hostname}" | 21 | base_installation::ldap_cn: "%{facts.ec2_metadata.hostname}" |
22 | base_installation::ldap_server: "ldap.immae.eu" | 22 | base_installation::ldap_server: "ldap.immae.eu" |
23 | base_installation::ldap_uri: "ldaps://ldap.immae.eu" | 23 | base_installation::ldap_uri: "ldaps://ldap.immae.eu" |
24 | # FIXME: get all mounts without needing that hack? | ||
25 | base_installation::puppet_conf_path: "/etc/puppetlabs/puppet" | 24 | base_installation::puppet_conf_path: "/etc/puppetlabs/puppet" |
25 | base_installation::puppet_notifies_path: "/etc/puppetlabs/notifies" | ||
26 | base_installation::puppet_code_path: "/etc/puppetlabs/code" | 26 | base_installation::puppet_code_path: "/etc/puppetlabs/code" |
27 | base_installation::puppet_pass_seed: "/etc/puppetlabs/puppet/password_seed" | 27 | base_installation::puppet_pass_seed: "/etc/puppetlabs/puppet/password_seed" |
28 | base_installation::puppet_ssl_path: "/etc/puppetlabs/ssl" | 28 | base_installation::puppet_ssl_path: "/etc/puppetlabs/ssl" |
@@ -30,9 +30,7 @@ base_installation::system_locales: ["fr_FR.UTF-8", "en_US.UTF-8"] | |||
30 | base_installation::system_timezone: "Europe/Paris" | 30 | base_installation::system_timezone: "Europe/Paris" |
31 | base_installation::system_users: [] # Fetched via ldap | 31 | base_installation::system_users: [] # Fetched via ldap |
32 | base_installation::notify_xmpp: {} | 32 | base_installation::notify_xmpp: {} |
33 | profile::fstab::mounts: | 33 | profile::fstab::mounts: [] |
34 | - "%{facts.ldapvar.self.vars.mounts.0}" | ||
35 | - "%{facts.ldapvar.self.vars.mounts.1}" | ||
36 | profile::xmr_stak::mining_pool: "" | 34 | profile::xmr_stak::mining_pool: "" |
37 | profile::xmr_stak::wallet: "" | 35 | profile::xmr_stak::wallet: "" |
38 | profile::mail::mailhub: "" # Fetched via ldap | 36 | profile::mail::mailhub: "" # Fetched via ldap |
diff --git a/environments/global/roles/cryptoportfolio.yaml b/environments/global/roles/cryptoportfolio.yaml index 138da7a..661af2d 100644 --- a/environments/global/roles/cryptoportfolio.yaml +++ b/environments/global/roles/cryptoportfolio.yaml | |||
@@ -6,7 +6,7 @@ role::cryptoportfolio::user: "cryptoportfolio" | |||
6 | role::cryptoportfolio::group: "cryptoportfolio" | 6 | role::cryptoportfolio::group: "cryptoportfolio" |
7 | role::cryptoportfolio::home: "/home/cryptoportfolio" | 7 | role::cryptoportfolio::home: "/home/cryptoportfolio" |
8 | role::cryptoportfolio::env: "prod" | 8 | role::cryptoportfolio::env: "prod" |
9 | role::cryptoportfolio::webhook_url: "%{ldapvar.self.vars.cf_slack_webhook.0}" | 9 | role::cryptoportfolio::webhook_url: "" |
10 | role::cryptoportfolio::pg_db: "cryptoportfolio" | 10 | role::cryptoportfolio::pg_db: "cryptoportfolio" |
11 | role::cryptoportfolio::pg_user: "cryptoportfolio" | 11 | role::cryptoportfolio::pg_user: "cryptoportfolio" |
12 | role::cryptoportfolio::web_host: "%{lookup('base_installation::system_hostname')}" | 12 | role::cryptoportfolio::web_host: "%{lookup('base_installation::system_hostname')}" |
diff --git a/environments/global/roles/file_store.yaml b/environments/global/roles/file_store.yaml new file mode 100644 index 0000000..c0912e2 --- /dev/null +++ b/environments/global/roles/file_store.yaml | |||
@@ -0,0 +1,4 @@ | |||
1 | --- | ||
2 | classes: | ||
3 | role::file_store: ~ | ||
4 | letsencrypt::hosts: "%{lookup('base_installation::system_hostname')}" | ||