Merge branch 'master' of github.com:tuna/mirror-web

_config.yml

@@ -117,7 +117,7 @@ descriptions:
   pybombs: '为 GNU Radio 设计的编译管理系统'
   pypi: 'Python 软件包索引源'
   qt: '跨平台软件开发库 Qt 的源码、开发工具、文档等'
-  raspbian: '（不再更新）为 Raspberry Pi 编译的 Debian'
+  raspbian: '为 Raspberry Pi 编译的 Debian'
   redhat: 'Red Hat Enterprise Linux 官方软件源'
   remi: '包含最新版本 PHP 和 MySQL 的第三方 yum 源'
   repo-ck: 'repo-ck 是 Arch 的非官方仓库，内有包含 ck 补丁、BFS 调度器等'

_posts/help/1970-01-01-termux.md

@@ -51,7 +51,7 @@ apt edit-sources
 
 ```
 # The termux repository mirror from TUNA:
-deb [arch=all, arm] http://mirrors.tuna.tsinghua.edu.cn/termux stable main
+deb [arch=all,arm] http://mirrors.tuna.tsinghua.edu.cn/termux stable main
 ```
 
 **如果你的android不是arm的CPU，上面的[]里的内容会有所区别，参照原来的配置修改一下**
@@ -65,4 +65,4 @@ deb [arch=all, arm] http://mirrors.tuna.tsinghua.edu.cn/termux stable main
 apt install apt-transport-https
 ```
 
-之后类似上面的方式配置，把url改成`https://mirrors.tuna.tsinghua.edu.cn/termux`。
+之后类似上面的配置，但是把url改成`https://mirrors.tuna.tsinghua.edu.cn/termux`。

_posts/news/2016-11-30-rsync-unrestricted.md

@@ -0,0 +1,8 @@
+---
+category: news
+layout: news
+title: "不再对 rsync 服务磁盘 I/O 进行限制"
+author: Xavier Yao
+---
+
+各服务恢复正常。

geninfo/genisolist.ini

@@ -10,11 +10,12 @@
 [%main%]
 root = /data/
 urlbase = /
-d30 = Ubuntu
-d40 = Ubuntu 衍生版
-d20 = Debian
 d10 = Arch Linux
-d50 = Fedora
+d20 = Debian
+d25 = CentOS
+d30 = Fedora
+d40 = Ubuntu
+d50 = Ubuntu 衍生版
 d60 = Deepin
 
 # Sections whose name isn't "%main%" defined a detect rule of image detection.
@@ -39,7 +40,7 @@ version = $1
 type = CLI-only
 platform = $2
 
-[ubuntu]
+[ubuntu desktop]
 distro = Ubuntu
 listvers = 4
 # If one glob is not enough for locating all images, you can use "location_N"
@@ -48,7 +49,19 @@ location_0 = ubuntu-releases/[a-z]*/ubuntu-*-desktop-i386.iso
 location_1 = ubuntu-releases/[a-z]*/ubuntu-*-desktop-amd64.iso
 pattern = ubuntu-([0-9.]+)-desktop-(\w+).iso
 version = $1
-type = LiveCD
+type = Desktop LiveDVD
+platform = $2
+
+[ubuntu server]
+distro = Ubuntu
+listvers = 4
+# If one glob is not enough for locating all images, you can use "location_N"
+# to specify more globs. N start from 0 and must a sequence (0,1,2...).
+location_0 = ubuntu-releases/[a-z]*/ubuntu-*-server-i386.iso
+location_1 = ubuntu-releases/[a-z]*/ubuntu-*-server-amd64.iso
+pattern = ubuntu-([0-9.]+)-server-(\w+).iso
+version = $1
+type = Server
 platform = $2
 
 # You can apply multiple rules (sections) for the same distro like following
