Faidon Liambotis has submitted this change and it was merged.
Change subject: webserver: remove broken docroot logic
......................................................................
webserver: remove broken docroot logic
The current webserver::apache::site logic is broken, as it tried to
reassign to the $docroot variable and this is, unfortunately, disallowed
in puppet.
As it's clearly not a used functionality, and since Apache throws
warnings if a directory doesn't exist, remove the whole piece of code
and let vhosts that e.g. don't need a document root (because, for
example, contain just a simple redirect) to work with a simpler config.
Debian defaults to /var/www in this case, and policy dictates that no
packages will ever write useful files there.
Change-Id: I64ee6d8939b8ca56abd21bad7c76c9684cc54812
---
M manifests/webserver.pp
M templates/apache/generic_vhost.erb
2 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/webserver.pp b/manifests/webserver.pp
index 426db44..4361f3e 100644
--- a/manifests/webserver.pp
+++ b/manifests/webserver.pp
@@ -312,11 +312,6 @@
Class[webserver::apache::packages] ->
Webserver::Apache::Site["$title"] -> Class[webserver::apache::service]
- if ! $docroot {
- $subdir =
inline_template("scope.lookupvar('webserver::apache::site::title').strip.split.reverse.join('/')")
- $docroot = "/srv/$subdir"
- }
-
if "$ssl" in ["true", "only", "redirected"] {
webserver::apache::module { ssl: }
diff --git a/templates/apache/generic_vhost.erb
b/templates/apache/generic_vhost.erb
index 2c66ff6..215d31e 100644
--- a/templates/apache/generic_vhost.erb
+++ b/templates/apache/generic_vhost.erb
@@ -8,6 +8,7 @@
<% end -%>
ServerAdmin <%= server_admin %>
+<% if docroot -%>
DocumentRoot <%= docroot %>
<Directory <%= docroot %>>
Options Indexes FollowSymLinks MultiViews
@@ -15,6 +16,8 @@
Order allow,deny
allow from all
</Directory>
+<% end -%>
+
ErrorLog <%= error_log %>
# Possible values include: debug, info, notice, warn, error, crit,
@@ -62,6 +65,7 @@
SSLCertificateKeyFile <%= certkey %>
SSLCACertificatePath /etc/ssl/certs
+<% if docroot -%>
DocumentRoot <%= docroot %>
<Directory <%= docroot %>>
Options Indexes FollowSymLinks MultiViews
@@ -69,6 +73,7 @@
Order allow,deny
allow from all
</Directory>
+<% end -%>
ErrorLog <%= error_log %>
# Possible values include: debug, info, notice, warn, error, crit,
--
To view, visit https://gerrit.wikimedia.org/r/106722
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I64ee6d8939b8ca56abd21bad7c76c9684cc54812
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
