Dzahn has submitted this change and it was merged.
Change subject: fix confusing comments about apache sites being in /files while
they are actually .erb templates in /templates
......................................................................
fix confusing comments about apache sites being in /files while
they are actually .erb templates in /templates
Change-Id: Ibbdaa373902da2b013f007e93f5db6bba4cfc2f9
---
M templates/apache/sites/etherpad_lite.wikimedia.org.erb
M templates/apache/sites/gerrit.wikimedia.org.erb
M templates/apache/sites/racktables.wikimedia.org.erb
M templates/apache/sites/smokeping.wikimedia.org.erb
M templates/apache/sites/wikitech.wikimedia.org.erb
5 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/templates/apache/sites/etherpad_lite.wikimedia.org.erb
b/templates/apache/sites/etherpad_lite.wikimedia.org.erb
index c092b3f..5976897 100644
--- a/templates/apache/sites/etherpad_lite.wikimedia.org.erb
+++ b/templates/apache/sites/etherpad_lite.wikimedia.org.erb
@@ -1,6 +1,6 @@
#####################################################################
### THIS FILE IS MANAGED BY PUPPET
-### puppet:///files/apache/sites/labconsole.wikimedia.org
+### puppet:///templates/apache/sites/etherpad_lite.wikimedia.org.erb
#####################################################################
# vim: filetype=apache
diff --git a/templates/apache/sites/gerrit.wikimedia.org.erb
b/templates/apache/sites/gerrit.wikimedia.org.erb
index f979f9c..68f7fad 100644
--- a/templates/apache/sites/gerrit.wikimedia.org.erb
+++ b/templates/apache/sites/gerrit.wikimedia.org.erb
@@ -1,6 +1,6 @@
#####################################################################
### THIS FILE IS MANAGED BY PUPPET
-### puppet:///files/apache/sites/gerrit.wikimedia.org
+### puppet:///templates/apache/sites/gerrit.wikimedia.org.erb
#####################################################################
# vim: filetype=apache
diff --git a/templates/apache/sites/racktables.wikimedia.org.erb
b/templates/apache/sites/racktables.wikimedia.org.erb
index 818610c..c52c38e 100644
--- a/templates/apache/sites/racktables.wikimedia.org.erb
+++ b/templates/apache/sites/racktables.wikimedia.org.erb
@@ -1,6 +1,6 @@
#####################################################################
### THIS FILE IS MANAGED BY PUPPET
-### puppet:///files/apache/sites/racktables.wikimedia.org
+### puppet:///templates/apache/sites/racktables.wikimedia.org.erb
#####################################################################
# vim: filetype=apache
diff --git a/templates/apache/sites/smokeping.wikimedia.org.erb
b/templates/apache/sites/smokeping.wikimedia.org.erb
index 7903be9..db751eb 100644
--- a/templates/apache/sites/smokeping.wikimedia.org.erb
+++ b/templates/apache/sites/smokeping.wikimedia.org.erb
@@ -1,6 +1,6 @@
#####################################################################
### THIS FILE IS MANAGED BY PUPPET
-### puppet:///files/apache/sites/smokeping.wikimedia.org.erb
+### puppet:///templates/apache/sites/smokeping.wikimedia.org.erb
#####################################################################
# vim: filetype=apache
diff --git a/templates/apache/sites/wikitech.wikimedia.org.erb
b/templates/apache/sites/wikitech.wikimedia.org.erb
index c567aeb..494c90c 100644
--- a/templates/apache/sites/wikitech.wikimedia.org.erb
+++ b/templates/apache/sites/wikitech.wikimedia.org.erb
@@ -1,13 +1,13 @@
#####################################################################
### THIS FILE IS MANAGED BY PUPPET
-### puppet:///files/apache/sites/wikitech.wikimedia.org
+### puppet:///templates/apache/sites/wikitech.wikimedia.org
#####################################################################
# vim: filetype=apache
<VirtualHost *:80>
ServerAdmin [email protected]
ServerName <%= controller_hostname %>
-
+
DocumentRoot /var/www
<Directory />
Options FollowSymLinks
--
To view, visit https://gerrit.wikimedia.org/r/81129
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibbdaa373902da2b013f007e93f5db6bba4cfc2f9
Gerrit-PatchSet: 2
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
