summaryrefslogtreecommitdiff
path: root/puppet/modules/site_config
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2015-10-05 13:44:32 +0200
committervarac <varacanero@zeromail.org>2015-10-05 13:44:32 +0200
commitafddd1bfb3cd8d68bdc699c983fdcd54561c44bd (patch)
treed4dd9807467d90316a52c4596c2b33421e439b16 /puppet/modules/site_config
parent03528deb5aab7311a90b07aec77e0805a233d154 (diff)
parent4fc7419598a3baf564f063b7330b9cf9115420b5 (diff)
Merge branch 'soledad_userdb_creation' into develop
Diffstat (limited to 'puppet/modules/site_config')
-rw-r--r--puppet/modules/site_config/manifests/remove_files.pp1
1 files changed, 1 insertions, 0 deletions
diff --git a/puppet/modules/site_config/manifests/remove_files.pp b/puppet/modules/site_config/manifests/remove_files.pp
index 8b2f9541..07487d6a 100644
--- a/puppet/modules/site_config/manifests/remove_files.pp
+++ b/puppet/modules/site_config/manifests/remove_files.pp
@@ -41,6 +41,7 @@ class site_config::remove_files {
'/srv/leap/couchdb/designs/tmp_users':
recurse => true,
rmdirs => true;
+ '/etc/leap/soledad-server.conf':;
}
if member($::services, 'webapp') {