From e83e2d97e5329921a630f5c18fe54a43772d458b Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Sun, 29 Jan 2017 11:55:31 +0100 Subject: [PATCH] Rename roles::ports-master to roles::ports_master Signed-off-by: Peter Palfrader --- hieradata/common.yaml | 2 +- .../files/{ports-master => ports_master}/rsyncd.conf | 0 .../roles/manifests/{ports-master.pp => ports_master.pp} | 8 ++++---- 3 files changed, 5 insertions(+), 5 deletions(-) rename modules/roles/files/{ports-master => ports_master}/rsyncd.conf (100%) rename modules/roles/manifests/{ports-master.pp => ports_master.pp} (82%) diff --git a/hieradata/common.yaml b/hieradata/common.yaml index 8b9c06ef9..42d9045dd 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -242,7 +242,7 @@ roles: - delfin.debian.org pet.d.n: - petrova.debian.org - ports-master: + ports_master: - porta.debian.org onionbalance: - olin.debian.org diff --git a/modules/roles/files/ports-master/rsyncd.conf b/modules/roles/files/ports_master/rsyncd.conf similarity index 100% rename from modules/roles/files/ports-master/rsyncd.conf rename to modules/roles/files/ports_master/rsyncd.conf diff --git a/modules/roles/manifests/ports-master.pp b/modules/roles/manifests/ports_master.pp similarity index 82% rename from modules/roles/manifests/ports-master.pp rename to modules/roles/manifests/ports_master.pp index 9efae9547..6bc184d48 100644 --- a/modules/roles/manifests/ports-master.pp +++ b/modules/roles/manifests/ports_master.pp @@ -1,8 +1,8 @@ -class roles::ports-master { +class roles::ports_master { rsync::site { 'ports-master': - source => 'puppet:///modules/roles/ports-master/rsyncd.conf', - max_clients => 100, - sslname => 'ports-master.debian.org', + source => 'puppet:///modules/roles/ports_master/rsyncd.conf', + max_clients => 100, + sslname => 'ports-master.debian.org', } ssl::service { 'ports-master.debian.org': -- 2.20.1