From 1c9c5a5fec51919a8e9ec14f5fe9b16c538bb4fa Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 21 May 2013 17:35:20 -0400 Subject: initial soledad configuration Change-Id: I19e91887c3f8e90764b4baef8c5e29e25658e190 --- puppet/modules/soledad/templates/soledad-server.conf.erb | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 puppet/modules/soledad/templates/soledad-server.conf.erb (limited to 'puppet/modules/soledad/templates') diff --git a/puppet/modules/soledad/templates/soledad-server.conf.erb b/puppet/modules/soledad/templates/soledad-server.conf.erb new file mode 100644 index 00000000..47d1f6e4 --- /dev/null +++ b/puppet/modules/soledad/templates/soledad-server.conf.erb @@ -0,0 +1,3 @@ +[soledad-server] +couch_url = http://<%= @couchdb_user %>:<%= @couchdb_password %>@<%= @couchdb_host %>:<%= @couchdb_port %> + -- cgit v1.2.3 From 7d6893194cf1b6b8f4b3afa407d70dc90fe25f6c Mon Sep 17 00:00:00 2001 From: elijah Date: Thu, 1 Aug 2013 12:31:57 -0700 Subject: run soledad daemon using the configured port. --- puppet/modules/soledad/templates/default-soledad.erb | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 puppet/modules/soledad/templates/default-soledad.erb (limited to 'puppet/modules/soledad/templates') diff --git a/puppet/modules/soledad/templates/default-soledad.erb b/puppet/modules/soledad/templates/default-soledad.erb new file mode 100644 index 00000000..da85338a --- /dev/null +++ b/puppet/modules/soledad/templates/default-soledad.erb @@ -0,0 +1,4 @@ +# this file is managed by puppet +CERT_PATH=/etc/x509/certs/soledad.crt +PRIVKEY_PATH=/etc/x509/keys/soledad.key +HTTPS_PORT=<%=@soledad_port%> -- cgit v1.2.3 From cd3be2c03f27a9ecf0b5f4159ae4d16dbeb1f046 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Wed, 14 Aug 2013 11:17:09 -0400 Subject: add START=yes to /etc/default/soledad to start the daemon, new package requires this to start. Closes: #3474 Change-Id: I921dcf0d6571cd60d2705ae4925d0a4318c84fa2 --- puppet/modules/soledad/templates/default-soledad.erb | 1 + 1 file changed, 1 insertion(+) (limited to 'puppet/modules/soledad/templates') diff --git a/puppet/modules/soledad/templates/default-soledad.erb b/puppet/modules/soledad/templates/default-soledad.erb index da85338a..fd38903a 100644 --- a/puppet/modules/soledad/templates/default-soledad.erb +++ b/puppet/modules/soledad/templates/default-soledad.erb @@ -1,4 +1,5 @@ # this file is managed by puppet +START=yes CERT_PATH=/etc/x509/certs/soledad.crt PRIVKEY_PATH=/etc/x509/keys/soledad.key HTTPS_PORT=<%=@soledad_port%> -- cgit v1.2.3 From 77a2c7864953886e8861217bb4947bae6366acc8 Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 19 Sep 2013 13:50:27 +0200 Subject: tidy soledad x509 definitions (#3841) --- puppet/modules/soledad/templates/default-soledad.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'puppet/modules/soledad/templates') diff --git a/puppet/modules/soledad/templates/default-soledad.erb b/puppet/modules/soledad/templates/default-soledad.erb index fd38903a..32504e38 100644 --- a/puppet/modules/soledad/templates/default-soledad.erb +++ b/puppet/modules/soledad/templates/default-soledad.erb @@ -1,5 +1,5 @@ # this file is managed by puppet START=yes -CERT_PATH=/etc/x509/certs/soledad.crt -PRIVKEY_PATH=/etc/x509/keys/soledad.key +CERT_PATH=<%= scope.lookupvar('x509::variables::certs') %>/<%= scope.lookupvar('site_config::params::cert_name') %>.crt +PRIVKEY_PATH=<%= scope.lookupvar('x509::variables::keys') %>/<%= scope.lookupvar('site_config::params::cert_name') %>.key HTTPS_PORT=<%=@soledad_port%> -- cgit v1.2.3