diff options
Diffstat (limited to 'manifests')
32 files changed, 32 insertions, 32 deletions
diff --git a/manifests/appliance.pp b/manifests/base/appliance.pp index dea7625..73d95f5 100644 --- a/manifests/appliance.pp +++ b/manifests/base/appliance.pp @@ -1,4 +1,4 @@ -class nodo::appliance inherits nodo::physical { +class nodo::base::appliance inherits nodo::base::physical { class { 'sysctl::appliance': } class { [ 'nodo::subsystem::fstab', 'nodo::subsystem::crypttab' ]: diff --git a/manifests/desktop.pp b/manifests/base/desktop.pp index 7e83732..bf9d2fe 100644 --- a/manifests/desktop.pp +++ b/manifests/base/desktop.pp @@ -1,4 +1,4 @@ -class nodo::desktop inherits nodo::personal { +class nodo::base::desktop inherits nodo::base::personal { include nodo::utils::desktop class { [ 'nodo::subsystem::fstab', 'nodo::subsystem::crypttab' ]: diff --git a/manifests/host.pp b/manifests/base/host.pp index ee87e2f..f57aeb4 100644 --- a/manifests/host.pp +++ b/manifests/base/host.pp @@ -1,5 +1,5 @@ # Fully capable node able to host other nodes -class nodo::host { +class nodo::base::host { include nodo::subsystem::initramfs include nodo::subsystem::modprobe include nodo::subsystem::firewire diff --git a/manifests/kvm.pp b/manifests/base/kvm.pp index 11f3dde..06a7d10 100644 --- a/manifests/kvm.pp +++ b/manifests/base/kvm.pp @@ -1,4 +1,4 @@ -class nodo::kvm inherits nodo::host { +class nodo::base::kvm inherits nodo::base::host { class { [ 'nodo::subsystem::fstab', 'nodo::subsystem::crypttab' ]: type => 'kvm', } diff --git a/manifests/laptop.pp b/manifests/base/laptop.pp index 1ed77b7..dbafda7 100644 --- a/manifests/laptop.pp +++ b/manifests/base/laptop.pp @@ -1,4 +1,4 @@ -class nodo::laptop inherits nodo::personal { +class nodo::base::laptop inherits nodo::base::personal { include nodo::utils::laptop include nodo::subsystem::dhclient include firewall::wifi diff --git a/manifests/personal.pp b/manifests/base/personal.pp index 90f36ae..5aa28ad 100644 --- a/manifests/personal.pp +++ b/manifests/base/personal.pp @@ -1,5 +1,5 @@ # Personal computer -class nodo::personal { +class nodo::base::personal { include nodo::physical include nodo::utils::personal include autossh diff --git a/manifests/physical.pp b/manifests/base/physical.pp index c2d451d..e01bfb2 100644 --- a/manifests/physical.pp +++ b/manifests/base/physical.pp @@ -1,4 +1,4 @@ -class nodo::physical inherits nodo::host { +class nodo::base::physical inherits nodo::base::host { class { [ 'nodo::subsystem::ups', 'smartmontools' ]: } # SMART monitoring diff --git a/manifests/plug.pp b/manifests/base/plug.pp index 858ba0a..17ce366 100644 --- a/manifests/plug.pp +++ b/manifests/base/plug.pp @@ -1,4 +1,4 @@ -class nodo::plug { +class nodo::base::plug { include syslog-ng include nodo::utils::plug include nodo::utils::physical diff --git a/manifests/removable.pp b/manifests/base/removable.pp index 16f0157..d13b5ee 100644 --- a/manifests/removable.pp +++ b/manifests/base/removable.pp @@ -1,4 +1,4 @@ -class nodo::removable inherits nodo::desktop { +class nodo::base::removable inherits nodo::base::desktop { File["/etc/fstab"] { source => "puppet:///modules/nodo/etc/fstab/removable", } diff --git a/manifests/server.pp b/manifests/base/server.pp index 6606a49..93cce4c 100644 --- a/manifests/server.pp +++ b/manifests/base/server.pp @@ -1,4 +1,4 @@ -class nodo::server inherits nodo::physical { +class nodo::base::server inherits nodo::base::physical { class { [ 'nodo::subsystem::fstab', 'nodo::subsystem::crypttab' ]: type => 'server', } diff --git a/manifests/vserver.pp b/manifests/base/vserver.pp index 030803f..433be5a 100644 --- a/manifests/vserver.pp +++ b/manifests/base/vserver.pp @@ -1,4 +1,4 @@ -class nodo::vserver { +class nodo::base::vserver { class { 'timezone': } class { 'syslog-ng::vserver': } diff --git a/manifests/role/bitcoin.pp b/manifests/role/bitcoin.pp index 7e957ba..e1e7e08 100644 --- a/manifests/role/bitcoin.pp +++ b/manifests/role/bitcoin.pp @@ -1,4 +1,4 @@ -class nodo::role::bitcoin inherits nodo::vserver { +class nodo::role::bitcoin inherits nodo::base::vserver { include nodo::role::vserver include onion include onion::socks diff --git a/manifests/role/desktop.pp b/manifests/role/desktop.pp index 164b2f3..73e7b0f 100644 --- a/manifests/role/desktop.pp +++ b/manifests/role/desktop.pp @@ -1,3 +1,3 @@ # General purpose desktop -class nodo::role::desktop inherits nodo::desktop { +class nodo::role::desktop inherits nodo::base::desktop { } diff --git a/manifests/role/dns.pp b/manifests/role/dns.pp index a439092..52e1d50 100644 --- a/manifests/role/dns.pp +++ b/manifests/role/dns.pp @@ -1,4 +1,4 @@ -class nodo::role::dns inherits nodo::vserver { +class nodo::role::dns inherits nodo::base::vserver { include bind if defined('dns') { diff --git a/manifests/role/jabber.pp b/manifests/role/jabber.pp index b510ccd..9303683 100644 --- a/manifests/role/jabber.pp +++ b/manifests/role/jabber.pp @@ -1,4 +1,4 @@ -class nodo::role::jabber inherits nodo::vserver { +class nodo::role::jabber inherits nodo::base::vserver { include ssl include ejabberd diff --git a/manifests/role/kvm.pp b/manifests/role/kvm.pp index 71f4fa7..31d046d 100644 --- a/manifests/role/kvm.pp +++ b/manifests/role/kvm.pp @@ -1,3 +1,3 @@ # A general purpose kvm instance -class nodo::role::kvm inherits nodo::kvm { +class nodo::role::kvm inherits nodo::base::kvm { } diff --git a/manifests/role/laptop.pp b/manifests/role/laptop.pp index 0f9d407..a324718 100644 --- a/manifests/role/laptop.pp +++ b/manifests/role/laptop.pp @@ -1,3 +1,3 @@ # General purpose laptop -class nodo::role::laptop inherits nodo::laptop { +class nodo::role::laptop inherits nodo::base::laptop { } diff --git a/manifests/role/mail.pp b/manifests/role/mail.pp index 4c33ed4..255588a 100644 --- a/manifests/role/mail.pp +++ b/manifests/role/mail.pp @@ -1,3 +1,3 @@ class nodo::role::mail { - class { [ 'nodo::vserver', 'mail::system' ]: } + class { [ 'nodo::role::vserver', 'mail::system' ]: } } diff --git a/manifests/role/master.pp b/manifests/role/master.pp index 2adb8a5..804ea78 100644 --- a/manifests/role/master.pp +++ b/manifests/role/master.pp @@ -33,7 +33,7 @@ class nodo::role::master { } # These should be included after puppetmaster - include nodo::vserver + include nodo::role::vserver include database include git::daemon include websites::admin diff --git a/manifests/role/mumble.pp b/manifests/role/mumble.pp index 764c0d8..7c7c0a2 100644 --- a/manifests/role/mumble.pp +++ b/manifests/role/mumble.pp @@ -1,3 +1,3 @@ -class nodo::role::mumble inherits nodo::vserver { +class nodo::role::mumble inherits nodo::base::vserver { include mumble::ssl } diff --git a/manifests/role/nas/plug.pp b/manifests/role/nas/plug.pp index 4afb8aa..a092719 100644 --- a/manifests/role/nas/plug.pp +++ b/manifests/role/nas/plug.pp @@ -1,3 +1,3 @@ -class nodo::role::nas::plug inherits nodo::plug { +class nodo::role::nas::plug inherits nodo::base::plug { include nodo::role::nas } diff --git a/manifests/role/proxy.pp b/manifests/role/proxy.pp index 821e975..7852bef 100644 --- a/manifests/role/proxy.pp +++ b/manifests/role/proxy.pp @@ -1,3 +1,3 @@ -class nodo::role::proxy inherits nodo::vserver { +class nodo::role::proxy inherits nodo::base::vserver { include nginx } diff --git a/manifests/role/router.pp b/manifests/role/router.pp index 068837d..9d04813 100644 --- a/manifests/role/router.pp +++ b/manifests/role/router.pp @@ -1,4 +1,4 @@ -class nodo::role::router inherits nodo::appliance { +class nodo::role::router inherits nodo::base::appliance { # We use monitor class on the router as the DNS server might by # inside a vserver and thus cannot access the network devices directly include nodo::utils::dns diff --git a/manifests/role/server.pp b/manifests/role/server.pp index 9eac72c..9bb95b2 100644 --- a/manifests/role/server.pp +++ b/manifests/role/server.pp @@ -1,3 +1,3 @@ # A general purpose server -class nodo::role::server inherits nodo::server { +class nodo::role::server inherits nodo::base::server { } diff --git a/manifests/role/storage.pp b/manifests/role/storage.pp index 0cf7f60..144c367 100644 --- a/manifests/role/storage.pp +++ b/manifests/role/storage.pp @@ -1,3 +1,3 @@ -class nodo::role::storage inherits nodo::vserver { +class nodo::role::storage inherits nodo::base::vserver { include nodo::utils::storage } diff --git a/manifests/role/test.pp b/manifests/role/test.pp index 330a5ee..035d42c 100644 --- a/manifests/role/test.pp +++ b/manifests/role/test.pp @@ -1,3 +1,3 @@ -class nodo::role::test inherits nodo::web { +class nodo::role::test inherits nodo::role::web { # Class for test nodes } diff --git a/manifests/role/tor.pp b/manifests/role/tor.pp index 2d5ff58..35da3b5 100644 --- a/manifests/role/tor.pp +++ b/manifests/role/tor.pp @@ -1,4 +1,4 @@ -class nodo::role::tor inherits nodo::vserver { +class nodo::role::tor inherits nodo::base::vserver { include tor::daemon include nodo::utils::tor } diff --git a/manifests/role/vserver.pp b/manifests/role/vserver.pp index 55a754d..0d8a364 100644 --- a/manifests/role/vserver.pp +++ b/manifests/role/vserver.pp @@ -1,3 +1,3 @@ # A general purpose vserver -class nodo::role::vserver inherits nodo::vserver { +class nodo::role::vserver inherits nodo::base::vserver { } diff --git a/manifests/role/web.pp b/manifests/role/web.pp index 4b58ca9..954d391 100644 --- a/manifests/role/web.pp +++ b/manifests/role/web.pp @@ -1,4 +1,4 @@ -class nodo::role::web inherits nodo::vserver { +class nodo::role::web inherits nodo::base::vserver { # Hidden services $hidden = hiera('apache::site::hidden', false) if $hidden == true { diff --git a/manifests/role/webdev/desktop.pp b/manifests/role/webdev/desktop.pp index 063140a..017a339 100644 --- a/manifests/role/webdev/desktop.pp +++ b/manifests/role/webdev/desktop.pp @@ -1,3 +1,3 @@ -class nodo::role::webdev::desktop inherits nodo::desktop { +class nodo::role::webdev::desktop inherits nodo::base::desktop { include nodo::role::webdev } diff --git a/manifests/role/webdev/laptop.pp b/manifests/role/webdev/laptop.pp index e9c1aab..a33a508 100644 --- a/manifests/role/webdev/laptop.pp +++ b/manifests/role/webdev/laptop.pp @@ -1,3 +1,3 @@ -class nodo::role::webdev::laptop inherits nodo::laptop { +class nodo::role::webdev::laptop inherits nodo::base::laptop { include nodo::role::webdev } diff --git a/manifests/role/yacy.pp b/manifests/role/yacy.pp index 379297c..dc3480e 100644 --- a/manifests/role/yacy.pp +++ b/manifests/role/yacy.pp @@ -1,4 +1,4 @@ -class nodo::role::yacy inherits nodo::vserver { +class nodo::role::yacy inherits nodo::base::vserver { class { 'onion': } package { 'yacy': |