Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/147504
Change subject: delete smokeping apache template ...................................................................... delete smokeping apache template this is only used in role/smokeping, which in turn is not used anywhere and suggested for deletion in Iccd421b9c4ca1 module/smokeping which IS used doesn't use a template but just @webserver::apache::site with "custom =>" Change-Id: I8456d08bfda9143082050b1f4fd68d66ba6e74f9 --- D templates/apache/sites/smokeping.wikimedia.org.erb 1 file changed, 0 insertions(+), 68 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/04/147504/1 diff --git a/templates/apache/sites/smokeping.wikimedia.org.erb b/templates/apache/sites/smokeping.wikimedia.org.erb deleted file mode 100644 index 534a780..0000000 --- a/templates/apache/sites/smokeping.wikimedia.org.erb +++ /dev/null @@ -1,68 +0,0 @@ -##################################################################### -### THIS FILE IS MANAGED BY PUPPET -### puppet:///templates/apache/sites/smokeping.wikimedia.org.erb -##################################################################### -# vim: filetype=apache - -<VirtualHost *:80> - - ServerName <%= @smokeping_host %> - - DocumentRoot /srv/org/wikimedia/smokeping/ - <Directory /> - Options FollowSymLinks - AllowOverride None - </Directory> - <Directory /srv/org/wikimedia/smokeping/> - AddHandler cgi-script .fcgi .cgi .pl - Options Indexes FollowSymLinks MultiViews +ExecCGI - AllowOverride None - Order allow,deny - allow from all - </Directory> - - ErrorLog /var/log/apache2/error.log - - # Possible values include: debug, info, notice, warn, error, crit, - # alert, emerg. - LogLevel warn - - CustomLog /var/log/apache2/access.log combined - ServerSignature On - -</VirtualHost> - -<VirtualHost *:443> - - ServerName <%= @smokeping_host %> - - SSLEngine on - SSLProtocol +ALL -SSLv2 - SSLCipherSuite ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:ECDHE-RSA-RC4-SHA:ECDHE-ECDSA-RC4-SHA:AES128:AES256:RC4-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!3DES:!MD5:!PSK:!DH - SSLHonorCipherOrder on - SSLCertificateFile <%= @smokeping_ssl_cert %> - SSLCertificateKeyFile <%= @smokeping_ssl_key %> - - DocumentRoot /srv/org/wikimedia/smokeping/ - <Directory /> - Options FollowSymLinks - AllowOverride None - </Directory> - <Directory /srv/org/wikimedia/smokeping/> - AddHandler cgi-script .fcgi .cgi .pl - Options Indexes FollowSymLinks MultiViews +ExecCGI - AllowOverride None - Order allow,deny - allow from all - </Directory> - - ErrorLog /var/log/apache2/error.log - - # Possible values include: debug, info, notice, warn, error, crit, - # alert, emerg. - LogLevel warn - - CustomLog /var/log/apache2/access.log combined - ServerSignature On - -</VirtualHost> -- To view, visit https://gerrit.wikimedia.org/r/147504 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8456d08bfda9143082050b1f4fd68d66ba6e74f9 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <dz...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
