summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-07-30 23:07:42 +0200
committervarac <varacanero@zeromail.org>2013-07-30 23:07:42 +0200
commite796aac43aa9781069e167459253d040504c2092 (patch)
treea6dde565987e9a5a1063023c6fb614aa76b4f462
parenta36bdb923c9074fa3a1d6af373f1b2f690293b5b (diff)
Revert "moved mirror-dstdomain.acl.d/20-custom deploy from server to client, updated readme"
This reverts commit a36bdb923c9074fa3a1d6af373f1b2f690293b5b.
-rw-r--r--README.md8
-rw-r--r--manifests/client.pp8
-rw-r--r--manifests/server.pp6
3 files changed, 7 insertions, 15 deletions
diff --git a/README.md b/README.md
index cd28a7e..c183c82 100644
--- a/README.md
+++ b/README.md
@@ -5,10 +5,4 @@ Debian Support
==============
* As of 2013-07, squid-deb-proxy just arrived in jessie, so you need to
- configure apt to use jessie.
-
-Issues
-======
-
-* After restarting the squid-deb-proxy service, it won't be announced
- with avahi as a ipv4 service, only on ipv6, until avahi-daemon is restarted.
+ configure apt to use jessie.
diff --git a/manifests/client.pp b/manifests/client.pp
index a247a45..324544c 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -2,12 +2,4 @@ class squid_deb_proxy::client {
package { 'squid-deb-proxy-client':
ensure => installed,
}
-
- file {'/etc/squid-deb-proxy/mirror-dstdomain.acl.d/20-custom':
- source => [ 'puppet:///modules/site_squid_deb_proxy/mirror-dstdomain.acl.d/20-custom',
- 'puppet:///modules/squid_deb_proxy/mirror-dstdomain.acl.d/20-custom' ],
- notify => Service[ 'squid-deb-proxy' ],
- require => Package[ 'squid-deb-proxy' ],
- }
-
}
diff --git a/manifests/server.pp b/manifests/server.pp
index b0148f2..62d41c8 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -9,4 +9,10 @@ class squid_deb_proxy::server {
require => Package[ 'squid-deb-proxy' ],
}
+ file {'/etc/squid-deb-proxy/mirror-dstdomain.acl.d/20-custom':
+ source => [ 'puppet:///modules/site_squid_deb_proxy/mirror-dstdomain.acl.d/20-custom',
+ 'puppet:///modules/squid_deb_proxy/mirror-dstdomain.acl.d/20-custom' ],
+ notify => Service[ 'squid-deb-proxy' ],
+ require => Package[ 'squid-deb-proxy' ],
+ }
}