Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/142205
Change subject: role::deployment: port apache::vhost to apache::site
......................................................................
role::deployment: port apache::vhost to apache::site
* Don't declare the default vhost just to ensure => absent it; it gets cleared
by dint of Puppet managing sites-enabled recursively.
* Port the deployment Apache site to use apache::site instead of apache::vhost.
The template I'm introducing for this site is simply a copy of the file the
current Puppetization generated on tin, with some small fixes (leave
ServerName undeclared; bind to *:80 rather than hard-code eth0's IP).
* There's a lot else to improve in deployment.pp but I'm here with a specific
purpose. I don't want to be on the hook for cleaning up the rest of the role.
Change-Id: I12c6a042d3bb458b9d487356426f4d95b318f083
---
M manifests/role/deployment.pp
A templates/apache/sites/deployment.erb
2 files changed, 24 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/05/142205/1
diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp
index 09279d3..74a42e6 100644
--- a/manifests/role/deployment.pp
+++ b/manifests/role/deployment.pp
@@ -141,13 +141,6 @@
class { 'mediawiki::packages': }
- apache::vhost { 'default':
- ensure => absent,
- priority => '000',
- port => '80',
- docroot => '/var/www',
- }
-
#RT 7427
::monitoring::icinga::git_merge { 'mediawiki_config':
dir => '/a/common/',
@@ -160,15 +153,14 @@
include role::deployment::deployment_servers::common
include network::constants
- apache::vhost { 'tin.eqiad.wmnet':
- priority => '10',
- vhost_name => '10.64.0.196',
- port => '80',
- docroot => '/srv/deployment',
- docroot_owner => 'trebuchet',
- docroot_group => 'wikidev',
- docroot_dir_allows => $::network::constants::deployable_networks,
- serveradmin => '[email protected]',
+ file { '/srv/deployment':
+ ensure => directory,
+ owner => 'trebuchet',
+ group => 'wikidev',
+ }
+ apache::site { 'deployment':
+ content => template('apache/sites/deployment.erb'),
+ require => File['/srv/deployment'],
}
class { 'redis':
dir => '/srv/redis',
diff --git a/templates/apache/sites/deployment.erb
b/templates/apache/sites/deployment.erb
new file mode 100644
index 0000000..348e6f7
--- /dev/null
+++ b/templates/apache/sites/deployment.erb
@@ -0,0 +1,16 @@
+<VirtualHost *:80>
+ ServerAdmin [email protected]
+ DocumentRoot /srv/deployment
+
+ <Directory /srv/deployment>
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride None
+ Order allow,deny
+ allow from <%=
scope.lookupvar('::network::constants::deployable_networks').join(' ') %>
+ </Directory>
+
+ LogLevel warn
+ ErrorLog /var/log/apache2/tin.eqiad.wmnet_error.log
+ CustomLog /var/log/apache2/tin.eqiad.wmnet_access.log combined
+ ServerSignature Off
+</VirtualHost>
--
To view, visit https://gerrit.wikimedia.org/r/142205
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I12c6a042d3bb458b9d487356426f4d95b318f083
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
