]> gitweb.fluxo.info Git - puppet-firewall.git/commitdiff
projects / puppet-firewall.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 279c521)
Use firewall::virtual class names
authorSilvio Rhatto <rhatto@riseup.net>
Sat, 12 Sep 2015 00:56:50 +0000 (21:56 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Sat, 12 Sep 2015 00:56:50 +0000 (21:56 -0300)
16 files changed:
manifests/virtual/dns.pp [moved from manifests/vm/dns.pp with 96% similarity] patch | blob | history
manifests/virtual/gitd.pp [moved from manifests/vm/gitd.pp with 91% similarity] patch | blob | history
manifests/virtual/gobby.pp [moved from manifests/vm/gobby.pp with 81% similarity] patch | blob | history
manifests/virtual/http.pp [moved from manifests/vm/http.pp with 90% similarity] patch | blob | history
manifests/virtual/https.pp [moved from manifests/vm/https.pp with 91% similarity] patch | blob | history
manifests/virtual/icecast.pp [moved from manifests/vm/icecast.pp with 90% similarity] patch | blob | history
manifests/virtual/jabber.pp [moved from manifests/vm/jabber.pp with 96% similarity] patch | blob | history
manifests/virtual/mail.pp [moved from manifests/vm/mail.pp with 96% similarity] patch | blob | history
manifests/virtual/mdns.pp [moved from manifests/vm/mdns.pp with 81% similarity] patch | blob | history
manifests/virtual/mumble.pp [moved from manifests/vm/mumble.pp with 90% similarity] patch | blob | history
manifests/virtual/munin.pp [moved from manifests/vm/munin.pp with 88% similarity] patch | blob | history
manifests/virtual/puppetmaster.pp [moved from manifests/vm/puppetmaster.pp with 95% similarity] patch | blob | history
manifests/virtual/rsync.pp [moved from manifests/vm/rsync.pp with 81% similarity] patch | blob | history
manifests/virtual/ssh.pp [moved from manifests/vm/ssh.pp with 89% similarity] patch | blob | history
manifests/virtual/tor.pp [moved from manifests/vm/tor.pp with 95% similarity] patch | blob | history
manifests/virtual/yacy.pp [moved from manifests/vm/yacy.pp with 81% similarity] patch | blob | history

diff --git a/manifests/vm/dns.pp b/manifests/virtual/dns.pp
similarity index 96%
rename from manifests/vm/dns.pp
rename to manifests/virtual/dns.pp
index a273bcca0032152681f42439d423d647e43f3c80..f3899294035c5e46ab62116529a7f3416fd9eab9 100644 (file)
--- a/manifests/vm/dns.pp
+++ b/manifests/virtual/dns.pp
@@ -1,4 +1,4 @@
-class firewall::vm::dns($destination, $zone = 'vm') {
+class firewall::virtual::dns($destination, $zone = 'vm') {
   shorewall::rule { 'dns-route-0':
     action          => 'DNS/ACCEPT',
     source          => 'net',
diff --git a/manifests/vm/gitd.pp b/manifests/virtual/gitd.pp
similarity index 91%
rename from manifests/vm/gitd.pp
rename to manifests/virtual/gitd.pp
index 8c497dbbd20f61756a674bca9ee29b130f00ec63..23095aa74d1f08ca4d113cac59297f78b061d5e8 100644 (file)
--- a/manifests/vm/gitd.pp
+++ b/manifests/virtual/gitd.pp
@@ -1,4 +1,4 @@
-class firewall::vm::gitd($destination, $zone = 'fw') {
+class firewall::virtual::gitd($destination, $zone = 'fw') {
   shorewall::rule { 'git-daemon-1':
     action          => 'DNAT',
     source          => 'net',
diff --git a/manifests/vm/gobby.pp b/manifests/virtual/gobby.pp
similarity index 81%
rename from manifests/vm/gobby.pp
rename to manifests/virtual/gobby.pp
index 3b113c53d1d927ff9849c95a38a1d02344e3e8b7..5554a1103511786e9d6e913bb50fcf3203ae2b71 100644 (file)
--- a/manifests/vm/gobby.pp
+++ b/manifests/virtual/gobby.pp
@@ -1,4 +1,4 @@
-class firewall::vm::gobby($destination, $zone = 'fw') {
+class firewall::virtual::gobby($destination, $zone = 'fw') {
   shorewall::rule { 'gobby-0':
     action          => 'DNAT',
     source          => 'net',
diff --git a/manifests/vm/http.pp b/manifests/virtual/http.pp
similarity index 90%
rename from manifests/vm/http.pp
rename to manifests/virtual/http.pp
index 404d82fd813a29882d226febf9d85e60a554042b..b1e7faa1f48cbc563cc8db343545638d8bd1fe8e 100644 (file)
--- a/manifests/vm/http.pp
+++ b/manifests/virtual/http.pp
@@ -1,4 +1,4 @@
-class firewall::vm::http($destination, $zone = 'vm') {
+class firewall::virtual::http($destination, $zone = 'vm') {
   shorewall::rule { 'http-route-1':
     action          => 'DNAT',
     source          => 'net',
diff --git a/manifests/vm/https.pp b/manifests/virtual/https.pp
similarity index 91%
rename from manifests/vm/https.pp
rename to manifests/virtual/https.pp
index 047ff66b0bb78e22e6139933163cc6178296a451..ea900d86073561cb623ea80a1dd4022a7fcb8279 100644 (file)
--- a/manifests/vm/https.pp
+++ b/manifests/virtual/https.pp
@@ -1,4 +1,4 @@
-class firewall::vm::https($destination, $zone = 'vm') {
+class firewall::virtual::https($destination, $zone = 'vm') {
   shorewall::rule { 'https-route-1':
     action          => 'DNAT',
     source          => 'net',
diff --git a/manifests/vm/icecast.pp b/manifests/virtual/icecast.pp
similarity index 90%
rename from manifests/vm/icecast.pp
rename to manifests/virtual/icecast.pp
index b7bc2fe92f53e6620684b145e55c4d8abdde98e8..1681f1843b6e583327fb12f6c984ddd14ab8c61f 100644 (file)
--- a/manifests/vm/icecast.pp
+++ b/manifests/virtual/icecast.pp
@@ -1,4 +1,4 @@
-class firewall::vm::icecast($destination, $zone = 'fw') {
+class firewall::virtual::icecast($destination, $zone = 'fw') {
   shorewall::rule { 'icecast-1':
     action          => 'DNAT',
     source          => 'net',
diff --git a/manifests/vm/jabber.pp b/manifests/virtual/jabber.pp
similarity index 96%
rename from manifests/vm/jabber.pp
rename to manifests/virtual/jabber.pp
index db26d6be64e5e17624b1627a67b17f9497d789c1..0bba4e9d8845f95da45c1cb1978c00c793b31324 100644 (file)
--- a/manifests/vm/jabber.pp
+++ b/manifests/virtual/jabber.pp
@@ -1,4 +1,4 @@
-class firewall::vm::jabber($destination, $zone = 'fw') {
+class firewall::virtual::jabber($destination, $zone = 'fw') {
   shorewall::rule { 'jabber-0':
     action          => 'DNAT',
     source          => 'net',
diff --git a/manifests/vm/mail.pp b/manifests/virtual/mail.pp
similarity index 96%
rename from manifests/vm/mail.pp
rename to manifests/virtual/mail.pp
index f6298655c821b7e4e104bdac5c37f26fc6e3b982..83589cea3e108ed4ab852c7bdfc1b0a3cd222455 100644 (file)
--- a/manifests/vm/mail.pp
+++ b/manifests/virtual/mail.pp
@@ -1,4 +1,4 @@
-class firewall::vm::mail($destination, $zone = 'fw') {
+class firewall::virtual::mail($destination, $zone = 'fw') {
   shorewall::rule { 'mail-1':
     action          => 'DNAT',
     source          => 'net',
diff --git a/manifests/vm/mdns.pp b/manifests/virtual/mdns.pp
similarity index 81%
rename from manifests/vm/mdns.pp
rename to manifests/virtual/mdns.pp
index 644c8894edf37d41078bc16a9b573b92769b4c1b..db8ec253121b5da8aedce770b36d296416e8e8d3 100644 (file)
--- a/manifests/vm/mdns.pp
+++ b/manifests/virtual/mdns.pp
@@ -1,4 +1,4 @@
-class firewall::vm::mdns($destination, $zone = 'fw') {
+class firewall::virtual::mdns($destination, $zone = 'fw') {
   shorewall::rule { 'mdns-0':
     action          => 'DNAT',
     source          => 'net',
diff --git a/manifests/vm/mumble.pp b/manifests/virtual/mumble.pp
similarity index 90%
rename from manifests/vm/mumble.pp
rename to manifests/virtual/mumble.pp
index 321ab07b933d9162b2a7cc256fca9809e9d2bf59..45ab393def20c5a1c497dd0f2e13631560476d9e 100644 (file)
--- a/manifests/vm/mumble.pp
+++ b/manifests/virtual/mumble.pp
@@ -1,4 +1,4 @@
-class firewall::vm::mumble($destination, $zone = 'fw') {
+class firewall::virtual::mumble($destination, $zone = 'fw') {
   shorewall::rule { 'mumble-0':
     action          => 'DNAT',
     source          => 'net',
diff --git a/manifests/vm/munin.pp b/manifests/virtual/munin.pp
similarity index 88%
rename from manifests/vm/munin.pp
rename to manifests/virtual/munin.pp
index e92e21618eddb8302bdbf70c1d89f3c1cd6d17d9..b8bfce18b6c1fe3b6082e252c31cf62f7e3863c4 100644 (file)
--- a/manifests/vm/munin.pp
+++ b/manifests/virtual/munin.pp
@@ -1,4 +1,4 @@
-define firewall::vm::munin($destination, $port_orig, $port_dest = '', $order = '400', $zone = 'fw') {
+define firewall::virtual::munin($destination, $port_orig, $port_dest = '', $order = '400', $zone = 'fw') {
   shorewall::rule { "munin-$name-1":
     action          => 'DNAT',
     source          => 'net',
diff --git a/manifests/vm/puppetmaster.pp b/manifests/virtual/puppetmaster.pp
similarity index 95%
rename from manifests/vm/puppetmaster.pp
rename to manifests/virtual/puppetmaster.pp
index a097d778c62652d17b3763fa4eb57cc8a6068ec3..e54c16615b5268a4780a6b72b86e8d44fec3124d 100644 (file)
--- a/manifests/vm/puppetmaster.pp
+++ b/manifests/virtual/puppetmaster.pp
@@ -1,4 +1,4 @@
-class firewall::vm::puppetmaster($destination, $puppetmaster_port = '8140', $puppetmaster_nonssl_port = '8141', $zone = 'fw') {
+class firewall::virtual::puppetmaster($destination, $puppetmaster_port = '8140', $puppetmaster_nonssl_port = '8141', $zone = 'fw') {
   shorewall::rule { 'puppetmaster-1':
     action          => 'DNAT',
     source          => 'net',
diff --git a/manifests/vm/rsync.pp b/manifests/virtual/rsync.pp
similarity index 81%
rename from manifests/vm/rsync.pp
rename to manifests/virtual/rsync.pp
index 6ee9c9886665afc815683169680dbc09aeee5c37..50df46c9b4b0abb96251406d1b5eddd9330ce2cc 100644 (file)
--- a/manifests/vm/rsync.pp
+++ b/manifests/virtual/rsync.pp
@@ -1,4 +1,4 @@
-class firewall::vm::rsync($destination, $zone = 'fw') {
+class firewall::virtual::rsync($destination, $zone = 'fw') {
   shorewall::rule { 'rsync-0':
     action          => 'DNAT',
     source          => 'net',
diff --git a/manifests/vm/ssh.pp b/manifests/virtual/ssh.pp
similarity index 89%
rename from manifests/vm/ssh.pp
rename to manifests/virtual/ssh.pp
index f9586daacb9721bc451d6ea653f6581f0be96c2a..4832b58004a7c2f63405753973847eb530c1dcf6 100644 (file)
--- a/manifests/vm/ssh.pp
+++ b/manifests/virtual/ssh.pp
@@ -1,4 +1,4 @@
-define firewall::vm::ssh($destination, $port_orig = '22', $port_dest = '', $zone = 'vm') {
+define firewall::virtual::ssh($destination, $port_orig = '22', $port_dest = '', $zone = 'vm') {
   shorewall::rule { "ssh-$name-1":
     action          => 'DNAT',
     source          => 'net',
diff --git a/manifests/vm/tor.pp b/manifests/virtual/tor.pp
similarity index 95%
rename from manifests/vm/tor.pp
rename to manifests/virtual/tor.pp
index cd8820a57732ceeaacb0a288609e41c42db38de9..4d336c6ab47526ea2e48e80e9891f1e771c282b6 100644 (file)
--- a/manifests/vm/tor.pp
+++ b/manifests/virtual/tor.pp
@@ -1,4 +1,4 @@
-class firewall::vm::tor($destination, $zone = 'fw') {
+class firewall::virtual::tor($destination, $zone = 'fw') {
   shorewall::rule { 'tor-0':
     action          => 'DNAT',
     source          => 'net',
diff --git a/manifests/vm/yacy.pp b/manifests/virtual/yacy.pp
similarity index 81%
rename from manifests/vm/yacy.pp
rename to manifests/virtual/yacy.pp
index 0ddbf4b106ea0bb7d7b6bec4c7ba260bbff62627..173ba13da08d0efbaf137450b19a4f28d9e46089 100644 (file)
--- a/manifests/vm/yacy.pp
+++ b/manifests/virtual/yacy.pp
@@ -1,4 +1,4 @@
-class firewall::vm::yacy($destination, $zone = 'fw') {
+class firewall::virtual::yacy($destination, $zone = 'fw') {
   shorewall::rule { 'yacy-0':
     action          => 'DNAT',
     source          => 'net',
Puppet module for firewall