jenkins-bot has submitted this change and it was merged. Change subject: Add nginx/mime.types to puppet ......................................................................
Add nginx/mime.types to puppet Mainly to add correct mimetype to woff files, but took a version other improvements as well Change-Id: Ifa648277233239a5f934393298ae94adecb09c22 --- A puppet/modules/nginx/files/mime.types M puppet/modules/nginx/manifests/init.pp 2 files changed, 116 insertions(+), 0 deletions(-) Approvals: Ori.livneh: Looks good to me, but someone else must approve Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/puppet/modules/nginx/files/mime.types b/puppet/modules/nginx/files/mime.types new file mode 100644 index 0000000..6d92051 --- /dev/null +++ b/puppet/modules/nginx/files/mime.types @@ -0,0 +1,112 @@ +# file managed by puppet + +# Taken in 2013-07-30 from Github: +# https://raw.github.com/h5bp/server-configs-nginx/master/mime.types + +types { + +# Audio + audio/midi mid midi kar; + audio/mp4 aac f4a f4b m4a; + audio/mpeg mp3; + audio/ogg oga ogg; + audio/x-realaudio ra; + audio/x-wav wav; + +# Images + image/bmp bmp; + image/gif gif; + image/jpeg jpeg jpg; + image/png png; + image/tiff tif tiff; + image/vnd.wap.wbmp wbmp; + image/webp webp; + image/x-icon ico; + image/x-jng jng; + +# JavaScript + application/javascript js; + application/json json; + +# Manifest files + application/x-web-app-manifest+json webapp; + text/cache-manifest manifest appcache; + +# Microsoft Office + application/msword doc; + application/vnd.ms-excel xls; + application/vnd.ms-powerpoint ppt; + application/vnd.openxmlformats-officedocument.wordprocessingml.document docx; + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet xlsx; + application/vnd.openxmlformats-officedocument.presentationml.presentation pptx; + +# Video + video/3gpp 3gpp 3gp; + video/mp4 mp4 m4v f4v f4p; + video/mpeg mpeg mpg; + video/ogg ogv; + video/quicktime mov; + video/webm webm; + video/x-flv flv; + video/x-mng mng; + video/x-ms-asf asx asf; + video/x-ms-wmv wmv; + video/x-msvideo avi; + +# Web feeds + application/xml atom rdf rss xml; + +# Web fonts + application/font-woff woff; + application/vnd.ms-fontobject eot; + application/x-font-ttf ttc ttf; + font/opentype otf; + image/svg+xml svg svgz; + +# Other + application/java-archive jar war ear; + application/mac-binhex40 hqx; + application/pdf pdf; + application/postscript ps eps ai; + application/rtf rtf; + application/vnd.wap.wmlc wmlc; + application/xhtml+xml xhtml; + application/vnd.google-earth.kml+xml kml; + application/vnd.google-earth.kmz kmz; + application/x-7z-compressed 7z; + application/x-chrome-extension crx; + application/x-opera-extension oex; + application/x-xpinstall xpi; + application/x-cocoa cco; + application/x-java-archive-diff jardiff; + application/x-java-jnlp-file jnlp; + application/x-makeself run; + application/x-perl pl pm; + application/x-pilot prc pdb; + application/x-rar-compressed rar; + application/x-redhat-package-manager rpm; + application/x-sea sea; + application/x-shockwave-flash swf; + application/x-stuffit sit; + application/x-tcl tcl tk; + application/x-x509-ca-cert der pem crt; + application/zip zip; + + application/octet-stream bin exe dll; + application/octet-stream deb; + application/octet-stream dmg; + application/octet-stream iso img; + application/octet-stream msi msp msm; + application/octet-stream safariextz; + + text/css css; + text/html html htm shtml; + text/mathml mml; + text/plain txt; + text/vnd.sun.j2me.app-descriptor jad; + text/vnd.wap.wml wml; + text/vtt vtt; + text/x-component htc; + text/x-vcard vcf; + +} diff --git a/puppet/modules/nginx/manifests/init.pp b/puppet/modules/nginx/manifests/init.pp index f1001ea..19c6011 100644 --- a/puppet/modules/nginx/manifests/init.pp +++ b/puppet/modules/nginx/manifests/init.pp @@ -20,6 +20,10 @@ source => 'puppet:///modules/nginx/nginx.conf', } + file { '/etc/nginx/mime.types': + source => 'puppet:///modules/nginx/mime.types', + } + file { '/etc/nginx/sites-available/translatewiki.net': source => 'puppet:///modules/nginx/sites/translatewiki.net', } -- To view, visit https://gerrit.wikimedia.org/r/76697 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifa648277233239a5f934393298ae94adecb09c22 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Nikerabbit <[email protected]> Gerrit-Reviewer: Ori.livneh <[email protected]> Gerrit-Reviewer: Siebrand <[email protected]> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
