Dzahn has submitted this change and it was merged.
Change subject: do not remove the Apache 000-default page in here because that
is already done in webserver.pp and causes a duplicate definition
......................................................................
do not remove the Apache 000-default page in here because that is
already done in webserver.pp and causes a duplicate definition
Change-Id: I971a30e0ea277d306e1aedeed1592ca9cc368ba2
---
M manifests/misc/etherpad.pp
1 file changed, 0 insertions(+), 4 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/misc/etherpad.pp b/manifests/misc/etherpad.pp
index 91bae7b..5cb6069 100644
--- a/manifests/misc/etherpad.pp
+++ b/manifests/misc/etherpad.pp
@@ -101,10 +101,6 @@
group => 'root',
mode => 0444,
content => template('etherpad_lite/settings.json.erb');
- '/etc/apache2/sites-enabled/000-default':
- notify => Service["apache2"],
- require => Package["apache2"],
- ensure => absent;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/73315
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I971a30e0ea277d306e1aedeed1592ca9cc368ba2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
