aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/base/virtual.pp (renamed from manifests/base/vserver.pp)2
-rw-r--r--manifests/role/nas/virtual.pp5
-rw-r--r--manifests/role/nas/vserver.pp5
-rw-r--r--manifests/role/virtual.pp3
-rw-r--r--manifests/role/vserver.pp3
-rw-r--r--manifests/subsystem/virtual/instance.pp (renamed from manifests/subsystem/vm/instance.pp)36
6 files changed, 27 insertions, 27 deletions
diff --git a/manifests/base/vserver.pp b/manifests/base/virtual.pp
index f904f32..7852d79 100644
--- a/manifests/base/vserver.pp
+++ b/manifests/base/virtual.pp
@@ -1,4 +1,4 @@
-class nodo::base::vserver {
+class nodo::base::virtual {
class { 'ntp::timezone': }
class { 'syslog-ng::vserver': }
diff --git a/manifests/role/nas/virtual.pp b/manifests/role/nas/virtual.pp
new file mode 100644
index 0000000..0beeaff
--- /dev/null
+++ b/manifests/role/nas/virtual.pp
@@ -0,0 +1,5 @@
+class nodo::role::nas::virtual inherits nodo::base::virtual {
+ class { 'nodo::role::nas':
+ virtual => true,
+ }
+}
diff --git a/manifests/role/nas/vserver.pp b/manifests/role/nas/vserver.pp
deleted file mode 100644
index da3786d..0000000
--- a/manifests/role/nas/vserver.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-class nodo::role::nas::vserver inherits nodo::base::vserver {
- class { 'nodo::role::nas':
- virtual => true,
- }
-}
diff --git a/manifests/role/virtual.pp b/manifests/role/virtual.pp
new file mode 100644
index 0000000..bac5cde
--- /dev/null
+++ b/manifests/role/virtual.pp
@@ -0,0 +1,3 @@
+# A general purpose virtual server
+class nodo::role::virtual inherits nodo::base::virtual {
+}
diff --git a/manifests/role/vserver.pp b/manifests/role/vserver.pp
deleted file mode 100644
index 0d8a364..0000000
--- a/manifests/role/vserver.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-# A general purpose vserver
-class nodo::role::vserver inherits nodo::base::vserver {
-}
diff --git a/manifests/subsystem/vm/instance.pp b/manifests/subsystem/virtual/instance.pp
index a7281bf..726752f 100644
--- a/manifests/subsystem/vm/instance.pp
+++ b/manifests/subsystem/virtual/instance.pp
@@ -1,5 +1,5 @@
-# Define a vserver instance
-define nodo::subsystem::vm::instance(
+# Define a virtual server instance
+define nodo::subsystem::virtual::instance(
$context,
$distro = 'jessie',
$ensure = 'running',
@@ -109,13 +109,13 @@ define nodo::subsystem::vm::instance(
# Apply firewall rules just for running vservers
case $ensure {
'running': {
- firewall::vm::ssh { "$name":
+ firewall::virtual::ssh { "$name":
destination => "192.168.0.$context",
port_orig => "22$id",
port_dest => "22",
}
- firewall::vm::munin { "$name":
+ firewall::virtual::munin { "$name":
destination => "192.168.0.$context",
port_orig => "49$id",
port_dest => "49$id",
@@ -123,14 +123,14 @@ define nodo::subsystem::vm::instance(
if $proxy {
class {
- "firewall::vm::http": destination => "192.168.0.$context";
- "firewall::vm::https": destination => "192.168.0.$context";
+ "firewall::virtual::http": destination => "192.168.0.$context";
+ "firewall::virtual::https": destination => "192.168.0.$context";
}
}
if $puppetmaster {
class {
- "firewall::vm::puppetmaster":
+ "firewall::virtual::puppetmaster":
destination => "192.168.0.$context",
puppetmaster_port => $puppetmaster_port,
puppetmaster_nonssl_port => $puppetmaster_nonssl_port,
@@ -139,67 +139,67 @@ define nodo::subsystem::vm::instance(
if $gitd {
class {
- "firewall::vm::gitd": destination => "192.168.0.$context";
+ "firewall::virtual::gitd": destination => "192.168.0.$context";
}
}
if $icecast {
class {
- "firewall::vm::icecast": destination => "192.168.0.$context";
+ "firewall::virtual::icecast": destination => "192.168.0.$context";
}
}
if $mail {
class {
- "firewall::vm::mail": destination => "192.168.0.$context";
+ "firewall::virtual::mail": destination => "192.168.0.$context";
}
}
if $dns {
class {
- "firewall::vm::dns": destination => "192.168.0.$context";
+ "firewall::virtual::dns": destination => "192.168.0.$context";
}
}
if $tor {
class {
- "firewall::vm::tor": destination => "192.168.0.$context";
+ "firewall::virtual::tor": destination => "192.168.0.$context";
}
}
if $jabber {
class {
- "firewall::vm::jabber": destination => "192.168.0.$context";
+ "firewall::virtual::jabber": destination => "192.168.0.$context";
}
}
if $mumble {
class {
- "firewall::vm::mumble": destination => "192.168.0.$context";
+ "firewall::virtual::mumble": destination => "192.168.0.$context";
}
}
if $gobby {
class {
- "firewall::vm::gobby": destination => "192.168.0.$context";
+ "firewall::virtual::gobby": destination => "192.168.0.$context";
}
}
if $yacy {
class {
- "firewall::vm::yacy": destination => "192.168.0.$context";
+ "firewall::virtual::yacy": destination => "192.168.0.$context";
}
}
if $rsync {
class {
- "firewall::vm::rsync": destination => "192.168.0.$context";
+ "firewall::virtual::rsync": destination => "192.168.0.$context";
}
}
if $avahi {
class {
- "firewall::vm::mdns": destination => "192.168.0.$context";
+ "firewall::virtual::mdns": destination => "192.168.0.$context";
}
}
}