diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-08-18 19:26:35 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-08-18 19:26:35 +0200 |
commit | 6667f52e8017065c9b5f14c8025458b38029a800 (patch) | |
tree | 3819efff8336fdda1fef8fc78fd2fbc0791693af /environments/global/roles | |
parent | 19c467dccfd00193a66f1341f068987da7bca14b (diff) | |
parent | 3c90c9020fc4e0257fa4c73f14e609e3559b3771 (diff) | |
download | Puppet-6667f52e8017065c9b5f14c8025458b38029a800.tar.gz Puppet-6667f52e8017065c9b5f14c8025458b38029a800.tar.zst Puppet-6667f52e8017065c9b5f14c8025458b38029a800.zip |
Merge branch 'file_store' into dev
Diffstat (limited to 'environments/global/roles')
-rw-r--r-- | environments/global/roles/cryptoportfolio.yaml | 2 | ||||
-rw-r--r-- | environments/global/roles/file_store.yaml | 4 |
2 files changed, 5 insertions, 1 deletions
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')}" | ||