aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2018-05-01 10:52:24 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2018-05-01 10:52:24 +0200
commit77ab51f53103ebb89957df1f6f31f5927d1b08f7 (patch)
tree1e912876e6bb8a7ac41ff988088e49f3d4cf444f
parent65a3209bbb025138fe0b3f422d54604d63480b61 (diff)
parenta97de7164b6a46a5e24aee6defbc09ca45c989a4 (diff)
downloadPuppet-77ab51f53103ebb89957df1f6f31f5927d1b08f7.tar.gz
Puppet-77ab51f53103ebb89957df1f6f31f5927d1b08f7.tar.zst
Puppet-77ab51f53103ebb89957df1f6f31f5927d1b08f7.zip
Merge branch 'dev'
-rw-r--r--modules/profile/manifests/boinc.pp2
-rw-r--r--modules/role/templates/cryptoportfolio/api_conf.toml.erb11
2 files changed, 12 insertions, 1 deletions
diff --git a/modules/profile/manifests/boinc.pp b/modules/profile/manifests/boinc.pp
index 43c4a49..79aa85f 100644
--- a/modules/profile/manifests/boinc.pp
+++ b/modules/profile/manifests/boinc.pp
@@ -3,7 +3,7 @@ class profile::boinc (
3 Optional[String] $rpc_host = undef, 3 Optional[String] $rpc_host = undef,
4) { 4) {
5 unless empty($rpc_host) or empty($rpc_password) { 5 unless empty($rpc_host) or empty($rpc_password) {
6 ensure_packages(["boinc-nox"]) 6 ensure_packages(["boinc-nox", "lib32-glibc", "lib32-glib2"])
7 7
8 file { "/var/lib/boinc/gui_rpc_auth.cfg": 8 file { "/var/lib/boinc/gui_rpc_auth.cfg":
9 ensure => present, 9 ensure => present,
diff --git a/modules/role/templates/cryptoportfolio/api_conf.toml.erb b/modules/role/templates/cryptoportfolio/api_conf.toml.erb
index 7a4b66d..8d0e037 100644
--- a/modules/role/templates/cryptoportfolio/api_conf.toml.erb
+++ b/modules/role/templates/cryptoportfolio/api_conf.toml.erb
@@ -8,6 +8,17 @@ password="<%= @pg_password %>"
8database="<%= @pg_db %>" 8database="<%= @pg_db %>"
9address="<%= @pg_host %>" 9address="<%= @pg_host %>"
10 10
11<%- if !@redis_host.nil? && @redis_host != "" -%>
12[redis]
13<%- if @redis_host[0] == "/" -%>
14type="unix"
15<%- else -%>
16type="tcp"
17<%- end -%>
18address="<%= @redis_host %>"
19database=0
20<%- end -%>
21
11[api] 22[api]
12domain="<%= @web_host %>" 23domain="<%= @web_host %>"
13jwt_secret="<%= @cf_front_app_api_secret %>" 24jwt_secret="<%= @cf_front_app_api_secret %>"