@@ -133,7 +146,7 @@ platform = $2
 distro = CentOS
 listvers = 2
 location = centos/[0-9].*/isos/*/CentOS-[0-9]*.iso
-pattern = CentOS-([0-9.]+)-(\w+)-([Mm]inimal|[Nn]et[Ii]nstall|Live\w+)(-[0-9]+|).iso
+pattern = CentOS-([0-9.]+)-(\w+)-((bin-)?\w+?)(-[0-9]+|).iso
 version = $1
 type = $3
 platform = $2

robots.txt

@@ -6,17 +6,20 @@ Disallow: /CRAN
 Disallow: /CTAN
 Disallow: /CocoaPods
 Disallow: /ELK
+Disallow: /HHVM
 Disallow: /NetBSD
 Disallow: /OpenBSD
 Disallow: /alpine
 Disallow: /anaconda
 Disallow: /antergos
 Disallow: /anthon
 Disallow: /apache
+Disallow: /arch4edu
 Disallow: /archlinux
 Disallow: /archlinuxarm
 Disallow: /archlinuxcn
 Disallow: /bananian
+Disallow: /bjlx
 Disallow: /blackarch
 Disallow: /centos
 Disallow: /ceph
@@ -25,26 +28,32 @@ Disallow: /ctex
 Disallow: /cygwin
 Disallow: /debian-cd
 Disallow: /debian-multimedia
+Disallow: /debian-nonfree
 Disallow: /debian-security
 Disallow: /debian
 Disallow: /deepin-cd
 Disallow: /deepin
 Disallow: /dell
 Disallow: /docker
 Disallow: /dotdeb
+Disallow: /elasticstack
 Disallow: /elpa
 Disallow: /elrepo
+Disallow: /elvish
 Disallow: /epel
 Disallow: /fedora
 Disallow: /gentoo-portage
 Disallow: /gentoo
+Disallow: /git-repo
 Disallow: /gitlab-ce
 Disallow: /gitlab-ci-multi-runner
 Disallow: /gnu
 Disallow: /grafana
 Disallow: /hackage
 Disallow: /homebrew-bottles
+Disallow: /
 Disallow: /homebrew
+Disallow: /infinality-bundle
 Disallow: /influxdata
 Disallow: /ius
 Disallow: /jenkins
@@ -53,11 +62,12 @@ Disallow: /kali-security
 Disallow: /kali
 Disallow: /kernel
 Disallow: /kodi
-Disallow: /lede
 Disallow: /linux.git
 Disallow: /linuxmint-cd
 Disallow: /linuxmint
+Disallow: /loongson
 Disallow: /lxc-images
+Disallow: /macports
 Disallow: /mageia
 Disallow: /manjaro-cd
 Disallow: /manjaro
@@ -73,6 +83,8 @@ Disallow: /osmc
 Disallow: /packman
 Disallow: /parrot
 Disallow: /percona
+Disallow: /postgresql
+Disallow: /
 Disallow: /puppy
 Disallow: /pybombs
 Disallow: /pypi
@@ -82,12 +94,16 @@ Disallow: /redhat
 Disallow: /remi
 Disallow: /repo-ck
 Disallow: /repoforge
+Disallow: /ros
 Disallow: /rpmfusion
 Disallow: /rubygems
 Disallow: /sagemath
 Disallow: /slackware
+Disallow: /steamos
+Disallow: /tensorflow
 Disallow: /termux
 Disallow: /ubuntu-cdimage
+Disallow: /ubuntu-cloud-images
 Disallow: /ubuntu-ports
 Disallow: /ubuntu-releases
 Disallow: /ubuntu

static/js/index.es6

@@ -124,7 +124,7 @@ var vmIso = new Vue({
 		$.getJSON("/static/isoinfo.json", function (isoinfo) {
 			self.distroList = isoinfo;
 			self.selected = self.curDistroList[0];
-			if (window.location.hash === '#iso-download') {
+			if (window.location.hash.match(/#iso-download(\?.*)?/)) {
 				$('#isoModal').modal();
 			}
 		});