From d5a5afcfc3c501a4a4df7764616d995b18ce6552 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Sat, 22 Jul 2017 12:23:28 +0100 Subject: [PATCH] reversing steps to create cert --- manifests/certbot/{config.pp => certs.pp} | 5 +++-- manifests/main/config.pp | 16 ++++++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) rename manifests/certbot/{config.pp => certs.pp} (97%) diff --git a/manifests/certbot/config.pp b/manifests/certbot/certs.pp similarity index 97% rename from manifests/certbot/config.pp rename to manifests/certbot/certs.pp index aab638c..fd80273 100644 --- a/manifests/certbot/config.pp +++ b/manifests/certbot/certs.pp @@ -1,4 +1,4 @@ -## cd_nagios::certbot::config.pp +## cd_nagios::certbot::certs.pp # Module name: cd_nagios # Author: Arne Teuke (arne_teuke@ConfDroid.com) # # License: @@ -20,7 +20,7 @@ # along with this program. If not, see . # @summary Class manages all configuration files required for cd_nagios. ############################################################################## -class cd_nagios::certbot::config ( +class cd_nagios::certbot::certs ( ) inherits cd_nagios::params { @@ -29,6 +29,7 @@ class cd_nagios::certbot::config ( if $ng_enable_certbot == true { require cd_certbot + require cd_apache # ensure there is no forward vhost file diff --git a/manifests/main/config.pp b/manifests/main/config.pp index 25adb6d..a4dc910 100644 --- a/manifests/main/config.pp +++ b/manifests/main/config.pp @@ -28,14 +28,18 @@ class cd_nagios::main::config ( # manage server configuration if $::fqdn == $ng_nagios_server { - include cd_nagios::server::service +# include cd_nagios::server::service - if $ng_include_fw == true { - include cd_nagios::firewall::iptables - } +# if $ng_include_fw == true { +# include cd_nagios::firewall::iptables +# } - if $ng_use_selinux_tools == true { - include cd_nagios::selinux::config +# if $ng_use_selinux_tools == true { +# include cd_nagios::selinux::config +# } + + if $ng_enable_certbot == true { + require cd_nagios::certbot::certs } }