Andrew Bogott has submitted this change and it was merged.
Change subject: mediawiki_singlenode: port apache::vhost to apache::site
......................................................................
mediawiki_singlenode: port apache::vhost to apache::site
* Keep the same template and get rid of some indirection (that is, rather than
pass $install_path to apache::vhost as $docroot, just reference $install_path
in the template, which is local to the module anyhow.
* Don't declare File['/etc/apache2/sites-enabled/wiki'] just to ensure =>
absent it, since the directory is managed recursively by Puppet anyhow.
Change-Id: I47f8f62034b306acb010fe1f544c3faffbe8d02d
---
M modules/mediawiki_singlenode/manifests/init.pp
M modules/mediawiki_singlenode/templates/mediawiki_singlenode.erb
2 files changed, 10 insertions(+), 17 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/mediawiki_singlenode/manifests/init.pp
b/modules/mediawiki_singlenode/manifests/init.pp
index 30513df..e8d137c 100644
--- a/modules/mediawiki_singlenode/manifests/init.pp
+++ b/modules/mediawiki_singlenode/manifests/init.pp
@@ -111,20 +111,13 @@
Mw-extension <| |> -> Exec['mediawiki_update']
- file { '/etc/apache2/sites-enabled/wiki':
- ensure => absent
- }
- include apache::mod::php5
- apache::vhost{ 'wikicontroller':
- port => '80',
- priority => '000',
- vhost_name => 'wiki',
- docroot => $install_path,
- template => $apache_site_template
- }
-
+ include ::apache::mod::php5
include ::apache::mod::rewrite
+ apache::site { 'wikicontroller':
+ content => template($apache_site_template),
+ }
+
file { "${install_path}/cache":
require => Exec['mediawiki_setup'],
mode => '0775',
diff --git a/modules/mediawiki_singlenode/templates/mediawiki_singlenode.erb
b/modules/mediawiki_singlenode/templates/mediawiki_singlenode.erb
index b2a753d..193e550 100644
--- a/modules/mediawiki_singlenode/templates/mediawiki_singlenode.erb
+++ b/modules/mediawiki_singlenode/templates/mediawiki_singlenode.erb
@@ -1,7 +1,7 @@
<VirtualHost *:80>
ServerAdmin
"https://wikitech.wikimedia.org/wiki/Help:Single_Node_MediaWiki";
- DocumentRoot <%=@docroot%>
+ DocumentRoot <%= @install_path %>
<Directory />
Options FollowSymLinks
@@ -11,7 +11,7 @@
</IfVersion>
</Directory>
- <Directory <%=@docroot%>>
+ <Directory <%= @install_path %>>
Options Indexes FollowSymLinks MultiViews
AllowOverride None
<IfVersion >= 2.4>
@@ -23,7 +23,7 @@
</IfVersion>
</Directory>
- <Directory <%= @docroot %>/orig>
+ <Directory <%= @install_path %>/orig>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
@@ -35,8 +35,8 @@
RewriteEngine On
RewriteRule ^/$ /w/index.php [R=301]
- Alias /wiki "<%= @docroot %>/index.php"
- Alias /w "<%= @docroot %>"
+ Alias /wiki "<%= @install_path %>/index.php"
+ Alias /w "<%= @install_path %>"
ErrorLog /var/log/apache2/error.log
--
To view, visit https://gerrit.wikimedia.org/r/142206
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I47f8f62034b306acb010fe1f544c3faffbe8d02d
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
