diff --git a/_config/nginx.conf b/_config/nginx.conf index b5748a71..0464dd6e 100644 --- a/_config/nginx.conf +++ b/_config/nginx.conf @@ -1,6 +1,13 @@ # This is included as an example of a config file that works for the site. This is important so that anyone can re-host it in the event of something going wrong with the main site. # The main takeaways from this config file are the redirects, everything is relatively bog standard. +server { + listen 80; + + # Specify this vhost's domain name + server_name dlsrc.getmonero.org downloads.getmonero.orgdlsrc.monero.mu downloads.monero.mu downloads.monero.cc; + return 301 https://$server_name$request_uri; +} server { listen 80; listen 443 ssl http2; @@ -13,7 +20,7 @@ server { ssl_prefer_server_ciphers on; # Specify this vhost's domain name - server_name updates.getmonero.org downloads.getmonero.org downloads.monero.cc; + server_name updates.getmonero.org dlsrc.getmonero.org downloads.getmonero.org updates.monero.mu dlsrc.monero.mu downloads.monero.mu downloads.monero.cc; root /var/www/downloads.getmonero.org/webroot; index index.php index.html index.htm; @@ -55,72 +62,58 @@ server { } # End of general restrictions - rewrite ^/home / permanent; - rewrite ^/knowledge-base / permanent; - rewrite ^/knowledge-base/projects /resources/merchants/ permanent; - rewrite ^/knowledge-base/user-guides /resources/user-guides/ permanent; - rewrite ^/knowledge-base/developer-guides /resources/developer-guides/ permanent; - rewrite ^/knowledge-base/moneropedia /resources/moneropedia/ permanent; - rewrite ^/knowledge-base/people /community/team/ permanent; - rewrite ^/knowledge-base/open-alias /the-monero-project/ permanent; - rewrite ^/knowledge-base/about /resources/about/ permanent; - rewrite ^/getting-started/donate /get-started/contributing/ permanent; - rewrite ^/getting-started/accepting /get-started/accepting/ permanent; - rewrite ^/getting-started/merchants /community/merchants/ permanent; - rewrite ^/getting-started/running /get-started/using/ permanent; - # Downloads! location /win64 { - rewrite ^ /cli/monero-win-x64-v0.11.1.0.zip redirect; + rewrite ^ /cli/monero-win-x64-v0.13.0.2.zip redirect; } location /win32 { - rewrite ^ /cli/monero-win-x86-v0.11.1.0.zip redirect; + rewrite ^ /cli/monero-win-x86-v0.13.0.2.zip redirect; } location /mac64 { - rewrite ^ /cli/monero-mac-x64-v0.11.1.0.tar.bz2 redirect; + rewrite ^ /cli/monero-mac-x64-v0.13.0.2.tar.bz2 redirect; } location /linux64 { - rewrite ^ /cli/monero-linux-x64-v0.11.1.0.tar.bz2 redirect; + rewrite ^ /cli/monero-linux-x64-v0.13.0.2.tar.bz2 redirect; } location /linux32 { - rewrite ^ /cli/monero-linux-x86-v0.11.1.0.tar.bz2 redirect; + rewrite ^ /cli/monero-linux-x86-v0.13.0.2.tar.bz2 redirect; } location /linuxarm7 { - rewrite ^ /cli/monero-linux-armv7-v0.11.1.0.tar.bz2 redirect; + rewrite ^ /cli/monero-linux-armv7-v0.13.0.2.tar.bz2 redirect; } location /linuxarm8 { - rewrite ^ /cli/monero-linux-armv8-v0.11.1.0.tar.bz2 redirect; + rewrite ^ /cli/monero-linux-armv8-v0.13.0.2.tar.bz2 redirect; } location /freebsd64 { - rewrite ^ /cli/monero-freebsd-x64-v0.11.1.0.tar.bz2 redirect; + rewrite ^ /cli/monero-freebsd-x64-v0.13.0.2.tar.bz2 redirect; } location /dragonflybsd64 { - rewrite ^ /cli/monero-dragonflybsd-x64-v0.11.1.0.tar.bz2 redirect; + rewrite ^ /cli/monero-dragonflybsd-x64-v0.13.0.2.tar.bz2 redirect; } - + # GUI downloads location /gui/win64 { - rewrite ^ /gui/monero-gui-win-x64-v0.11.1.0.zip redirect; + rewrite ^ /gui/monero-gui-win-x64-v0.13.0.2.zip redirect; } location /gui/mac64 { - rewrite ^ /gui/monero-gui-mac-x64-v0.11.1.0.tar.bz2 redirect; + rewrite ^ /gui/monero-gui-mac-x64-v0.13.0.2.tar.bz2 redirect; } location /gui/linux64 { - rewrite ^ /gui/monero-gui-linux-x64-v0.11.1.0.tar.bz2 redirect; + rewrite ^ /gui/monero-gui-linux-x64-v0.13.0.2.tar.bz2 redirect; } location /gui/linux32 { - rewrite ^ /gui/monero-gui-linux-x86-v0.11.1.0.tar.bz2 redirect; + rewrite ^ /gui/monero-gui-linux-x86-v0.13.0.2.tar.bz2 redirect; } # Other download redirects @@ -235,8 +228,15 @@ server { location / { try_files $uri $uri/ $uri.php $uri.htm $uri.html =404; index index.html index.htm index.php; +# post_action @download_complete; } +# location @download_complete { +# resolver 8.8.8.8; +# proxy_pass http://statcounter.monero.cc/stat_counter.php?zz=yy&status=$request_completion&uri=$uri&remote_addr=$remote_addr&http_x_forwarded_for=$http_x_forwarded_for&body_bytes_sent=$body_bytes_sent&request_time=$request_time&scheme=$scheme&server_name=$server_name&http_user_agent=$http_user_agent; +# internal; +# } + # Block for processing PHP files # Specifically matches URIs ending in .php location ~ \.php$ { @@ -254,4 +254,4 @@ server { fastcgi_pass phpfpm; } -} +} \ No newline at end of file diff --git a/_data/downloads.yml b/_data/downloads.yml index 86fbcc5d..4814c3db 100644 --- a/_data/downloads.yml +++ b/_data/downloads.yml @@ -2,55 +2,55 @@ id: windows icon: icon-windows cli_url: win64 - cli_hash: 5c06097acebf643857672e673258d16d66a71de504377399b7407318f9887ee3s + cli_hash: 82db8f99fa4b2900f78c282c2d99309b79da544824f9cdb10d0b80ceb511c5ed gui_url: win64 gui_hash: 947efb72418d9ee60ccb0a2afa1f85553fa6a777a0a4e0f89f353592c84e00dc - cli_version: 0.12.3.0 + cli_version: 0.13.0.2 gui_version: 0.12.3.0 - tag: Lithium Luna + tag: Beryllium Bullet blockchain: win - platform: Windows, 32-bit icon: icon-windows cli_url: win32 - cli_hash: 4a1718e75e2467f9a4b02b5c342b702999c97b1c0f8a1cdd5a63d7c2b21f849a - version: 0.12.2.0 - tag: Lithium Luna + cli_hash: f9fad998af2c439dce45b8210784b228c8a99dced926e9bec3522af2a213c747 + version: 0.13.0.2 + tag: Beryllium Bullet blockchain: win - platform: Mac OS X, 64-bit id: mac icon: icon-apple cli_url: mac64 - cli_hash: 39d40e2001ca9948f434637c28b3933c0d79c66e2db07ffc4274711ab2d2ae66 + cli_hash: bb0f197c9e43e183b9af48dfbc4f7b492568fe01d2c23c66ec3632c8aa85e4e9 gui_url: mac64 gui_hash: 90a9fa02e7bcef653b034f8a0365f16ec96cd553791546df2200a3c2591d5104 - cli_version: 0.12.3.0 + cli_version: 0.13.0.2 gui_version: 0.12.3.0 - tag: Lithium Luna + tag: Beryllium Bullet blockchain: mac - platform: Linux, 64-bit id: linux icon: icon-linux cli_url: linux64 - cli_hash: 72fe937aa2832a0079767914c27671436768ff3c486597c3353a8567d9547487 + cli_hash: a59fc0fffb325b4f92a5b500438bf340ddbf78e91581eb4df95ad2d5e5fb42a8 gui_url: linux64 gui_hash: dcf0a103589b8e71cdb8298dec96610f9f50b25e8f48afef5186d4c460a4ecae - cli_version: 0.12.3.0 + cli_version: 0.13.0.2 gui_version: 0.12.3.0 - tag: Lithium Luna + tag: Beryllium Bullet blockchain: linux - platform: Linux, 32-bit icon: icon-linux cli_url: linux32 - cli_hash: 41d68f66a43098754de0d2ead0eaeb125fc7eb05ecf3eb6a48c96ce6874052f3 + cli_hash: 87396e833859cbafff53db753443f8f94a962d9738cb0f69ea9d0b3c940960e6 gui_url: linux32 gui_hash: 6858519657add070aeedb03a22d4661ec1b868acdd0b3437fe45e6b640ea4e3b - cli_version: 0.12.3.0 + cli_version: 0.13.0.2 gui_version: 0.12.3.0 - tag: Lithium Luna + tag: Beryllium Bullet blockchain: linux - platform: ARMv7 diff --git a/downloads/hashes.txt b/downloads/hashes.txt index 92f37ce2..6e89f857 100644 --- a/downloads/hashes.txt +++ b/downloads/hashes.txt @@ -6,28 +6,21 @@ This GPG-signed message exists to confirm the SHA256 sums on Monero binaries. Please verify the signature against the signature for fluffypony in the source code repository (/utils/gpg_keys). -monero-win-x64-v0.12.3.0.zip, 5c06097acebf643857672e673258d16d66a71de504377399b7407318f9887ee3 -monero-win-x86-v0.12.2.0.zip, 4a1718e75e2467f9a4b02b5c342b702999c97b1c0f8a1cdd5a63d7c2b21f849a -monero-mac-x64-v0.12.3.0.tar.bz2, 39d40e2001ca9948f434637c28b3933c0d79c66e2db07ffc4274711ab2d2ae66 -monero-linux-x64-v0.12.3.0.tar.bz2, 72fe937aa2832a0079767914c27671436768ff3c486597c3353a8567d9547487 -monero-linux-x86-v0.12.3.0.tar.bz2, 41d68f66a43098754de0d2ead0eaeb125fc7eb05ecf3eb6a48c96ce6874052f3 -monero-linux-armv7-v0.12.3.0.tar.bz2, 839bddb01214acb8f7bc12181b206e1e8d99314337addef7ba850b15c32dc685 -monero-linux-armv8-v0.12.3.0.tar.bz2, a6e994dc9fcec7259b656752a6fc0f9686bad47da9deec0f50398718cd9b9be8 - -monero-gui-linux-x64-v0.12.3.0.tar.bz2, dcf0a103589b8e71cdb8298dec96610f9f50b25e8f48afef5186d4c460a4ecae -monero-gui-linux-x86-v0.12.3.0.tar.bz2, 6858519657add070aeedb03a22d4661ec1b868acdd0b3437fe45e6b640ea4e3b -monero-gui-mac-x64-v0.12.3.0.tar.bz2, 90a9fa02e7bcef653b034f8a0365f16ec96cd553791546df2200a3c2591d5104 -monero-gui-win-x64-v0.12.3.0.zip, 947efb72418d9ee60ccb0a2afa1f85553fa6a777a0a4e0f89f353592c84e00dc +monero-win-x64-v0.13.0.2.zip, 82db8f99fa4b2900f78c282c2d99309b79da544824f9cdb10d0b80ceb511c5ed +monero-win-x86-v0.13.0.2.zip, f9fad998af2c439dce45b8210784b228c8a99dced926e9bec3522af2a213c747 +monero-mac-x64-v0.13.0.2.tar.bz2, bb0f197c9e43e183b9af48dfbc4f7b492568fe01d2c23c66ec3632c8aa85e4e9 +monero-linux-x64-v0.13.0.2.tar.bz2, a59fc0fffb325b4f92a5b500438bf340ddbf78e91581eb4df95ad2d5e5fb42a8 +monero-linux-x86-v0.13.0.2.tar.bz2, 87396e833859cbafff53db753443f8f94a962d9738cb0f69ea9d0b3c940960e6 Riccardo "fluffypony" Spagni -----BEGIN PGP SIGNATURE----- -iQEzBAEBCAAdFiEElLc43TUBMvWsvuodVUMt8xzNT80FAltaKPIACgkQVUMt8xzN -T80sXggAwlH8iMaNdSs7sG/h7lcUJreRcNB+ktkzuzJ/lQrmRiah2pzC7tFuU6Ng -V8WKBtsAdRxgCSaRY1KCXrw2B/H6bwpUnGdeIyTrT0XXXgdKcG16Gol44P9hqSN8 -sOiWZpeGL6SqYFZ7r2CvA7UXkWWdDnWamsSc6K28aX/zA+JGBKT4C6+OKwmT09Ae -bLDMiAy0vibP79WA2gJ9FgCI7F0tzI+04WYUh/TSxZtvV0OqvxLY6UfNRdhnvcjt -qQimJYHwCgUNnYXWGehecOVs7mGyvgrWw4Wr4x+qB32cOuMAsklquazIt/q0B6u5 -SYoWfV7pXZSZijVd9VLbKZ+JcLhDRQ== -=kxN3 +iQEzBAEBCAAdFiEElLc43TUBMvWsvuodVUMt8xzNT80FAlu/FhwACgkQVUMt8xzN +T80tLQf+LktjSKzBtoaijrCW8psID1D9LSG3GC+4VNo5RC+VBPs633YJ0jinFD1V +DQHJpyhxER8LVXpXG3vjx0bW5k3Zhl4Ib4d8pjwBWtLxIne5fRzj249d2nm6tl/m +hQZJuoEWWaFhVXGwILqCMzBNjPahr3+gxWinQUrjtMt1Cjn4cG2iiqLrYR+KESFN +aGoVPIBUiliivV6JdDEVfNZAE07dcD3+L1QbLDniIUi5Qwrm38bX7Kc68kJ79jLf +LaVEjGXxjWHLh0CAY5igb/bSwIcQIfTh+FUgYxpQOI7ekFLALULFupLpKrLU8inV +gkWDb8lOP23zIVXlCPQVcqtAxYAv9g== +=k2QG -----END PGP SIGNATURE----- \ No newline at end of file