Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/147656
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: I65b13090fc7527b040420d5fabac540dcea21a20 --- 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/56/147656/1 diff --git a/templates/apache/sites/smokeping.wikimedia.org.erb b/templates/apache/sites/smokeping.wikimedia.org.erb deleted file mode 100644 index db751eb..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 +SSLv3 +TLSv1 - SSLCipherSuite AES128-GCM-SHA256:RC4-SHA:RC4-MD5:DES-CBC3-SHA:AES128-SHA:AES256-SHA - 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/147656 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I65b13090fc7527b040420d5fabac540dcea21a20 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
