Renaming base classes

diff --git a/manifests/appliance.pp b/manifests/base/appliance.pp
similarity index 69%
rename from manifests/appliance.pp
rename to manifests/base/appliance.pp
index dea762524bd216b6110a9846645dbbfef3dd5c89..73d95f5e9ee7e37b2ff618b7b9ff736e57da6075 100644 (file)
--- 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
similarity index 69%
rename from manifests/desktop.pp
rename to manifests/base/desktop.pp
index 7e8373298eb031a53e899ed51f3a40f985898f62..bf9d2fe89847e16a971b1d24ce2df178f1e56e4a 100644 (file)
--- 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
similarity index 97%
rename from manifests/host.pp
rename to manifests/base/host.pp
index ee87e2f19eda5ecae45e56dbaea00cc37a627832..f57aeb46c1ccaa4cb9baaac5f2e97cd5a522589a 100644 (file)
--- 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
similarity index 65%
rename from manifests/kvm.pp
rename to manifests/base/kvm.pp
index 11f3dde56c87e04ab55efea2fa4e9e38dc830d3c..06a7d1009f6271f66fa30837e2373616122bfb6b 100644 (file)
--- 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
similarity index 92%
rename from manifests/laptop.pp
rename to manifests/base/laptop.pp
index 1ed77b7d3379f6eeb325d74526f463d0fa1783e3..dbafda7b7cae461915d2815bb52463d0799a7792 100644 (file)
--- 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
similarity index 96%
rename from manifests/personal.pp
rename to manifests/base/personal.pp
index 90f36aea310f5fa811abfb2e08789ead4739c8a0..5aa28ad7b358d8dc917215156a79617301fc01e4 100644 (file)
--- 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
similarity index 89%
rename from manifests/physical.pp
rename to manifests/base/physical.pp
index c2d451d61cba72f97d5b5df034897c74dcf439e2..e01bfb2f1505a4ee05202e076d4edacb78cb9822 100644 (file)
--- 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
similarity index 94%
rename from manifests/plug.pp
rename to manifests/base/plug.pp
index 858ba0a2edd0dbc24888a3cc53f59022ef580d58..17ce366f896c242eb12e21692cdb021131be80bb 100644 (file)
--- 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
similarity index 75%
rename from manifests/removable.pp
rename to manifests/base/removable.pp
index 16f0157c6371779d121b62e08f4827078d79af86..d13b5ee2d1d4b663f4d5d484b2316acdfe6e3770 100644 (file)
--- 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
similarity index 62%
rename from manifests/server.pp
rename to manifests/base/server.pp
index 6606a49d69498c28559b2353d659119848f5acad..93cce4c9c3feaae18b5ea2acbd61d3405c0639a1 100644 (file)
--- 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
similarity index 97%
rename from manifests/vserver.pp
rename to manifests/base/vserver.pp
index 030803f90c58a29403c7998e6377adf8660526c3..433be5a525b0b62e2ff4ce93f66edade83f70512 100644 (file)
--- 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 7e957bafb2a9047ca65b14f52a7f110e8042081b..e1e7e089be78eaa777f29ad010ebcf013de8cecc 100644 (file)
--- 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 164b2f37b970d0b89931dc76e2ab0c1b1bf7860d..73e7b0f7f328049fe21144a022fa95951aa3b687 100644 (file)
--- 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 a4390924d0d1d09a28253c07b9fa5cb565c7804f..52e1d50945266cb59c64906b765f3a7e2ec9298d 100644 (file)
--- 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 b510ccd0d535f664cd5962d163fb1b3d938d6f3b..93036837dd354211a137d42bb5bb3e8e43cd874b 100644 (file)
--- 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 71f4fa712e6024691faeb0ae198e8d6233f4a823..31d046dfdf275e6a717df9eb74d64d3eae4fc44a 100644 (file)
--- 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 0f9d407979ddfd2a5d697ee9923ed53499d406b7..a324718b1b40d892b330a33b091ba156471bdb36 100644 (file)
--- 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 4c33ed48124532f7f72b64d313b25fae1a9a876f..255588acf3dabf0d6bc0c2331385ec793bfdd7ab 100644 (file)
--- 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 2adb8a5a6bd02a8213b7001f2f6fe88b448525ab..804ea789065fc825bbf6dca95b0cae193858b145 100644 (file)
--- 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 764c0d8b7d482bfdd2ada9a4f2e94aadbb61334b..7c7c0a280794685598b5e1bb4efacba2a9327d3e 100644 (file)
--- 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 4afb8aad17c404ddf226bdf5429c402e7231d5b7..a092719db0a9cb3254ad6c5a252fd33cf788b161 100644 (file)
--- 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 821e9756eae1816d062530c4d6633d6ffba2f514..7852bef9a2d46fc1b8ca13db70b8f52865e41abc 100644 (file)
--- 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 068837d753bfb661d2278cad33c7ceaa01227785..9d04813dc827c2c35f3c531bdab7b2e55d17e69d 100644 (file)
--- 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 9eac72c4ddb4da61742925117fab47418b4c4d17..9bb95b2ef847607c0b279eedfdcdb8662d590730 100644 (file)
--- 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 0cf7f607c9b863a02f19fafdec0893c3fc389ad0..144c36758c0de2751545bf8b5f9f4e036b69d14f 100644 (file)
--- 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 330a5ee966204bb8ca9220734f3cfa4db0c554f4..035d42c09474712d4f288fa692b0b37c1887d29c 100644 (file)
--- 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 2d5ff586b57d438ec096aeb8192395bfea3e3bd7..35da3b56f4373f05dc84a2cd70f509a53788e2fd 100644 (file)
--- 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 55a754d0499d4fbb4e72751795e887651beaf8d7..0d8a3643702e7135952a8feaea6508699e0f7795 100644 (file)
--- 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 4b58ca9f1f9c7e7e06aa33acabc013ea331004be..954d391484ff2bb3dac643ec3d99fe409cd4943c 100644 (file)
--- 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 063140ac183d0e15eb0c9fa0f2675f996341a845..017a33945347cc7755d78d0740d791a854142642 100644 (file)
--- 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 e9c1aab69d8f1a4e0beae4cf7694c085b0808068..a33a508f2e58481c4b8441355deb436651d897b7 100644 (file)
--- 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 379297cc62c92b9bca27847e9c3b919c81320e2b..dc3480e77278bbb1eb694d069116f534dfb8de40 100644 (file)
--- 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':