diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-03-04 21:20:20 +0100 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-03-04 21:20:20 +0100 |
commit | 89c7d1dea4af6026af00624af77bb1a08c8ebd53 (patch) | |
tree | 6c3b46adcdadcd75aada126cacf0a36202f31e3e /modules/profile/manifests | |
parent | a77b768abb31be9e19563e130d763f163496477d (diff) | |
parent | c17e63ed33a5260ea5bf0f869d7dce39676526cb (diff) | |
download | Puppet-89c7d1dea4af6026af00624af77bb1a08c8ebd53.tar.gz Puppet-89c7d1dea4af6026af00624af77bb1a08c8ebd53.tar.zst Puppet-89c7d1dea4af6026af00624af77bb1a08c8ebd53.zip |
Merge branch 'new_node'
Diffstat (limited to 'modules/profile/manifests')
-rw-r--r-- | modules/profile/manifests/apache.pp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/modules/profile/manifests/apache.pp b/modules/profile/manifests/apache.pp index 605b701..8db58da 100644 --- a/modules/profile/manifests/apache.pp +++ b/modules/profile/manifests/apache.pp | |||
@@ -49,11 +49,17 @@ class profile::apache { | |||
49 | ] | 49 | ] |
50 | } | 50 | } |
51 | 51 | ||
52 | exec { 'Start-apache': | ||
53 | command => "/usr/bin/systemctl start httpd", | ||
54 | before => Class["::letsencrypt"], | ||
55 | unless => "/usr/bin/systemctl is-active httpd", | ||
56 | } | ||
57 | |||
52 | $letsencrypt_certonly_default = { | 58 | $letsencrypt_certonly_default = { |
53 | plugin => "webroot", | 59 | plugin => "webroot", |
54 | webroot_paths => ["/srv/http/"], | 60 | webroot_paths => ["/srv/http/"], |
55 | notify => Class['Apache::Service'], | 61 | notify => Class['Apache::Service'], |
56 | require => [Apache::Vhost["redirect_no_ssl"],Apache::Custom_config["letsencrypt.conf"]], | 62 | require => [Exec['Start-apache'],Apache::Vhost["redirect_no_ssl"],Apache::Custom_config["letsencrypt.conf"]], |
57 | manage_cron => true, | 63 | manage_cron => true, |
58 | } | 64 | } |
59 | 65 | ||