From 4ff385d82bc0d300d501bf1fb41df8602c7c95a6 Mon Sep 17 00:00:00 2001 From: mh Date: Tue, 29 May 2012 22:50:03 +0200 Subject: rename site modules --- manifests/centos.pp | 4 ++-- manifests/centos/module.pp | 6 +++--- manifests/config/file.pp | 10 +++++----- manifests/debian.pp | 8 ++++---- manifests/gentoo/module.pp | 6 +++--- manifests/openbsd.pp | 6 +++--- manifests/vhost/file.pp | 16 ++++++++-------- manifests/vhost/file/documentrootfile.pp | 10 +++++----- 8 files changed, 33 insertions(+), 33 deletions(-) (limited to 'manifests') diff --git a/manifests/centos.pp b/manifests/centos.pp index 721bb55..4181152 100644 --- a/manifests/centos.pp +++ b/manifests/centos.pp @@ -40,8 +40,8 @@ class apache::centos inherits apache::package { } file{'apache_service_config': path => '/etc/sysconfig/httpd', - source => [ "puppet:///modules/site-apache/service/CentOS/${fqdn}/httpd", - "puppet:///modules/site-apache/service/CentOS/httpd", + source => [ "puppet:///modules/site_apache/service/CentOS/${fqdn}/httpd", + "puppet:///modules/site_apache/service/CentOS/httpd", "puppet:///modules/apache/service/CentOS/httpd" ], require => Package['apache'], notify => Service['apache'], diff --git a/manifests/centos/module.pp b/manifests/centos/module.pp index b4cddb7..4e48b13 100644 --- a/manifests/centos/module.pp +++ b/manifests/centos/module.pp @@ -10,9 +10,9 @@ define apache::centos::module( } $real_source = $source ? { '' => [ - "puppet:///modules/site-apache/modules.d/${fqdn}/${name}.so", - "puppet:///modules/site-apache/modules.d/${apache_cluster_node}/${name}.so", - "puppet:///modules/site-apache/modules.d/${name}.so", + "puppet:///modules/site_apache/modules.d/${fqdn}/${name}.so", + "puppet:///modules/site_apache/modules.d/${apache_cluster_node}/${name}.so", + "puppet:///modules/site_apache/modules.d/${name}.so", "puppet:///modules/apache/modules.d/${operatingsystem}/${name}.so", "puppet:///modules/apache/modules.d/${name}.so" ], diff --git a/manifests/config/file.pp b/manifests/config/file.pp index 3b889ca..f25041c 100644 --- a/manifests/config/file.pp +++ b/manifests/config/file.pp @@ -34,11 +34,11 @@ define apache::config::file( 'absent': { $real_source = $source ? { 'absent' => [ - "puppet:///modules/site-apache/${confdir}/${fqdn}/${name}", - "puppet:///modules/site-apache/${confdir}/${apache_cluster_node}/${name}", - "puppet:///modules/site-apache/${confdir}/${operatingsystem}.${lsbdistcodename}/${name}", - "puppet:///modules/site-apache/${confdir}/${operatingsystem}/${name}", - "puppet:///modules/site-apache/${confdir}/${name}", + "puppet:///modules/site_apache/${confdir}/${fqdn}/${name}", + "puppet:///modules/site_apache/${confdir}/${apache_cluster_node}/${name}", + "puppet:///modules/site_apache/${confdir}/${operatingsystem}.${lsbdistcodename}/${name}", + "puppet:///modules/site_apache/${confdir}/${operatingsystem}/${name}", + "puppet:///modules/site_apache/${confdir}/${name}", "puppet:///modules/apache/${confdir}/${operatingsystem}.${lsbdistcodename}/${name}", "puppet:///modules/apache/${confdir}/${operatingsystem}/${name}", "puppet:///modules/apache/${confdir}/${name}" diff --git a/manifests/debian.pp b/manifests/debian.pp index aa54dfa..2054d2f 100644 --- a/manifests/debian.pp +++ b/manifests/debian.pp @@ -20,10 +20,10 @@ class apache::debian inherits apache::package { } file { 'apache_main_config': path => "${config_dir}/apache2.conf", - source => [ "puppet:///modules/site-apache/config/Debian.${lsbdistcodename}/${fqdn}/apache2.conf", - "puppet:///modules/site-apache/config/Debian/{$fqdn}/apache2.conf", - "puppet:///modules/site-apache/config/Debian.${lsbdistcodename}/apache2.conf", - "puppet:///modules/site-apache/config/Debian/apache2.conf", + source => [ "puppet:///modules/site_apache/config/Debian.${lsbdistcodename}/${fqdn}/apache2.conf", + "puppet:///modules/site_apache/config/Debian/{$fqdn}/apache2.conf", + "puppet:///modules/site_apache/config/Debian.${lsbdistcodename}/apache2.conf", + "puppet:///modules/site_apache/config/Debian/apache2.conf", "puppet:///modules/apache/config/Debian/apache2.conf" ], require => Package['apache'], notify => Service['apache'], diff --git a/manifests/gentoo/module.pp b/manifests/gentoo/module.pp index 33b6703..99de0ff 100644 --- a/manifests/gentoo/module.pp +++ b/manifests/gentoo/module.pp @@ -10,9 +10,9 @@ define apache::gentoo::module( } $real_source = $source ? { '' => [ - "puppet:///modules/site-apache/modules.d/${fqdn}/${name}.conf", - "puppet:///modules/site-apache/modules.d/${apache_cluster_node}/${name}.conf", - "puppet:///modules/site-apache/modules.d/${name}.conf", + "puppet:///modules/site_apache/modules.d/${fqdn}/${name}.conf", + "puppet:///modules/site_apache/modules.d/${apache_cluster_node}/${name}.conf", + "puppet:///modules/site_apache/modules.d/${name}.conf", "puppet:///modules/apache/modules.d/${operatingsystem}/${name}.conf", "puppet:///modules/apache/modules.d/${name}.conf" ], diff --git a/manifests/openbsd.pp b/manifests/openbsd.pp index f1c8ac0..e570dbf 100644 --- a/manifests/openbsd.pp +++ b/manifests/openbsd.pp @@ -26,9 +26,9 @@ class apache::openbsd inherits apache::base { } file{'apache_main_config': path => "${config_dir}/conf/httpd.conf", - source => [ "puppet:///modules/site-apache/config/OpenBSD/${fqdn}/httpd.conf", - "puppet:///modules/site-apache/config/OpenBSD/${apache_cluster_node}/httpd.conf", - "puppet:///modules/site-apache/config/OpenBSD//httpd.conf", + source => [ "puppet:///modules/site_apache/config/OpenBSD/${fqdn}/httpd.conf", + "puppet:///modules/site_apache/config/OpenBSD/${apache_cluster_node}/httpd.conf", + "puppet:///modules/site_apache/config/OpenBSD//httpd.conf", "puppet:///modules/apache/config/OpenBSD/httpd.conf" ], notify => Service['apache'], owner => root, group => 0, mode => 0644; diff --git a/manifests/vhost/file.pp b/manifests/vhost/file.pp index 6c750c1..fdea1f9 100644 --- a/manifests/vhost/file.pp +++ b/manifests/vhost/file.pp @@ -98,11 +98,11 @@ define apache::vhost::file( 'absent': { $real_vhost_source = $vhost_source ? { 'absent' => [ - "puppet:///modules/site-apache/vhosts.d/$fqdn/$name.conf", - "puppet:///modules/site-apache/vhosts.d/$apache_cluster_node/$name.conf", - "puppet:///modules/site-apache/vhosts.d/$operatingsystem.$lsbdistcodename/$name.conf", - "puppet:///modules/site-apache/vhosts.d/$operatingsystem/$name.conf", - "puppet:///modules/site-apache/vhosts.d/$name.conf", + "puppet:///modules/site_apache/vhosts.d/$fqdn/$name.conf", + "puppet:///modules/site_apache/vhosts.d/$apache_cluster_node/$name.conf", + "puppet:///modules/site_apache/vhosts.d/$operatingsystem.$lsbdistcodename/$name.conf", + "puppet:///modules/site_apache/vhosts.d/$operatingsystem/$name.conf", + "puppet:///modules/site_apache/vhosts.d/$name.conf", "puppet:///modules/apache/vhosts.d/$operatingsystem.$lsbdistcodename/$name.conf", "puppet:///modules/apache/vhosts.d/$operatingsystem/$name.conf", "puppet:///modules/apache/vhosts.d/$name.conf" @@ -133,9 +133,9 @@ define apache::vhost::file( } if ($ensure!='absent') { File[$real_htpasswd_path]{ - source => [ "puppet:///modules/site-apache/htpasswds/$fqdn/$name", - "puppet:///modules/site-apache/htpasswds/$apache_cluster_node/$name", - "puppet:///modules/site-apache/htpasswds/$name" ], + source => [ "puppet:///modules/site_apache/htpasswds/$fqdn/$name", + "puppet:///modules/site_apache/htpasswds/$apache_cluster_node/$name", + "puppet:///modules/site_apache/htpasswds/$name" ], owner => root, group => 0, mode => 0644, } } diff --git a/manifests/vhost/file/documentrootfile.pp b/manifests/vhost/file/documentrootfile.pp index dd8e565..8645323 100644 --- a/manifests/vhost/file/documentrootfile.pp +++ b/manifests/vhost/file/documentrootfile.pp @@ -7,11 +7,11 @@ define apache::vhost::file::documentrootfile( $mode=440 ){ file{"$documentroot/$filename": - source => [ "puppet:///modules/site-apache/vhost_varieties/$fqdn/$thedomain/$filename", - "puppet:///modules/site-apache/vhost_varieties/$apache_cluster_node/$thedomain/$filename", - "puppet:///modules/site-apache/vhost_varieties/$operatingsystem.$lsbdistcodename/$thedomain/$filename", - "puppet:///modules/site-apache/vhost_varieties/$operatingsystem/$thedomain/$filename", - "puppet:///modules/site-apache/vhost_varieties/$thedomain/$filename", + source => [ "puppet:///modules/site_apache/vhost_varieties/$fqdn/$thedomain/$filename", + "puppet:///modules/site_apache/vhost_varieties/$apache_cluster_node/$thedomain/$filename", + "puppet:///modules/site_apache/vhost_varieties/$operatingsystem.$lsbdistcodename/$thedomain/$filename", + "puppet:///modules/site_apache/vhost_varieties/$operatingsystem/$thedomain/$filename", + "puppet:///modules/site_apache/vhost_varieties/$thedomain/$filename", "puppet:///modules/apache/vhost_varieties/$thedomain/$filename", "puppet:///modules/apache/vhost_varieties/$operatingsystem.$lsbdistcodename/$thedomain/$filename", "puppet:///modules/apache/vhost_varieties/$operatingsystem/$thedomain/$filename", -- cgit v1.2.3