aboutsummaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/base_installation/manifests/cronie.pp8
-rw-r--r--modules/base_installation/templates/puppet/host_ldap.info.erb1
-rw-r--r--modules/base_installation/templates/puppet/puppet.conf.erb1
3 files changed, 9 insertions, 1 deletions
diff --git a/modules/base_installation/manifests/cronie.pp b/modules/base_installation/manifests/cronie.pp
index bcdd9a7..918bce3 100644
--- a/modules/base_installation/manifests/cronie.pp
+++ b/modules/base_installation/manifests/cronie.pp
@@ -10,12 +10,18 @@ class base_installation::cronie inherits base_installation {
10 owner => root, 10 owner => root,
11 group => root, 11 group => root,
12 } 12 }
13 cron { 'puppet-apply': 13 cron { 'puppet-pull-apply':
14 ensure => present, 14 ensure => present,
15 command => "cd $base_installation::puppet_code_path ; /usr/bin/git pull", 15 command => "cd $base_installation::puppet_code_path ; /usr/bin/git pull",
16 user => root, 16 user => root,
17 minute => '*/30', 17 minute => '*/30',
18 require => File['post-hook'], 18 require => File['post-hook'],
19 } 19 }
20 cron { 'puppet-apply':
21 ensure => present,
22 command => "cd $base_installation::puppet_code_path ; puppet apply --test $base_installation::puppet_code_path/manifests/site.pp",
23 user => root,
24 minute => '*/20'
25 }
20 } 26 }
21} 27}
diff --git a/modules/base_installation/templates/puppet/host_ldap.info.erb b/modules/base_installation/templates/puppet/host_ldap.info.erb
index a350c37..f742da7 100644
--- a/modules/base_installation/templates/puppet/host_ldap.info.erb
+++ b/modules/base_installation/templates/puppet/host_ldap.info.erb
@@ -2,6 +2,7 @@
2ldapadd -D "cn=root,<%= @ldap_base %>" -W << 'EOF' 2ldapadd -D "cn=root,<%= @ldap_base %>" -W << 'EOF'
3dn: <%= @ldap_dn %> 3dn: <%= @ldap_dn %>
4cn: <%= @ldap_cn %> 4cn: <%= @ldap_cn %>
5cn: <%= @system_hostname %>
5objectclass: device 6objectclass: device
6objectclass: top 7objectclass: top
7objectclass: simpleSecurityObject 8objectclass: simpleSecurityObject
diff --git a/modules/base_installation/templates/puppet/puppet.conf.erb b/modules/base_installation/templates/puppet/puppet.conf.erb
index 99d9fc3..3748039 100644
--- a/modules/base_installation/templates/puppet/puppet.conf.erb
+++ b/modules/base_installation/templates/puppet/puppet.conf.erb
@@ -2,6 +2,7 @@
2ssldir = <%= @puppet_ssl_path %> 2ssldir = <%= @puppet_ssl_path %>
3 3
4node_terminus = ldap 4node_terminus = ldap
5certname = <%= @system_hostname %>
5ldapserver = <%= @ldap_server %> 6ldapserver = <%= @ldap_server %>
6ldaptls = true 7ldaptls = true
7ldapbase = <%= @ldap_base %> 8ldapbase = <%= @ldap_base %>