Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/253484
Change subject: smokeping: Use apache::site ...................................................................... smokeping: Use apache::site Bug: T118786 Change-Id: I843d5db34035f0d86a9945140f61025edad9e965 --- A modules/smokeping/files/apache.conf M modules/smokeping/manifests/web.pp 2 files changed, 25 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/84/253484/1 diff --git a/modules/smokeping/files/apache.conf b/modules/smokeping/files/apache.conf new file mode 100644 index 0000000..4c49a8f --- /dev/null +++ b/modules/smokeping/files/apache.conf @@ -0,0 +1,22 @@ +<VirtualHost *:80> + ServerName smokeping.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/smokeping.wikimedia.org.error.log + LogLevel warn + + CustomLog /var/log/apache2/smokeping.wikimedia.org.access.log combined + ServerSignature On + + AliasMatch ^/($|smokeping\.cgi) /usr/share/smokeping/www/smokeping.fcgi + Alias /images /var/cache/smokeping/images/ +</VirtualHost> diff --git a/modules/smokeping/manifests/web.pp b/modules/smokeping/manifests/web.pp index 5008784..f2965b9 100644 --- a/modules/smokeping/manifests/web.pp +++ b/modules/smokeping/manifests/web.pp @@ -7,13 +7,8 @@ } include ::apache::mod::fcgid - @webserver::apache::site { 'smokeping.wikimedia.org': - require => [Class['::apache::mod::fcgid'], - File['/usr/share/smokeping/www/smokeping.fcgi']], - docroot => '/var/www', - custom => [ - 'AliasMatch ^/($|smokeping\.cgi) /usr/share/smokeping/www/smokeping.fcgi', - 'Alias /images /var/cache/smokeping/images/' - ], + + apache::site { 'smokeping.wikimedia.org': + source => 'puppet:///modules/smokeping/apache.conf', } } -- To view, visit https://gerrit.wikimedia.org/r/253484 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I843d5db34035f0d86a9945140f61025edad9e965 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
