diff options
Diffstat (limited to 'manifests')
-rw-r--r-- | manifests/centos.pp | 16 | ||||
-rw-r--r-- | manifests/centos/itk.pp | 9 | ||||
-rw-r--r-- | manifests/debian.pp | 11 | ||||
-rw-r--r-- | manifests/openbsd.pp | 16 | ||||
-rw-r--r-- | manifests/ssl/openbsd.pp | 2 |
5 files changed, 32 insertions, 22 deletions
diff --git a/manifests/centos.pp b/manifests/centos.pp index 4446114..74a34f5 100644 --- a/manifests/centos.pp +++ b/manifests/centos.pp @@ -25,14 +25,14 @@ class apache::centos inherits apache::package { path => '/var/www/html/index.html', } - file{'/etc/sysconfig/httpd': - source => [ "puppet://$server/modules/site-apache/sysconfig/${fqdn}/httpd", - "puppet://$server/modules/site-apache/sysconfig/httpd", - "puppet://$server/modules/apache/sysconfig/${operatingsystem}/httpd", - "puppet://$server/modules/apache/sysconfig/httpd" ], - require => Package['apache'], - notify => Service['apache'], - owner => root, group => 0, mode => 0644; + file{'apache_service_config': + path => '/etc/sysconfig/httpd', + source => [ "puppet://$server/modules/site-apache/service/CentOS/${fqdn}/httpd", + "puppet://$server/modules/site-apache/service/CentOS/httpd", + "puppet://$server/modules/apache/service/CentOS/httpd" ], + require => Package['apache'], + notify => Service['apache'], + owner => root, group => 0, mode => 0644; } include apache::logrotate::centos diff --git a/manifests/centos/itk.pp b/manifests/centos/itk.pp index 98939c2..94f0f1c 100644 --- a/manifests/centos/itk.pp +++ b/manifests/centos/itk.pp @@ -4,10 +4,9 @@ class apache::centos::itk inherits apache::centos { Package['apache']{ name => 'httpd-itk', } - File['/etc/sysconfig/httpd']{ - source => [ "puppet://$server/modules/site-apache/sysconfig/${fqdn}/httpd.itk", - "puppet://$server/modules/site-apache/sysconfig/httpd.itk", - "puppet://$server/modules/apache/sysconfig/${operatingsystem}/httpd.itk", - "puppet://$server/modules/apache/sysconfig/httpd.itk" ], + File['apache_service_config']{ + source => [ "puppet://$server/modules/site-apache/service/CentOS/${fqdn}/httpd.itk", + "puppet://$server/modules/site-apache/service/CentOS/httpd.itk", + "puppet://$server/modules/apache/service/CentOS/httpd.itk" ], } } diff --git a/manifests/debian.pp b/manifests/debian.pp index 54302ae..ab19a1e 100644 --- a/manifests/debian.pp +++ b/manifests/debian.pp @@ -18,6 +18,17 @@ class apache::debian inherits apache::package { File[default_apache_index] { path => '/var/www/index.html', } + file { 'apache_main_config': + path => "${config_dir}/apache2.conf", + source => [ "puppet://$server/modules/site-apache/config/Debian.${lsbdistcodename}/${fqdn}/apache2.conf", + "puppet://$server/modules/site-apache/config/Debian/{$fqdn}/apache2.conf", + "puppet://$server/modules/site-apache/config/Debian.${lsbdistcodename}/apache2.conf", + "puppet://$server/modules/site-apache/config/Debian/apache2.conf", + "puppet://$server/modules/apache/config/Debian/apache2.conf" ], + require => Package['apache'], + notify => Service['apache'], + owner => root, group => 0, mode => 0644; + } file { 'default_debian_apache_vhost': path => '/etc/apache2/sites-enabled/000-default', ensure => absent, diff --git a/manifests/openbsd.pp b/manifests/openbsd.pp index 606bdc6..d68688f 100644 --- a/manifests/openbsd.pp +++ b/manifests/openbsd.pp @@ -21,12 +21,12 @@ class apache::openbsd inherits apache::base { file => '/etc/rc.conf.local', line => 'httpd flags=""', } - file{"$config_dir/conf/httpd.conf": - source => [ "puppet://$server/modules/site-apache/conf/${fqdn}/httpd.conf", - "puppet://$server/modules/site-apache/conf/${apache_cluster_node}/httpd.conf", - "puppet://$server/modules/site-apache/conf/httpd.conf", - "puppet://$server/modules/apache/conf/${operatingsystem}/httpd.conf", - "puppet://$server/modules/apache/conf/httpd.conf" ], + file{'apache_main_config': + path => "${config_dir}/conf/httpd.conf", + source => [ "puppet://$server/modules/site-apache/config/OpenBSD/${fqdn}/httpd.conf", + "puppet://$server/modules/site-apache/config/OpenBSD/${apache_cluster_node}/httpd.conf", + "puppet://$server/modules/site-apache/config/OpenBSD//httpd.conf", + "puppet://$server/modules/apache/config/OpenBSD/httpd.conf" ], notify => Service['apache'], owner => root, group => 0, mode => 0644; } @@ -34,7 +34,7 @@ class apache::openbsd inherits apache::base { path => '/var/www/htdocs/default/www/index.html', } file{'/opt/bin/restart_apache.sh': - source => "puppet://$server/modules/apache/OpenBSD/bin/restart_apache.sh", + source => "puppet://$server/modules/apache/scripts/OpenBSD/bin/restart_apache.sh", require => File['/opt/bin'], owner => root, group => 0, mode => 0700; } @@ -48,7 +48,7 @@ class apache::openbsd inherits apache::base { stop => 'apachectl stop', } file{'/opt/bin/apache_logrotate.sh': - source => "puppet://$server/modules/apache/OpenBSD/bin/apache_logrotate.sh", + source => "puppet://$server/modules/apache/scripts/OpenBSD/bin/apache_logrotate.sh", require => File['/opt/bin'], owner => root, group => 0, mode => 0700; } diff --git a/manifests/ssl/openbsd.pp b/manifests/ssl/openbsd.pp index edf6829..6d357ee 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/OpenBSD/bin/restart_apache_ssl.sh", + source => "puppet://$server/modules/apache/scripts/OpenBSD/bin/restart_apache_ssl.sh", } Service['apache']{ start => 'apachectl startssl', |