aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-06-16 14:12:56 -0300
committerSilvio Rhatto <rhatto@riseup.net>2016-06-16 14:12:56 -0300
commitd56416fc07eece9fdeb9554ce123341f124a10ad (patch)
tree763582e87d7d1dbe510f8d937ae3d9ea4f5161a5 /manifests
parentc18f31cf8b37db0ff3c33ff4b360e29b5e211c04 (diff)
downloadpuppet-nodo-d56416fc07eece9fdeb9554ce123341f124a10ad.tar.gz
puppet-nodo-d56416fc07eece9fdeb9554ce123341f124a10ad.tar.bz2
Cleanup
Diffstat (limited to 'manifests')
-rw-r--r--manifests/role/master.pp53
-rw-r--r--manifests/role/nas/desktop.pp2
2 files changed, 1 insertions, 54 deletions
diff --git a/manifests/role/master.pp b/manifests/role/master.pp
deleted file mode 100644
index 64db626..0000000
--- a/manifests/role/master.pp
+++ /dev/null
@@ -1,53 +0,0 @@
-class nodo::role::master {
- $main = hiera('nodo::role::master::main', false)
- $db_password = hiera('nodo::role::master::db_password', '')
-
- case $db_password {
- '': { fail("Please set nodo::master::db_password in your config") }
- }
-
- if $main == true {
- # Puppetmaster should be included before nodo::virtual
- class { 'puppet::master':
- main => true,
- }
-
- # The main master has a host entry pointing to itself, other
- # masters still retrieve catalogs from the main master.
- #
- # For that we're relying just on DNS entries.
- host { "puppet":
- ensure => absent,
- ip => "127.0.0.1",
- host_aliases => ["puppet.${::domain}"],
- }
- } else {
- class { 'puppet::master':
- main => false,
- }
-
- host { "puppet":
- ensure => absent,
- }
- }
-
- # These should be included after puppetmaster
- include nodo::role::virtual
- include database
- include git::daemon
- include nodo::subsystem::monitor::master
- include websites
-
- # Update master's puppet.conf if you change here
- database::instance { "puppet":
- password => "${db_password}",
- }
-
- # Used for trac dependency graphs
- package { "graphviz":
- ensure => present,
- }
-
- # Check domain registration
- domain_check::instance { $::domain: }
-}
diff --git a/manifests/role/nas/desktop.pp b/manifests/role/nas/desktop.pp
index 5a14599..4de4cc0 100644
--- a/manifests/role/nas/desktop.pp
+++ b/manifests/role/nas/desktop.pp
@@ -1,4 +1,4 @@
-# A desktop action as a NAS
+# A desktop acting as a NAS
class nodo::role::nas::desktop inherits nodo::base::desktop {
include nodo::role::nas
}