refactor module

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 2ddf066..8d0b2c0 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -24,7 +24,7 @@ class buildd ($ensure=present) {
                        require => Package['dupload'],
                }
                site::linux_module { 'dm_snapshot': }
-               ferm::module { 'nf_conntrack_ftp': }
+               include ferm::ftp_conntrack
        }
 
        site::aptrepo { 'buildd':
@@ -46,28 +46,19 @@ class buildd ($ensure=present) {
                require    => Package['apt-transport-https'],
        }
 
+       $buildd_prop_ensure = $::hostname ? {
+               /^(alkman|barber|brahms|porpora|zandonai)$/ => 'present',
+               default => 'absent',
+       }
+
        site::aptrepo { 'buildd.debian.org-proposed':
-               ensure     => $::hostname ? {
-                                            /^(alkman|barber|brahms|porpora|zandonai)$/ => 'present',
-                                            default => 'absent',
-                                           },
+               ensure     => $buildd_prop_ensure,
                url        => 'https://buildd.debian.org/apt/',
                suite      => "${suite}-proposed",
                components => 'main',
                require    => Package['apt-transport-https'],
        }
 
-       #site::aptrepo { 'buildd.debian.org-experimental':
-       #       ensure     => $::hostname ? {
-       #                                    /^(xxxx)$/ => 'present',
-       #                                    default => 'absent',
-       #                                   },
-       #       url        => 'https://buildd.debian.org/apt/',
-       #       suite      => "${suite}-experimental",
-       #       components => 'main',
-       #       require    => Package['apt-transport-https'],
-       #}
-
        # 'bad' extension
        file { '/etc/apt/preferences.d/buildd.debian.org':
                ensure => absent,

diff --git a/modules/ferm/manifests/ftp_conntrack.pp b/modules/ferm/manifests/ftp_conntrack.pp
new file mode 100644 (file)
index 0000000..ea502e2
--- /dev/null
+++ b/modules/ferm/manifests/ftp_conntrack.pp
@@ -0,0 +1,3 @@
+class ferm::ftp_conntrack {
+       ferm::module { 'nf_conntrack_ftp': }
+}

diff --git a/modules/roles/manifests/ftp.pp b/modules/roles/manifests/ftp.pp
index fa6421e..95fd87d 100644 (file)
--- a/modules/roles/manifests/ftp.pp
+++ b/modules/roles/manifests/ftp.pp
@@ -1,5 +1,7 @@
 class roles::ftp {
 
+       include ferm::ftp_conntrack
+
        $bind = $::hostname ? {
                klecker => '::ffff:130.89.148.12',
                default => '',

diff --git a/modules/roles/manifests/ftp_master.pp b/modules/roles/manifests/ftp_master.pp
index 1da8871..22f751c 100644 (file)
--- a/modules/roles/manifests/ftp_master.pp
+++ b/modules/roles/manifests/ftp_master.pp
@@ -3,7 +3,8 @@ class roles::ftp_master {
                source        => 'puppet:///modules/roles/dakmaster/rsyncd.conf',
                max_clients => 100,
        }
-        ssl::service { 'ftp-master.debian.org':
-                notify => Service['apache2'],
-        }
+
+       ssl::service { 'ftp-master.debian.org':
+               notify => Service['apache2'],
+       }
 }

diff --git a/modules/roles/manifests/ftp_upload.pp b/modules/roles/manifests/ftp_upload.pp
index d22227b..5612606 100644 (file)
--- a/modules/roles/manifests/ftp_upload.pp
+++ b/modules/roles/manifests/ftp_upload.pp
@@ -1,5 +1,7 @@
 class roles::ftp_upload {
 
+       include ferm::ftp_conntrack
+
        vsftpd::site { 'ftp-upload':
                banner     => 'ftp.upload.debian.org FTP server',
                logfile    => '/var/log/ftp/vsftpd-ftp.upload.debian.org.log',