summaryrefslogtreecommitdiff
path: root/puppet/modules
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2017-10-23 19:43:47 -0200
committerSilvio Rhatto <rhatto@riseup.net>2017-10-23 19:43:47 -0200
commitb45c60df8af294fe97b8912a0b9703c76e5de8d6 (patch)
tree2a3442f2e0b3c7494cc591ac8c8053d84c3c9d84 /puppet/modules
parentc880b15f013c6d761e4632570112f796ffc1dcda (diff)
parent1bfffe2e0adff6e44ec33726988b64f95ea2f599 (diff)
downloaddebian-b45c60df8af294fe97b8912a0b9703c76e5de8d6.tar.gz
debian-b45c60df8af294fe97b8912a0b9703c76e5de8d6.tar.bz2
Merge commit '1bfffe2e0adff6e44ec33726988b64f95ea2f599' into develop
Diffstat (limited to 'puppet/modules')
-rw-r--r--puppet/modules/.empty (renamed from puppet/modules/site_apache/files/htdocs/images/.empty)0
l---------puppet/modules/bootstrap1
-rw-r--r--puppet/modules/site_apache/files/vhosts/.empty0
-rw-r--r--puppet/modules/site_apt/files/keys.d/.empty0
-rw-r--r--puppet/modules/site_bind/manifests/init.pp16
-rw-r--r--puppet/modules/site_keys/files/ssl/.empty0
-rw-r--r--puppet/modules/site_mail/files/.empty0
-rw-r--r--puppet/modules/site_mail/files/aliases14
-rw-r--r--puppet/modules/site_nagios/files/.empty0
-rw-r--r--puppet/modules/site_nginx/files/.empty0
-rw-r--r--puppet/modules/site_postfix/files/.empty0
-rw-r--r--puppet/modules/site_users/manifests/admin.pp16
-rw-r--r--puppet/modules/site_users/manifests/backups.pp3
-rw-r--r--puppet/modules/site_users/manifests/init.pp2
-rw-r--r--puppet/modules/site_users/manifests/virtual.pp3
-rw-r--r--puppet/modules/site_websites/manifests/admin.pp25
-rw-r--r--puppet/modules/site_websites/manifests/init.pp21
17 files changed, 0 insertions, 101 deletions
diff --git a/puppet/modules/site_apache/files/htdocs/images/.empty b/puppet/modules/.empty
index e69de29..e69de29 100644
--- a/puppet/modules/site_apache/files/htdocs/images/.empty
+++ b/puppet/modules/.empty
diff --git a/puppet/modules/bootstrap b/puppet/modules/bootstrap
deleted file mode 120000
index a96aa0e..0000000
--- a/puppet/modules/bootstrap
+++ /dev/null
@@ -1 +0,0 @@
-.. \ No newline at end of file
diff --git a/puppet/modules/site_apache/files/vhosts/.empty b/puppet/modules/site_apache/files/vhosts/.empty
deleted file mode 100644
index e69de29..0000000
--- a/puppet/modules/site_apache/files/vhosts/.empty
+++ /dev/null
diff --git a/puppet/modules/site_apt/files/keys.d/.empty b/puppet/modules/site_apt/files/keys.d/.empty
deleted file mode 100644
index e69de29..0000000
--- a/puppet/modules/site_apt/files/keys.d/.empty
+++ /dev/null
diff --git a/puppet/modules/site_bind/manifests/init.pp b/puppet/modules/site_bind/manifests/init.pp
deleted file mode 100644
index 7ee08d2..0000000
--- a/puppet/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/puppet/modules/site_keys/files/ssl/.empty b/puppet/modules/site_keys/files/ssl/.empty
deleted file mode 100644
index e69de29..0000000
--- a/puppet/modules/site_keys/files/ssl/.empty
+++ /dev/null
diff --git a/puppet/modules/site_mail/files/.empty b/puppet/modules/site_mail/files/.empty
deleted file mode 100644
index e69de29..0000000
--- a/puppet/modules/site_mail/files/.empty
+++ /dev/null
diff --git a/puppet/modules/site_mail/files/aliases b/puppet/modules/site_mail/files/aliases
deleted file mode 100644
index 08a0723..0000000
--- a/puppet/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/puppet/modules/site_nagios/files/.empty b/puppet/modules/site_nagios/files/.empty
deleted file mode 100644
index e69de29..0000000
--- a/puppet/modules/site_nagios/files/.empty
+++ /dev/null
diff --git a/puppet/modules/site_nginx/files/.empty b/puppet/modules/site_nginx/files/.empty
deleted file mode 100644
index e69de29..0000000
--- a/puppet/modules/site_nginx/files/.empty
+++ /dev/null
diff --git a/puppet/modules/site_postfix/files/.empty b/puppet/modules/site_postfix/files/.empty
deleted file mode 100644
index e69de29..0000000
--- a/puppet/modules/site_postfix/files/.empty
+++ /dev/null
diff --git a/puppet/modules/site_users/manifests/admin.pp b/puppet/modules/site_users/manifests/admin.pp
deleted file mode 100644
index 14ad9da..0000000
--- a/puppet/modules/site_users/manifests/admin.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-class site_users::admin inherits user {
- # 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/puppet/modules/site_users/manifests/backups.pp b/puppet/modules/site_users/manifests/backups.pp
deleted file mode 100644
index aab00f9..0000000
--- a/puppet/modules/site_users/manifests/backups.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class site_users::backup inherits user {
- # define third-party hosted backup users here
-}
diff --git a/puppet/modules/site_users/manifests/init.pp b/puppet/modules/site_users/manifests/init.pp
deleted file mode 100644
index b3c656a..0000000
--- a/puppet/modules/site_users/manifests/init.pp
+++ /dev/null
@@ -1,2 +0,0 @@
-class site_users {
-}
diff --git a/puppet/modules/site_users/manifests/virtual.pp b/puppet/modules/site_users/manifests/virtual.pp
deleted file mode 100644
index 20aba01..0000000
--- a/puppet/modules/site_users/manifests/virtual.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class site_users::virtual inherits user {
- # define custom users here
-}
diff --git a/puppet/modules/site_websites/manifests/admin.pp b/puppet/modules/site_websites/manifests/admin.pp
deleted file mode 100644
index 0be3a94..0000000
--- a/puppet/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/puppet/modules/site_websites/manifests/init.pp b/puppet/modules/site_websites/manifests/init.pp
deleted file mode 100644
index c98ca7d..0000000
--- a/puppet/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',
- #}
-}