From 319bdcb9e0135f3cbac8a3d8fab29e26c6d1b8c3 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Sat, 18 Jun 2016 14:16:58 -0300 Subject: Cleanup modules folder --- modules/bootstrap | 1 - modules/site_apache/files/htdocs/images/.empty | 0 modules/site_apache/files/vhosts/.empty | 0 modules/site_apt/files/keys.d/.empty | 0 modules/site_bind/manifests/init.pp | 16 ---------------- modules/site_keys/files/ssl/.empty | 0 modules/site_mail/files/.empty | 0 modules/site_mail/files/aliases | 14 -------------- modules/site_nagios/files/.empty | 0 modules/site_nginx/files/.empty | 0 modules/site_postfix/files/.empty | 0 modules/site_users/manifests/admin.pp | 16 ---------------- modules/site_users/manifests/backups.pp | 3 --- modules/site_users/manifests/init.pp | 2 -- modules/site_users/manifests/virtual.pp | 3 --- modules/site_websites/manifests/admin.pp | 25 ------------------------- modules/site_websites/manifests/init.pp | 21 --------------------- 17 files changed, 101 deletions(-) delete mode 120000 modules/bootstrap delete mode 100644 modules/site_apache/files/htdocs/images/.empty delete mode 100644 modules/site_apache/files/vhosts/.empty delete mode 100644 modules/site_apt/files/keys.d/.empty delete mode 100644 modules/site_bind/manifests/init.pp delete mode 100644 modules/site_keys/files/ssl/.empty delete mode 100644 modules/site_mail/files/.empty delete mode 100644 modules/site_mail/files/aliases delete mode 100644 modules/site_nagios/files/.empty delete mode 100644 modules/site_nginx/files/.empty delete mode 100644 modules/site_postfix/files/.empty delete mode 100644 modules/site_users/manifests/admin.pp delete mode 100644 modules/site_users/manifests/backups.pp delete mode 100644 modules/site_users/manifests/init.pp delete mode 100644 modules/site_users/manifests/virtual.pp delete mode 100644 modules/site_websites/manifests/admin.pp delete mode 100644 modules/site_websites/manifests/init.pp diff --git a/modules/bootstrap b/modules/bootstrap deleted file mode 120000 index a96aa0e..0000000 --- a/modules/bootstrap +++ /dev/null @@ -1 +0,0 @@ -.. \ No newline at end of file diff --git a/modules/site_apache/files/htdocs/images/.empty b/modules/site_apache/files/htdocs/images/.empty deleted file mode 100644 index e69de29..0000000 diff --git a/modules/site_apache/files/vhosts/.empty b/modules/site_apache/files/vhosts/.empty deleted file mode 100644 index e69de29..0000000 diff --git a/modules/site_apt/files/keys.d/.empty b/modules/site_apt/files/keys.d/.empty deleted file mode 100644 index e69de29..0000000 diff --git a/modules/site_bind/manifests/init.pp b/modules/site_bind/manifests/init.pp deleted file mode 100644 index 7ee08d2..0000000 --- a/modules/site_bind/manifests/init.pp +++ /dev/null @@ -1,16 +0,0 @@ -class site_bind { - # - # See http://oreilly.com/pub/a/oreilly/networking/news/views_0501.html - # http://www.debian-administration.org/articles/355 - - # This is needed so we can comment out the inclusion of - # /etc/bind/named.conf.default-zones - #file { '/etc/bind/named.conf': - # ensure => present, - # owner => root, - # group => root, - # mode => 0644, - # source => 'puppet:///modules/site_bind/named.conf', - # notify => Service['bind9'], - #} -} diff --git a/modules/site_keys/files/ssl/.empty b/modules/site_keys/files/ssl/.empty deleted file mode 100644 index e69de29..0000000 diff --git a/modules/site_mail/files/.empty b/modules/site_mail/files/.empty deleted file mode 100644 index e69de29..0000000 diff --git a/modules/site_mail/files/aliases b/modules/site_mail/files/aliases deleted file mode 100644 index 08a0723..0000000 --- a/modules/site_mail/files/aliases +++ /dev/null @@ -1,14 +0,0 @@ -# /etc/aliases -mailer-daemon: postmaster -postmaster: root -nobody: root -hostmaster: root -usenet: root -news: root -webmaster: root -www: root -ftp: root -abuse: root -noc: root -security: root -reprepro: root diff --git a/modules/site_nagios/files/.empty b/modules/site_nagios/files/.empty deleted file mode 100644 index e69de29..0000000 diff --git a/modules/site_nginx/files/.empty b/modules/site_nginx/files/.empty deleted file mode 100644 index e69de29..0000000 diff --git a/modules/site_postfix/files/.empty b/modules/site_postfix/files/.empty deleted file mode 100644 index e69de29..0000000 diff --git a/modules/site_users/manifests/admin.pp b/modules/site_users/manifests/admin.pp deleted file mode 100644 index cdf4fd1..0000000 --- a/modules/site_users/manifests/admin.pp +++ /dev/null @@ -1,16 +0,0 @@ -class site_users::admin { - # root user and password - #user::manage { "root": - # tag => "admin", - # homedir => '/root', - # password => '$5$zpdXgIaLKMDckKx9$qTS9WbmS/zylFwPu1orq.779CNnAiA9VoGdFNU94jz/', - #} - - # first user config - #user::manage { "user": - # tag => "admin", - # groups => [ "sudo", ], - # password => '$5$D8kCEIo5/MNCA7Tz$VhGg2MNDs21JzX9HgxSWMupA5GD5MXnKwDuveMSdPH7', - # sshkey => [ "WRONG" ], - #} -} diff --git a/modules/site_users/manifests/backups.pp b/modules/site_users/manifests/backups.pp deleted file mode 100644 index 542e28c..0000000 --- a/modules/site_users/manifests/backups.pp +++ /dev/null @@ -1,3 +0,0 @@ -class site_users::backup { - # define third-party hosted backup users here -} diff --git a/modules/site_users/manifests/init.pp b/modules/site_users/manifests/init.pp deleted file mode 100644 index b3c656a..0000000 --- a/modules/site_users/manifests/init.pp +++ /dev/null @@ -1,2 +0,0 @@ -class site_users { -} diff --git a/modules/site_users/manifests/virtual.pp b/modules/site_users/manifests/virtual.pp deleted file mode 100644 index a74e629..0000000 --- a/modules/site_users/manifests/virtual.pp +++ /dev/null @@ -1,3 +0,0 @@ -class site_users::virtual { - # define custom users here -} diff --git a/modules/site_websites/manifests/admin.pp b/modules/site_websites/manifests/admin.pp deleted file mode 100644 index 0be3a94..0000000 --- a/modules/site_websites/manifests/admin.pp +++ /dev/null @@ -1,25 +0,0 @@ -class site_websites::admin inherits websites::hosting::admin { - # An administrative Trac instance - #apache::site { "admin": - # docroot => "${apache::sites_folder}/admin/trac/htdocs", - # use => [ "Trac admin" ], - # redirect_match => "trac", - # mpm => false, - # tag => 'all', - #} - - apache::site { "munin": - docroot => '/var/www/munin', - owner => "munin", - group => "munin", - mpm => false, - tag => 'all', - } - - apache::site { "nagios": - source => true, - docroot => '/usr/share/nagios3/htdocs', - mpm => false, - tag => 'all', - } -} diff --git a/modules/site_websites/manifests/init.pp b/modules/site_websites/manifests/init.pp deleted file mode 100644 index c98ca7d..0000000 --- a/modules/site_websites/manifests/init.pp +++ /dev/null @@ -1,21 +0,0 @@ -class site_websites inherits websites::hosting { - # Website definitions: always use tagged resources - apache::site { "git": - source => true, - docroot => '/var/git/repositories', - mpm => false, - tag => 'all', - } - - #apache::site { "site": - # source => true, - # ticket => '001', - # docroot => '/var/www/site', - # tag => 'all', - #} - - #database::instance { "site": - # password => 'xxx', - # tag => 'all', - #} -} -- cgit v1.2.3