From 836eff39ec561176cd00cc2d7b4e66e9668a25ee Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Fri, 10 Feb 2017 21:50:55 +0100 Subject: [PATCH] Move archvsync_base from FTP to debian_mirror --- modules/roles/manifests/debian_mirror.pp | 2 ++ modules/roles/manifests/ftp.pp | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/roles/manifests/debian_mirror.pp b/modules/roles/manifests/debian_mirror.pp index 81afa7269..edf30a1dd 100644 --- a/modules/roles/manifests/debian_mirror.pp +++ b/modules/roles/manifests/debian_mirror.pp @@ -1,4 +1,6 @@ class roles::debian_mirror { + include roles::archvsync_base + $vhost_listen = $::hostname ? { klecker => '130.89.148.12:80 2001:610:1908:b000::148:12:80', mirror-isc => '149.20.4.15:80 [2001:4f8:1:c::15]:80', diff --git a/modules/roles/manifests/ftp.pp b/modules/roles/manifests/ftp.pp index a7870cb28..bdb9f4b64 100644 --- a/modules/roles/manifests/ftp.pp +++ b/modules/roles/manifests/ftp.pp @@ -1,7 +1,6 @@ class roles::ftp { # this is the FTP part of the roles::debian_mirror class - include roles::archvsync_base include ferm::ftp_conntrack $bind = $::hostname ? { -- 2.20.1