diff options
author | Jesse Luehrs <doy@tozt.net> | 2017-11-06 02:59:18 -0500 |
---|---|---|
committer | Jesse Luehrs <doy@tozt.net> | 2017-11-06 02:59:18 -0500 |
commit | 4d13305a8b48206c317786b91f90388d30c6f7ad (patch) | |
tree | 9b981de47f8fd06697970104d75c62cc8fda4784 | |
parent | d89b535482b54490b19579b1e4916322d28329a4 (diff) | |
download | puppet-tozt-4d13305a8b48206c317786b91f90388d30c6f7ad.tar.gz puppet-tozt-4d13305a8b48206c317786b91f90388d30c6f7ad.zip |
more packages and files
-rw-r--r-- | modules/certbot/files/reload-cert | 7 | ||||
-rw-r--r-- | modules/certbot/manifests/init.pp | 18 | ||||
-rw-r--r-- | modules/dkim/manifests/init.pp | 5 | ||||
-rw-r--r-- | modules/tozt/manifests/init.pp | 1 | ||||
-rw-r--r-- | modules/tozt/manifests/mail.pp | 1 | ||||
-rw-r--r-- | modules/tozt/manifests/vpn.pp | 3 | ||||
-rw-r--r-- | modules/vpn/manifests/ca.pp | 5 | ||||
-rw-r--r-- | modules/vpn/manifests/init.pp | 7 |
8 files changed, 43 insertions, 4 deletions
diff --git a/modules/certbot/files/reload-cert b/modules/certbot/files/reload-cert new file mode 100644 index 0000000..859de51 --- /dev/null +++ b/modules/certbot/files/reload-cert @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +set -eu +set -o pipefail + +systemctl restart nginx +systemctl restart postfix +systemctl restart dovecot diff --git a/modules/certbot/manifests/init.pp b/modules/certbot/manifests/init.pp index f89c59a..519482e 100644 --- a/modules/certbot/manifests/init.pp +++ b/modules/certbot/manifests/init.pp @@ -3,9 +3,19 @@ class certbot { ensure => installed; } - file { '/etc/cron.daily/certbot': - source => 'puppet:///modules/certbot/certbot', - mode => '0755', - require => Package['certbot']; + file { + '/etc/cron.daily/certbot': + source => 'puppet:///modules/certbot/certbot', + mode => '0755', + require => Package['certbot']; + '/etc/letsencrypt/renewal-hooks': + ensure => directory, + require => Package['certbot']; + '/etc/letsencrypt/renewal-hooks/deploy': + ensure => directory, + require => File['/etc/letsencrypt/renewal-hooks']; + '/etc/letsencrypt/renewal-hooks/deploy/reload-cert': + source => 'puppet:///modules/certbot/reload-cert', + require => File['/etc/letsencrypt/renewal-hooks/deploy']; } } diff --git a/modules/dkim/manifests/init.pp b/modules/dkim/manifests/init.pp new file mode 100644 index 0000000..5349f4f --- /dev/null +++ b/modules/dkim/manifests/init.pp @@ -0,0 +1,5 @@ +class dkim { + package { 'opendkim': + ensure => installed; + } +} diff --git a/modules/tozt/manifests/init.pp b/modules/tozt/manifests/init.pp index f7cd11f..00a385b 100644 --- a/modules/tozt/manifests/init.pp +++ b/modules/tozt/manifests/init.pp @@ -5,5 +5,6 @@ class tozt { include tozt::backups include tozt::mail include tozt::site + include tozt::vpn include tozt::other_packages } diff --git a/modules/tozt/manifests/mail.pp b/modules/tozt/manifests/mail.pp index 5ad7c93..e5e3410 100644 --- a/modules/tozt/manifests/mail.pp +++ b/modules/tozt/manifests/mail.pp @@ -3,6 +3,7 @@ class tozt::mail { include postfix include spamassassin include procmail + include dkim package { 'mutt': ensure => installed; diff --git a/modules/tozt/manifests/vpn.pp b/modules/tozt/manifests/vpn.pp new file mode 100644 index 0000000..cdd3930 --- /dev/null +++ b/modules/tozt/manifests/vpn.pp @@ -0,0 +1,3 @@ +class tozt::vpn { + include vpn +} diff --git a/modules/vpn/manifests/ca.pp b/modules/vpn/manifests/ca.pp new file mode 100644 index 0000000..c6c3279 --- /dev/null +++ b/modules/vpn/manifests/ca.pp @@ -0,0 +1,5 @@ +class vpn::ca { + package { 'easy-rsa': + ensure => installed; + } +} diff --git a/modules/vpn/manifests/init.pp b/modules/vpn/manifests/init.pp new file mode 100644 index 0000000..0a1b772 --- /dev/null +++ b/modules/vpn/manifests/init.pp @@ -0,0 +1,7 @@ +class vpn { + include vpn::ca; + + package { 'openvpn': + ensure => installed; + } +} |