Tim Landscheidt has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/328467 )
Change subject: [WIP] aptly: Make aptly work with Apache
......................................................................
[WIP] aptly: Make aptly work with Apache
Currently aptly (only) installs an nginx server. This is inconvenient
for instances where there is already an Apache server in use, for
example as a standalone puppetmaster. This change adds a parameter
$manage_apache that enables support for Apache servers.
Bug: T153814
Change-Id: I3f638c6837675e41bc7966ab293cc2ffd48aaa70
---
M modules/aptly/manifests/init.pp
1 file changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/67/328467/1
diff --git a/modules/aptly/manifests/init.pp b/modules/aptly/manifests/init.pp
index 79d2687..b0a9680 100644
--- a/modules/aptly/manifests/init.pp
+++ b/modules/aptly/manifests/init.pp
@@ -3,6 +3,7 @@
#
# Set up to only allow root to add packages
class aptly(
+ $manage_apache=false,
$manage_nginx=true,
$owner='root',
$group='root',
@@ -25,6 +26,13 @@
mode => '0444',
}
+ if $manage_apache {
+ apache::static_site { 'aptly-server':
+ servername => $::fqdn,
+ docroot => '/srv/packages/public',
+ }
+ }
+
if $manage_nginx {
nginx::site { 'aptly-server':
source => 'puppet:///modules/aptly/aptly.nginx.conf',
--
To view, visit https://gerrit.wikimedia.org/r/328467
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f638c6837675e41bc7966ab293cc2ffd48aaa70
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt <t...@tim-landscheidt.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
