aboutsummaryrefslogtreecommitdiffstats
path: root/modules/catdap
diff options
context:
space:
mode:
Diffstat (limited to 'modules/catdap')
-rw-r--r--modules/catdap/manifests/init.pp5
-rw-r--r--modules/catdap/templates/catdap_local.yml4
2 files changed, 3 insertions, 6 deletions
diff --git a/modules/catdap/manifests/init.pp b/modules/catdap/manifests/init.pp
index ad97fc29..018b6ed5 100644
--- a/modules/catdap/manifests/init.pp
+++ b/modules/catdap/manifests/init.pp
@@ -25,8 +25,9 @@ class catdap {
file { "$catdap_location/catdap_local.yml":
ensure => present,
- owner => apache,
- mode => 600,
+ owner => root,
+ group => apache,
+ mode => 640,
content => template("catdap/catdap_local.yml"),
require => Subversion::Snapshot[$catdap_location]
}
diff --git a/modules/catdap/templates/catdap_local.yml b/modules/catdap/templates/catdap_local.yml
index b62f80a4..50f43601 100644
--- a/modules/catdap/templates/catdap_local.yml
+++ b/modules/catdap/templates/catdap_local.yml
@@ -1,8 +1,4 @@
<%
-# domain come from facter
-
-dc_suffix = 'dc=' + domain.gsub('.',',dc=')
-
ldap_server = 'ldap.' + domain
ldap_password = catdap_password