extracted every define and class in it's own file

1 files changed, 0 insertions, 230 deletions

diff --git a/manifests/init.pp b/manifests/init.pp
index a6b6c3e..ef7867f 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -12,8 +12,6 @@
 # the Free Software Foundation.
 #
 
-import "defines/*.pp"
-
 # Global variables:
 #
 # $apache_default_user: Set this to the user with which the
@@ -37,231 +35,3 @@ class apache {
     }
 }
 
-class apache::base {
-    file{'vhosts_dir':
-        path => '/etc/apache2/vhosts.d/',
-        ensure => directory,
-        owner => root, group => 0, mode => 0755;
-    }
-    file{'config_dir':
-        path => '/etc/apache2/conf.d/',
-        ensure => directory,
-        owner => root, group => 0, mode => 0755;
-    }
-    file{'modules_dir':
-        path => '/etc/apache2/modules.d/',
-        ensure => directory,
-        owner => root, group => 0, mode => 0755;
-    }
-    file{'htpasswd_dir':
-        path => '/var/www/htpasswds/',
-        ensure => directory,
-        owner => root, group => apache, mode => 0640;
-    }
-    file{'web_dir':
-        path => '/var/www/',
-        ensure => directory,
-        owner => root, group => 0, mode => 0755;
-    }
-    service { apache:
-        name => 'apache2',
-        enable => true,
-        ensure => running,
-    }
-    file { 'default_apache_index':
-        path => '/var/www/localhost/htdocs/index.html',
-        ensure => file,
-        content => template('apache/default/default_index.erb'),
-        owner => root, group => 0, mode => 0644;
-    }
-
-    apache::config::file{ 'defaults.inc': }
-    apache::config::file{ 'git.conf': }
-    apache::vhost::file { '0-default': }
-}
-
-class apache::package inherits apache::base {
-    package { 'apache':
-        name => 'apache',
-        ensure => present,
-    }
-    File['vhosts_dir']{
-        require => Package[apache],
-    }
-    File['config_dir']{
-        require => Package[apache],
-    }
-    Service['apache']{
-        require => Package[apache],
-    }
-    File['default_apache_index']{
-        require => Package[apache],
-    }
-    File['modules_dir']{
-        require => Package[apache],
-    }
-    File['web_dir']{
-        require => Package[apache],
-    }
-    File['htpasswd_dir']{
-        require => Package[apache],
-    }
-}
-
-
-### distribution specific classes
-
-### centos
-class apache::centos inherits apache::package {
-    $config_dir = '/etc/httpd/'
-
-    Package[apache]{
-        name => 'httpd',
-    }
-    Service[apache]{
-        name => 'httpd',
-        restart => '/etc/init.d/httpd graceful',
-    }
-    File[vhosts_dir]{
-        path => "$config_dir/vhosts.d/",
-    }
-    File[config_dir]{
-        path => "$config_dir/conf.d/",
-    }
-    File[modules_dir]{
-        path => "$config_dir/modules.d/",
-    }
-    File[web_dir]{
-        path => "/var/www/vhosts",
-    }
-    File[default_apache_index]{
-        path => '/var/www/html/index.html',
-    }
-
-    file{'/etc/sysconfig/httpd':
-      source => [ "puppet://$server/files/apache/sysconfig/${fqdn}/httpd",
-                  "puppet://$server/files/apache/sysconfig/httpd",
-                  "puppet://$server/apache/sysconfig/${operatingsystem}/httpd",
-                  "puppet://$server/apache/sysconfig/httpd" ],
-      require => Package['apache'],
-      notify => Service['apache'],
-      owner => root, group => 0, mode => 0644;
-    }
-
-    apache::config::file{ 'welcome.conf': }
-    apache::config::file{ 'vhosts.conf': }
-}
-
-### gentoo
-class apache::gentoo inherits apache::package {
-    $config_dir = '/etc/apache2/'
-
-    # needs module gentoo
-    gentoo::etcconfd {
-        apache2: require => "Package[apache]", 
-        notify => Service[apache],
-    }
-    Package[apache]{
-        category => 'www-servers',
-    }
-    File[vhosts_dir]{
-        path => "$config_dir/vhosts.d/",
-    }
-    File[modules_dir]{
-        path => "$config_dir/modules.d/",
-    }
-
-    apache::gentoo::module { '00_default_settings': }
-    apache::gentoo::module { '00_error_documents': }
-    apache::config::file { 'default_vhost.include': 
-        source => "apache/vhosts.d/default_vhost.include",
-        destination => "$config_dir/vhosts.d/default_vhost.include",
-    }
-
-    # set the default for the ServerName
-    file{"${config_dir}/modules.d/00_default_settings_ServerName.conf":
-        content => template('apache/modules_dir_00_default_settings_ServerName.conf.erb'),
-        require => Package[apache],
-        owner => root, group => 0, mode => 0644;
-    }
-}
-
-### debian
-class apache::debian inherits apache::package {
-    $config_dir = '/etc/apache2/'
-
-    file {"$vhosts_dir":
-        ensure => '/etc/apache2/sites-enabled/',
-    }
-    File[default_apache_index] {
-        path => '/var/www/index.html',
-    }
-}
-
-### ubuntu: similar to debian therefor inheritng from there
-class apache::ubuntu inherits apache::debian {}
-
-### openbsd
-class apache::openbsd inherits apache::base {
-    $config_dir = '/var/www/'
-
-    File[vhosts_dir]{
-        path => "$config_dir/vhosts.d/",
-    }
-    File[modules_dir]{
-        path => "$config_dir/conf/modules/",
-    }
-    File[config_dir]{
-        path => "$config_dir/conf.d/",
-    }
-    File['htpasswd_dir']{
-        group => www,
-    }
-    File[web_dir]{
-        group => daemon,
-    }
-    line{'enable_apache_on_boot':
-        file => '/etc/rc.conf.local',
-        line => 'httpd flags=""',
-    }
-    file{"$config_dir/conf/httpd.conf":
-        source => [ "puppet://$server/files/apache/conf/${fqdn}/httpd.conf",
-                    "puppet://$server/files/apache/conf/${apache_cluster_node}/httpd.conf",
-                    "puppet://$server/files/apache/conf/httpd.conf",
-                    "puppet://$server/apache/conf/${operatingsystem}/httpd.conf",
-                    "puppet://$server/apache/conf/httpd.conf" ],
-        notify => Service['apache'],
-        owner => root, group => 0, mode => 0644;
-    }
-    File[default_apache_index] {
-        path => '/var/www/htdocs/default/www/index.html',
-    }
-    file{'/opt/bin/restart_apache.sh':
-        source => "puppet://$server/apache/OpenBSD/bin/restart_apache.sh",
-        require => File['/opt/bin'],
-        owner => root, group => 0, mode => 0700;
-    }
-
-    apache::vhost::webdir{'default': }
-
-    Service['apache']{
-        restart => '/opt/bin/restart_apache.sh',
-        status => 'apachectl status',
-        start => 'apachectl start',
-        stop => 'apachectl stop',
-    }
-    file{'/opt/bin/apache_logrotate.sh':
-        source => "puppet://$server/apache/OpenBSD/bin/apache_logrotate.sh",
-        require => File['/opt/bin'],
-        owner => root, group => 0, mode => 0700;
-    }
-    cron { 'update_apache_logrotation':
-        command => '/bin/sh /opt/bin/apache_logrotate.sh  > /etc/newsyslog_apache.conf',
-        minute => '1',
-        hour => '1',
-    }
-    cron { 'run_apache_logrotation':
-        command => '/usr/bin/newsyslog -f /etc/newsyslog_apache.conf > /dev/null',
-        minute => '10',
-    }
-}