Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/253488
Change subject: torrus: Move to apache::site ...................................................................... torrus: Move to apache::site Bug: T118786 Change-Id: I50c5fea5e3fe502459cfc9deeee1f2eac68ec523 --- A modules/torrus/files/apache.conf M modules/torrus/manifests/web.pp 2 files changed, 27 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/88/253488/1 diff --git a/modules/torrus/files/apache.conf b/modules/torrus/files/apache.conf new file mode 100644 index 0000000..29266e7 --- /dev/null +++ b/modules/torrus/files/apache.conf @@ -0,0 +1,25 @@ +<VirtualHost *:80> + ServerName torrus.wikimedia.org + ServerAdmin [email protected] + + DocumentRoot /var/www + <Directory /var/www> + Options Indexes FollowSymLinks MultiViews + AllowOverride All + Order allow,deny + allow from all + </Directory> + + + ErrorLog /var/log/apache2/torrus.wikimedia.org.error.log + # Possible values include: debug, info, notice, warn, error, crit, + # alert, emerg. + LogLevel warn + + CustomLog /var/log/apache2/torrus.wikimedia.org.access.log combined + ServerSignature On + + RedirectMatch ^/$ /torrus + + Include /etc/torrus/torrus-apache2.conf +</VirtualHost> diff --git a/modules/torrus/manifests/web.pp b/modules/torrus/manifests/web.pp index b24d0f1..b4d59e8 100644 --- a/modules/torrus/manifests/web.pp +++ b/modules/torrus/manifests/web.pp @@ -7,10 +7,7 @@ include ::apache::mod::rewrite include ::apache::mod::perl - @webserver::apache::site { 'torrus.wikimedia.org': - require => Class['::apache::mod::rewrite', '::apache::mod::perl'], - docroot => '/var/www', - custom => ['RedirectMatch ^/$ /torrus'], - includes => ['/etc/torrus/torrus-apache2.conf'], + apache::site { 'torrus.wikimedia.org': + source => 'puppet:///modules/torrus/apache.conf', } } -- To view, visit https://gerrit.wikimedia.org/r/253488 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I50c5fea5e3fe502459cfc9deeee1f2eac68ec523 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yuvipanda <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
