And/or please give me r/w access since I posted this to hackers-private
a while ago and it got forgotten a bit.
Index: Mirroring.mdwn
===================================================================
--- Mirroring.mdwn (revision 347)
+++ Mirroring.mdwn (working copy)
@@ -64,17 +64,18 @@
The nginx configuration files are:
`download0:/etc/nginx/sites-available/ftpmirror`,
`download0:/etc/nginx/sites-available/ftpmirror-common.inc`,
+`download0:/etc/nginx/sites-available/ftpmirror-common-https.inc`,
`download0:/etc/nginx/sites-available/download`,
-`download0:/etc/nginx/sites-available/download-common.inc`.
-The `*-common.inc` files contain the cgi configurations.
-The other files include them twice (once for http, once for https.
-**TODO:** consolidate them, like Bob did for `vcs0`).
+`download0:/etc/nginx/sites-available/download-common.inc`,
+`download0:/etc/nginx/sites-available/download-common-https.inc`.
+The `*-common*.inc` files contain the cgi configurations.
+The other files include them twice (once for http, once for https).
-The CGI configuration for `gnu/ftpmirror` is:
+The https CGI configuration for `gnu/ftpmirror` is:
location / {
fastcgi_param PATH_INFO $uri;
- fastcgi_param MIRROR_FILE /opt/savannah/mirror-lists/gnu-ftpmirrors.txt;
+ fastcgi_param MIRROR_FILE /opt/savannah/mirrors/active-mirror-lists/gnu-ftpmirrors.txt;
fastcgi_param SCRIPT_FILENAME /opt/savannah/cgi-bin/mirrors/mirror-redirect.pl;
include fastcgi_params;
fastcgi_pass unix:/var/run/fcgiwrap.socket;
@@ -101,10 +102,12 @@
fastcgi_pass unix:/var/run/fcgiwrap.socket;
}
+The https versions substitute *mirrors.txt with *mirrors-https.txt
+
The mirror list text files (`gnu-ftpmirror` and `download-mirrors.txt`)
contain an auto-generated list of active mirrors:
- # head -n5 /opt/savannah/mirrors/active-mirror-lists/gnu-ftpmirror
+ # head -n5 /opt/savannah/mirrors/active-mirror-lists/gnu-ftpmirrors.txt
http://mirror.tochlab.net/pub/gnu/ ru
http://mirror.cedia.org.ec/gnu/ ec
http://www.gutscheinrausch.de/mirror/gnu/ de
@@ -193,14 +196,16 @@
5. Two auxiliary scripts
`/opt/savannah/mirrors/scripts/update-active-mirrors-{gnu,nongnu}.sh`
- read the gnu/nongnu state files, and generate a simple text file
+ read the gnu/nongnu state files, and generate a simple text files
containing only the active and up-to-date mirrors:
$ ls -1 /opt/savannah/mirrors/active-mirror-lists/
+ download-mirrors-https.txt
download-mirrors.txt
+ gnu-ftpmirrors-https.txt
gnu-ftpmirrors.txt
- These are the two files used in the nginx/cgi scripts (see above section).
+ These are the four files used in the nginx/cgi scripts (see above section).
6. The 3 mirmon invocations are executed as cronjobs in
@@ -258,6 +263,8 @@
The active mirror list files should have similar timestamp:
# ls -lhog /opt/savannah/mirrors/active-mirror-lists/
- total 8.0K
- -rw-r--r-- 1 869 Feb 21 20:32 download-mirrors.txt
- -rw-r--r-- 1 2.6K Feb 21 20:22 gnu-ftpmirrors.txt
+ total 16K
+ -rw-r--r-- 1 415 Oct 15 16:32 download-mirrors-https.txt
+ -rw-r--r-- 1 1.1K Oct 15 16:32 download-mirrors.txt
+ -rw-r--r-- 1 626 Oct 15 16:22 gnu-ftpmirrors-https.txt
+ -rw-r--r-- 1 2.8K Oct 15 16:22 gnu-ftpmirrors.txt
