diff options
author | Jesse Luehrs <doy@tozt.net> | 2018-10-10 03:23:49 -0400 |
---|---|---|
committer | Jesse Luehrs <doy@tozt.net> | 2018-10-10 03:27:22 -0400 |
commit | 7bea1bc4e28405e2222aa84dc3dcf78d2dc210f8 (patch) | |
tree | ffae9071473f2483c4fef332981790300b4ba463 /modules | |
parent | 33863cb7c2b48f9c563abb9fef033750dfa04b93 (diff) | |
download | puppet-tozt-7bea1bc4e28405e2222aa84dc3dcf78d2dc210f8.tar.gz puppet-tozt-7bea1bc4e28405e2222aa84dc3dcf78d2dc210f8.zip |
try just using the built-in nginx support
Diffstat (limited to 'modules')
-rw-r--r-- | modules/certbot/manifests/init.pp | 8 | ||||
-rw-r--r-- | modules/nginx/manifests/init.pp | 8 |
2 files changed, 9 insertions, 7 deletions
diff --git a/modules/certbot/manifests/init.pp b/modules/certbot/manifests/init.pp index df1526c..c0db164 100644 --- a/modules/certbot/manifests/init.pp +++ b/modules/certbot/manifests/init.pp @@ -1,5 +1,6 @@ class certbot { include cron + include nginx package { 'certbot': ensure => installed; @@ -26,8 +27,11 @@ class certbot { exec { "initial certbot run": # XXX update to real domain name - command => "/usr/bin/certbot certonly --webroot -w /home/doy/public_html -d new.tozt.net", + command => "/usr/bin/certbot --nginx -d new.tozt.net", creates => "/etc/letsencrypt/live", - require => Package["certbot"], + require => [ + Package["certbot"], + Class["nginx"], + ], } } diff --git a/modules/nginx/manifests/init.pp b/modules/nginx/manifests/init.pp index a6f67e3..611be52 100644 --- a/modules/nginx/manifests/init.pp +++ b/modules/nginx/manifests/init.pp @@ -1,9 +1,7 @@ class nginx { - include certbot - - include nginx::install - include nginx::config - include nginx::service + contain nginx::install + contain nginx::config + contain nginx::service Class['nginx::install'] -> Class['nginx::config'] |