minor naming fixes

diff --git a/modules/roles/manifests/ftp_master.pp b/modules/roles/manifests/ftp_master.pp
index f8d6f87..10b5bb6 100644 (file)
--- a/modules/roles/manifests/ftp_master.pp
+++ b/modules/roles/manifests/ftp_master.pp
@@ -13,9 +13,9 @@ class roles::ftp_master {
   }
 
   # export ssh allow rules for hosts that we should be able to access
-  @@ferm::rule::simple { "dsa-ssh-from-syncproxy-${::fqdn}":
-    tag         => 'ssh::server::allow::ftp-master',
-    description => 'Allow ssh access from ftp-master',
+  @@ferm::rule::simple { "dsa-ssh-from-ftp_master-${::fqdn}":
+    tag         => 'ssh::server::allow::ftp_master',
+    description => 'Allow ssh access from ftp_master',
     port        => '22',
     saddr       => $base::public_addresses,
   }

diff --git a/modules/roles/manifests/ports_master.pp b/modules/roles/manifests/ports_master.pp
index 31c6503..5dc609d 100644 (file)
--- a/modules/roles/manifests/ports_master.pp
+++ b/modules/roles/manifests/ports_master.pp
@@ -20,8 +20,8 @@ class roles::ports_master {
   }
 
   # export ssh allow rules for hosts that we should be able to access
-  @@ferm::rule::simple { "dsa-ssh-from-syncproxy-${::fqdn}":
-    tag         => 'ssh::server::allow::ports-master',
+  @@ferm::rule::simple { "dsa-ssh-from-ports_master-${::fqdn}":
+    tag         => 'ssh::server::allow::ports_master',
     description => 'Allow ssh access from ports-master',
     port        => '22',
     saddr       => $base::public_addresses,

diff --git a/modules/roles/manifests/security_master.pp b/modules/roles/manifests/security_master.pp
index 6f92d33..702e2e2 100644 (file)
--- a/modules/roles/manifests/security_master.pp
+++ b/modules/roles/manifests/security_master.pp
@@ -13,9 +13,9 @@ class roles::security_master {
   }
 
   # export ssh allow rules for hosts that we should be able to access
-  @@ferm::rule::simple { "dsa-ssh-from-syncproxy-${::fqdn}":
-    tag         => 'ssh::server::allow::security-master',
-    description => 'Allow ssh access from security-master',
+  @@ferm::rule::simple { "dsa-ssh-from-security_master-${::fqdn}":
+    tag         => 'ssh::server::allow::security_master',
+    description => 'Allow ssh access from security_master',
     port        => '22',
     saddr       => $base::public_addresses,
   }

diff --git a/modules/roles/manifests/syncproxy.pp b/modules/roles/manifests/syncproxy.pp
index 26e1c5a..623393f 100644 (file)
--- a/modules/roles/manifests/syncproxy.pp
+++ b/modules/roles/manifests/syncproxy.pp
@@ -78,8 +78,8 @@ class roles::syncproxy {
   # syncproxies should be accessible from various role hosts
   Ferm::Rule::Simple <<|
     tag == 'ssh::server::allow::archvsync' or
-    tag == 'ssh::server::allow::ftp-master' or
-    tag == 'ssh::server::allow::ports-master' or
-    tag == 'ssh::server::allow::security-master'
+    tag == 'ssh::server::allow::ftp_master' or
+    tag == 'ssh::server::allow::ports_master' or
+    tag == 'ssh::server::allow::security_master'
     |>>
 }