aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--deployment/mga_buildsystem/manifests/mainnode.pp14
-rw-r--r--manifests/nodes/alamut.pp14
2 files changed, 14 insertions, 14 deletions
diff --git a/deployment/mga_buildsystem/manifests/mainnode.pp b/deployment/mga_buildsystem/manifests/mainnode.pp
index 571b103d..89124bcb 100644
--- a/deployment/mga_buildsystem/manifests/mainnode.pp
+++ b/deployment/mga_buildsystem/manifests/mainnode.pp
@@ -7,20 +7,6 @@ class mga_buildsystem::mainnode {
include buildsystem::repoctl
include buildsystem::pkgsubmit
- # Forward ports to arm1 and arm2 ssh, to access them from outside
- xinetd::port_forward {"forward_arm1":
- target_ip => 'arm1.mageia.org',
- target_port => '22',
- port => '4251',
- proto => 'tcp',
- }
- xinetd::port_forward {"forward_arm2":
- target_ip => 'arm2.mageia.org',
- target_port => '22',
- port => '4252',
- proto => 'tcp',
- }
-
$rpmlint_packages = [ "rpmlint-mageia-policy", "rpmlint-mageia-mga2-policy"]
package { $rpmlint_packages:
ensure => installed,
diff --git a/manifests/nodes/alamut.pp b/manifests/nodes/alamut.pp
index ba7b54f7..344a3206 100644
--- a/manifests/nodes/alamut.pp
+++ b/manifests/nodes/alamut.pp
@@ -120,4 +120,18 @@ node alamut {
vhost => 'treasurer.mageia.org',
vhostdir => '/var/www/vhosts/treasurer.mageia.org',
}
+
+ # Forward ports to arm1 and arm2 ssh, to access them from outside
+ xinetd::port_forward {"forward_arm1":
+ target_ip => 'arm1.mageia.org',
+ target_port => '22',
+ port => '4251',
+ proto => 'tcp',
+ }
+ xinetd::port_forward {"forward_arm2":
+ target_ip => 'arm2.mageia.org',
+ target_port => '22',
+ port => '4252',
+ proto => 'tcp',
+ }
}