From d50296539fc641b6387fcea712d950785c83cea3 Mon Sep 17 00:00:00 2001 From: mh Date: Sat, 7 Aug 2010 02:12:12 +0200 Subject: remove unnecessary fileserver variable (#2460) --- manifests/ssl/openbsd.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests/ssl') diff --git a/manifests/ssl/openbsd.pp b/manifests/ssl/openbsd.pp index 6d357ee..0e221aa 100644 --- a/manifests/ssl/openbsd.pp +++ b/manifests/ssl/openbsd.pp @@ -10,7 +10,7 @@ class apache::ssl::openbsd inherits apache::openbsd { } File['/opt/bin/restart_apache.sh']{ - source => "puppet://$server/modules/apache/scripts/OpenBSD/bin/restart_apache_ssl.sh", + source => "puppet:///modules/apache/scripts/OpenBSD/bin/restart_apache_ssl.sh", } Service['apache']{ start => 'apachectl startssl', -- cgit v1.2.3 From b3a17cff5315fbbda901a6f1d406c3500cf65a3a Mon Sep 17 00:00:00 2001 From: mh Date: Mon, 16 Aug 2010 21:51:22 +0200 Subject: fix various missing things for itk_plus mode --- manifests/ssl/centos.pp | 4 ++++ manifests/ssl/itk_plus/centos.pp | 11 +++++++++++ 2 files changed, 15 insertions(+) create mode 100644 manifests/ssl/itk_plus/centos.pp (limited to 'manifests/ssl') diff --git a/manifests/ssl/centos.pp b/manifests/ssl/centos.pp index b2c8ad8..7bc8c89 100644 --- a/manifests/ssl/centos.pp +++ b/manifests/ssl/centos.pp @@ -5,4 +5,8 @@ class apache::ssl::centos inherits apache::ssl::base { require => Package[apache], } ::apache::config::global{ 'ssl.conf': } + + apache::config::global{'00-listen-ssl.conf': + ensure => absent, + } } diff --git a/manifests/ssl/itk_plus/centos.pp b/manifests/ssl/itk_plus/centos.pp new file mode 100644 index 0000000..d8989c9 --- /dev/null +++ b/manifests/ssl/itk_plus/centos.pp @@ -0,0 +1,11 @@ +class apache::ssl::itk_plus::centos inherits apache::ssl::centos { + include apache::ssl::itk::centos + Apache::Config::Global['ssl.conf']{ + source => "apache/itk_plus/conf.d/${operatingsystem}/ssl.conf", + } + + apache::config::global{'00-listen-ssl.conf': + ensure => 'present', + content => template("apache/itk_plus/${operatingsystem}/00-listen-ssl.conf.erb"), + } +} -- cgit v1.2.3 From f33e0ae2325584d79794078cfe9a962768e7e06b Mon Sep 17 00:00:00 2001 From: mh Date: Mon, 16 Aug 2010 22:07:47 +0200 Subject: correctly fix problem --- manifests/ssl/itk_plus.pp | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 manifests/ssl/itk_plus.pp (limited to 'manifests/ssl') diff --git a/manifests/ssl/itk_plus.pp b/manifests/ssl/itk_plus.pp new file mode 100644 index 0000000..5c2d202 --- /dev/null +++ b/manifests/ssl/itk_plus.pp @@ -0,0 +1,6 @@ +class apache::ssl::itk_plus inherits apache::ssl::itk { + case $operatingsystem { + centos: { include ::apache::ssl::itk_plus::centos } + default: { fail("itk plus mode is currently only implemented for CentOS") } + } +} -- cgit v1.2.3 From dea5d21e4cd812d4937938250c1d20b8b0089f5d Mon Sep 17 00:00:00 2001 From: mh Date: Mon, 16 Aug 2010 22:09:22 +0200 Subject: override instead of redefine --- manifests/ssl/itk_plus/centos.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests/ssl') diff --git a/manifests/ssl/itk_plus/centos.pp b/manifests/ssl/itk_plus/centos.pp index d8989c9..3638c69 100644 --- a/manifests/ssl/itk_plus/centos.pp +++ b/manifests/ssl/itk_plus/centos.pp @@ -4,7 +4,7 @@ class apache::ssl::itk_plus::centos inherits apache::ssl::centos { source => "apache/itk_plus/conf.d/${operatingsystem}/ssl.conf", } - apache::config::global{'00-listen-ssl.conf': + Apache::Config::Global{'00-listen-ssl.conf': ensure => 'present', content => template("apache/itk_plus/${operatingsystem}/00-listen-ssl.conf.erb"), } -- cgit v1.2.3 From 43c6896311592f113975b89db7d2b493a3e66c43 Mon Sep 17 00:00:00 2001 From: mh Date: Mon, 16 Aug 2010 22:10:24 +0200 Subject: correctly fix problem --- manifests/ssl/itk_plus/centos.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests/ssl') diff --git a/manifests/ssl/itk_plus/centos.pp b/manifests/ssl/itk_plus/centos.pp index 3638c69..a67f3dc 100644 --- a/manifests/ssl/itk_plus/centos.pp +++ b/manifests/ssl/itk_plus/centos.pp @@ -4,7 +4,7 @@ class apache::ssl::itk_plus::centos inherits apache::ssl::centos { source => "apache/itk_plus/conf.d/${operatingsystem}/ssl.conf", } - Apache::Config::Global{'00-listen-ssl.conf': + Apache::Config::Global['00-listen-ssl.conf']{ ensure => 'present', content => template("apache/itk_plus/${operatingsystem}/00-listen-ssl.conf.erb"), } -- cgit v1.2.3 From 6729542e677e210dce5f74c287c825b499a5d055 Mon Sep 17 00:00:00 2001 From: mh Date: Mon, 16 Aug 2010 23:02:02 +0200 Subject: use modules url --- manifests/ssl/itk_plus/centos.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests/ssl') diff --git a/manifests/ssl/itk_plus/centos.pp b/manifests/ssl/itk_plus/centos.pp index a67f3dc..d76c927 100644 --- a/manifests/ssl/itk_plus/centos.pp +++ b/manifests/ssl/itk_plus/centos.pp @@ -1,7 +1,7 @@ class apache::ssl::itk_plus::centos inherits apache::ssl::centos { include apache::ssl::itk::centos Apache::Config::Global['ssl.conf']{ - source => "apache/itk_plus/conf.d/${operatingsystem}/ssl.conf", + source => "modules/apache/itk_plus/conf.d/${operatingsystem}/ssl.conf", } Apache::Config::Global['00-listen-ssl.conf']{ -- cgit v1.2.3 From b11bb5a891e96fafa01a431db8e168a41948b88a Mon Sep 17 00:00:00 2001 From: mh Date: Sun, 9 Oct 2011 03:34:29 +0200 Subject: migrate to new file_line type --- manifests/ssl/openbsd.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'manifests/ssl') diff --git a/manifests/ssl/openbsd.pp b/manifests/ssl/openbsd.pp index 0e221aa..43bc680 100644 --- a/manifests/ssl/openbsd.pp +++ b/manifests/ssl/openbsd.pp @@ -1,11 +1,11 @@ class apache::ssl::openbsd inherits apache::openbsd { include apache::ssl::base - Line['enable_apache_on_boot']{ + File_line['enable_apache_on_boot']{ ensure => 'absent', } - line{'enable_apachessl_on_boot': - file => '/etc/rc.conf.local', + file_line{'enable_apachessl_on_boot': + path => '/etc/rc.conf.local', line => 'httpd flags="-DSSL"', } -- cgit v1.2.3 From 076909377eaa3aa41936e3acb7e02a9b5b14d493 Mon Sep 17 00:00:00 2001 From: mh Date: Thu, 31 May 2012 11:38:45 +0200 Subject: fix various puppet language things --- manifests/ssl/itk.pp | 2 +- manifests/ssl/itk_plus.pp | 2 +- manifests/ssl/itk_plus/centos.pp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'manifests/ssl') diff --git a/manifests/ssl/itk.pp b/manifests/ssl/itk.pp index 62c96cf..5fd3aaf 100644 --- a/manifests/ssl/itk.pp +++ b/manifests/ssl/itk.pp @@ -1,7 +1,7 @@ # manifests/ssl/itk.pp class apache::ssl::itk inherits apache::ssl { - case $operatingsystem { + case $::operatingsystem { centos: { include apache::ssl::itk::centos } } } diff --git a/manifests/ssl/itk_plus.pp b/manifests/ssl/itk_plus.pp index 5c2d202..0c8e667 100644 --- a/manifests/ssl/itk_plus.pp +++ b/manifests/ssl/itk_plus.pp @@ -1,5 +1,5 @@ class apache::ssl::itk_plus inherits apache::ssl::itk { - case $operatingsystem { + case $::operatingsystem { centos: { include ::apache::ssl::itk_plus::centos } default: { fail("itk plus mode is currently only implemented for CentOS") } } diff --git a/manifests/ssl/itk_plus/centos.pp b/manifests/ssl/itk_plus/centos.pp index d76c927..00fb472 100644 --- a/manifests/ssl/itk_plus/centos.pp +++ b/manifests/ssl/itk_plus/centos.pp @@ -1,11 +1,11 @@ class apache::ssl::itk_plus::centos inherits apache::ssl::centos { include apache::ssl::itk::centos Apache::Config::Global['ssl.conf']{ - source => "modules/apache/itk_plus/conf.d/${operatingsystem}/ssl.conf", + source => "modules/apache/itk_plus/conf.d/${::operatingsystem}/ssl.conf", } Apache::Config::Global['00-listen-ssl.conf']{ ensure => 'present', - content => template("apache/itk_plus/${operatingsystem}/00-listen-ssl.conf.erb"), + content => template("apache/itk_plus/${::operatingsystem}/00-listen-ssl.conf.erb"), } } -- cgit v1.2.3