Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/253497
Change subject: Revert "smokeping: Use apache::site" ...................................................................... Revert "smokeping: Use apache::site" Let's see if this is what broke smokeping or if it has been broken before this. This reverts commit 991a685d25f65463ad65151a6c1426e2c7b9de95. Change-Id: Iea254c64309aa6c0dc75af37e05ea8b1f68420a5 --- D modules/smokeping/files/apache.conf M modules/smokeping/manifests/web.pp 2 files changed, 8 insertions(+), 25 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/97/253497/1 diff --git a/modules/smokeping/files/apache.conf b/modules/smokeping/files/apache.conf deleted file mode 100644 index 4c49a8f..0000000 --- a/modules/smokeping/files/apache.conf +++ /dev/null @@ -1,22 +0,0 @@ -<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 f2965b9..5008784 100644 --- a/modules/smokeping/manifests/web.pp +++ b/modules/smokeping/manifests/web.pp @@ -7,8 +7,13 @@ } include ::apache::mod::fcgid - - apache::site { 'smokeping.wikimedia.org': - source => 'puppet:///modules/smokeping/apache.conf', + @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/' + ], } } -- To view, visit https://gerrit.wikimedia.org/r/253497 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iea254c64309aa6c0dc75af37e05ea8b1f68420a5 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
