diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-03-19 16:21:53 +0100 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-03-19 16:21:53 +0100 |
commit | 98311fc2ea91cc2a5f00e9fa85a30f50fde77e79 (patch) | |
tree | 58ff0ffad8cbe0230eff1791360bc7cc45501c34 /modules/base_installation/manifests | |
parent | f4c9ed4c0a32082d8f7b60cee1eb33cb05c85a1c (diff) | |
parent | d87a489f9585d10f0a185beb59ae16a10f27a7bd (diff) | |
download | Puppet-98311fc2ea91cc2a5f00e9fa85a30f50fde77e79.tar.gz Puppet-98311fc2ea91cc2a5f00e9fa85a30f50fde77e79.tar.zst Puppet-98311fc2ea91cc2a5f00e9fa85a30f50fde77e79.zip |
Merge branch 'backup' into dev
Diffstat (limited to 'modules/base_installation/manifests')
-rw-r--r-- | modules/base_installation/manifests/cronie.pp | 4 | ||||
-rw-r--r-- | modules/base_installation/manifests/puppet.pp | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/modules/base_installation/manifests/cronie.pp b/modules/base_installation/manifests/cronie.pp index e8d5dfd..e8f3e20 100644 --- a/modules/base_installation/manifests/cronie.pp +++ b/modules/base_installation/manifests/cronie.pp | |||
@@ -19,13 +19,13 @@ class base_installation::cronie inherits base_installation { | |||
19 | } | 19 | } |
20 | cron { 'puppet-apply': | 20 | cron { 'puppet-apply': |
21 | ensure => present, | 21 | ensure => present, |
22 | command => "cd $base_installation::puppet_code_path ; puppet apply $base_installation::puppet_code_path/manifests/site.pp", | 22 | command => "cd $base_installation::puppet_code_path ; puppet_apply $base_installation::puppet_code_path/manifests/site.pp", |
23 | user => root, | 23 | user => root, |
24 | minute => '*/20' | 24 | minute => '*/20' |
25 | } | 25 | } |
26 | cron { 'puppet-apply-reboot': | 26 | cron { 'puppet-apply-reboot': |
27 | ensure => present, | 27 | ensure => present, |
28 | command => "cd $base_installation::puppet_code_path ; puppet apply $base_installation::puppet_code_path/manifests/site.pp", | 28 | command => "cd $base_installation::puppet_code_path ; puppet_apply $base_installation::puppet_code_path/manifests/site.pp", |
29 | user => root, | 29 | user => root, |
30 | special => "reboot" | 30 | special => "reboot" |
31 | } | 31 | } |
diff --git a/modules/base_installation/manifests/puppet.pp b/modules/base_installation/manifests/puppet.pp index 6f7732d..0cb43bc 100644 --- a/modules/base_installation/manifests/puppet.pp +++ b/modules/base_installation/manifests/puppet.pp | |||
@@ -39,6 +39,12 @@ class base_installation::puppet ( | |||
39 | source => "puppet:///modules/base_installation/scripts/report_print.rb" | 39 | source => "puppet:///modules/base_installation/scripts/report_print.rb" |
40 | } | 40 | } |
41 | 41 | ||
42 | file { '/usr/local/sbin/puppet_apply': | ||
43 | mode => "0755", | ||
44 | ensure => present, | ||
45 | source => "puppet:///modules/base_installation/scripts/puppet_apply", | ||
46 | } | ||
47 | |||
42 | unless empty(find_file($password_seed)) { | 48 | unless empty(find_file($password_seed)) { |
43 | $ldap_password = generate_password(24, $password_seed, "ldap") | 49 | $ldap_password = generate_password(24, $password_seed, "ldap") |
44 | $ssha_ldap_seed = generate_password(5, $password_seed, "ldap_seed") | 50 | $ssha_ldap_seed = generate_password(5, $password_seed, "ldap_seed") |