Ori.livneh has submitted this change and it was merged.
Change subject: Ensure default site is disabled before running setup
......................................................................
Ensure default site is disabled before running setup
Change-Id: Ibc9bd3d6791738532e8bb7a59ec374680b374edf
---
M puppet/modules/mediawiki/manifests/init.pp
1 file changed, 6 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/puppet/modules/mediawiki/manifests/init.pp
b/puppet/modules/mediawiki/manifests/init.pp
index 6b2e9fe..d7241bb 100644
--- a/puppet/modules/mediawiki/manifests/init.pp
+++ b/puppet/modules/mediawiki/manifests/init.pp
@@ -23,6 +23,12 @@
ensure => absent,
}
+ file { '/etc/apache2/sites-enabled/000-default':
+ ensure => absent,
+ require => Package['apache2'],
+ before => Exec['mediawiki-setup'],
+ }
+
# If an auto-generated LocalSettings.php file exists but the database it
# refers to is missing, assume it is residual of a discarded instance
and
# delete it.
--
To view, visit https://gerrit.wikimedia.org/r/57714
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibc9bd3d6791738532e8bb7a59ec374680b374edf
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
