summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Gordon <assafgordon@gmail.com>2014-11-05 01:19:20 (GMT)
committerA. Gordon <assafgordon@gmail.com>2014-11-05 01:19:20 (GMT)
commit655b6adca5679ad95f7417431aeb47b8105c9987 (patch)
tree6ada0099065bdb8d9c639ceca6aea3445493279f
parent19e1686d2b8ed8a4d85f618baf5d0849ad410182 (diff)
downloadgnu-sv-gitweb-655b6adca5679ad95f7417431aeb47b8105c9987.zip
gnu-sv-gitweb-655b6adca5679ad95f7417431aeb47b8105c9987.tar.gz
gnu-sv-gitweb-655b6adca5679ad95f7417431aeb47b8105c9987.tar.bz2
Update README, remove gitolite information
-rw-r--r--README.md63
-rw-r--r--web-server/README-webserver.md (renamed from webserver/README-webserver.md)0
-rw-r--r--web-server/apache-conf.d/lang.conf (renamed from webserver/apache-conf.d/lang.conf)0
-rw-r--r--web-server/apache-conf/010-www.gnu.org (renamed from webserver/apache-conf/010-www.gnu.org)0
-rw-r--r--web-server/apache-conf/025-www.nongnu.org (renamed from webserver/apache-conf/025-www.nongnu.org)0
-rw-r--r--web-server/apache-conf/030-star.nongnu.org (renamed from webserver/apache-conf/030-star.nongnu.org)0
-rw-r--r--web-server/apache-conf/www.gnu.org-common (renamed from webserver/apache-conf/www.gnu.org-common)0
-rwxr-xr-xweb-server/home-wwwcvs/update-gnu-rewritemaps (renamed from webserver/home-wwwcvs/update-gnu-rewritemaps)0
-rwxr-xr-x[-rw-r--r--]web-server/home-wwwcvs/update-symlinks-xargs.py (renamed from webserver/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/update-symlinks-xargs.py)0
-rwxr-xr-xweb-server/home-wwwcvs/update-symlinks.sh (renamed from webserver/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/update-symlinks.sh)0
-rwxr-xr-xweb-server/update-scripts/create-gnu-sv-www-repo.sh (renamed from webserver/update-scripts/create-gnu-sv-www-repo.sh)0
-rwxr-xr-xweb-server/update-scripts/update-all-gnu-sv-www-repo.sh (renamed from webserver/update-scripts/update-all-gnu-sv-www-repo.sh)0
-rwxr-xr-xweb-server/update-scripts/update-recent-gnu-sv-www-repo.sh (renamed from webserver/update-scripts/update-recent-gnu-sv-www-repo.sh)0
-rw-r--r--web-server/wwwcvs-orig-files/COPYING (renamed from webserver/wwwcvs-orig-files/COPYING)0
-rw-r--r--web-server/wwwcvs-orig-files/README (renamed from webserver/wwwcvs-orig-files/README)0
-rw-r--r--web-server/wwwcvs-orig-files/Vagrantfile (renamed from webserver/wwwcvs-orig-files/Vagrantfile)0
-rw-r--r--web-server/wwwcvs-orig-files/manifests/site.pp (renamed from webserver/wwwcvs-orig-files/manifests/site.pp)0
-rw-r--r--web-server/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/new.py (renamed from webserver/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/new.py)0
-rw-r--r--web-server/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/star.nongnu.org (renamed from webserver/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/star.nongnu.org)0
-rw-r--r--web-server/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/update-cvs.sh (renamed from webserver/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/update-cvs.sh)0
-rwxr-xr-xweb-server/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/update-gnu-rewritemaps (renamed from webserver/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/update-gnu-rewritemaps)0
-rw-r--r--[-rwxr-xr-x]web-server/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/update-symlinks-xargs.py (renamed from webserver/home-wwwcvs/update-symlinks-xargs.py)0
-rwxr-xr-xweb-server/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/update-symlinks.sh (renamed from webserver/home-wwwcvs/update-symlinks.sh)0
-rw-r--r--web-server/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/www.gnu.org (renamed from webserver/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/www.gnu.org)0
-rw-r--r--web-server/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/www.gnu.org-common (renamed from webserver/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/www.gnu.org-common)0
-rw-r--r--web-server/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/www.nongnu.org (renamed from webserver/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/www.nongnu.org)0
-rw-r--r--web-server/wwwcvs-orig-files/modules/wwwgnu-nongnu/manifests/init.pp (renamed from webserver/wwwcvs-orig-files/modules/wwwgnu-nongnu/manifests/init.pp)0
27 files changed, 40 insertions, 23 deletions
diff --git a/README.md b/README.md
index 5cfa8ca..a46b98e 100644
--- a/README.md
+++ b/README.md
@@ -1,37 +1,54 @@
-# GNU Savannah - WWWGIT project
+# GNU Savannah - WebGit migration Project
This project attempts to migrate the gnu.org/nongnu.org web authoring
infrastructure from CVS to GIT.
-See the `wwwgit.png` file for an overview of the suggested setup.
-
-The `savannah` directory contains scripts to extract relevant information from
-GNU Savannah's database (on `internal.sv.gnu.org`) to the git/web servers.
-
-The `wwwgit` directory contains the suggested setup for the WWWGIT server,
-containing the GIT repositories of the gnu.org websites (equivalent to
-'http://web.cvs.savannah.gnu.org/' today).
+To experiment, try:
-The 'webserver' directory contains the suggested setup for the public web
-server (equivalent to 'http://www.gnu.org/' and 'nongnu.org').
+Anonymous git clone: `git clone git://web.git.sv.gnu.org/web/<PROJECT>.git`
-To experiment with the current setup, visit:
+Read/Write access: `git clone <user>@web.git.sv.gnu.org:/srv/git/web/<PROJECT>.git`
-http://gitweb.housegordon.org
-http://gitweb.housegordon.org/gitweb/
-http://gitweb.housegordon.org/cgit/
-http://gitweb.housegordon.org/r/
-http://gitweb.housegordon.org/recent/ <- Automatically updated list
+Repository Web Access: <http://web.git.sv.gnu.org/> (user *demo*, password *demo*)
-http://gnu.housegordon.org/ <- (NOTE: there's a config error with multiviews,
- which defaults to non-english pages)
-http://gnu.housegordon.org/home.en.html
-http://gnu.housegordon.org/software/texinfo
+Public Web server (mock-up of 'http://gnu.org'):
-http://www.nongnu.housegordon.org/lwip
-http://lwip.nongnu.housegordon.org/
+ <http://gnu.housegordon.org/>
+or
+ http://nongnu.housegordon.org/<PROJECT>
+or
+ http://<PROJECT>.nongnu.housegordon.org/
If you're interested in helping, send please send an email to:
savannah-hackers-public@gnu.org (preferable, for public discussions)
agn at gnu dot org ( for private emails )
+## Repository content
+
+This repository contains a collection of configuration files, setup scripts,
+and instructions regarding the Git->CVS migration.
+
+`web-server` - The setup behind <http://gnu.housegordon.org> and by-proxy, the
+server of <http://www.gnu.org> .
+
+`vcs-server` - The setup on `vcs.sv.gnu.org` server .
+
+## Gitolite Setup
+
+An earlier version of this project used gitolite3 (instead of the simple
+SSH setup on `vcs.sv.gnu.org`.).
+
+The gitolite setup is not used, but since the work as already been done,
+it is saved here, for future reference.
+
+See the `wwwgit.png` file for an overview of the suggested setup.
+
+The `savannah` directory contains scripts to extract relevant information from
+GNU Savannah's database (on `internal.sv.gnu.org`) to the git/web servers to
+generate gitolite configuration of GNU Savannah users.
+
+The `wwwgit` directory contains the suggested setup for the WWWGIT server,
+containing the GIT repositories of the gnu.org websites (equivalent to
+'http://web.cvs.savannah.gnu.org/' today) using gitolite as access-control
+mechanism.
+
diff --git a/webserver/README-webserver.md b/web-server/README-webserver.md
index 3f59fe8..3f59fe8 100644
--- a/webserver/README-webserver.md
+++ b/web-server/README-webserver.md
diff --git a/webserver/apache-conf.d/lang.conf b/web-server/apache-conf.d/lang.conf
index 1ac108e..1ac108e 100644
--- a/webserver/apache-conf.d/lang.conf
+++ b/web-server/apache-conf.d/lang.conf
diff --git a/webserver/apache-conf/010-www.gnu.org b/web-server/apache-conf/010-www.gnu.org
index e6bd293..e6bd293 100644
--- a/webserver/apache-conf/010-www.gnu.org
+++ b/web-server/apache-conf/010-www.gnu.org
diff --git a/webserver/apache-conf/025-www.nongnu.org b/web-server/apache-conf/025-www.nongnu.org
index 2295c49..2295c49 100644
--- a/webserver/apache-conf/025-www.nongnu.org
+++ b/web-server/apache-conf/025-www.nongnu.org
diff --git a/webserver/apache-conf/030-star.nongnu.org b/web-server/apache-conf/030-star.nongnu.org
index b0a4347..b0a4347 100644
--- a/webserver/apache-conf/030-star.nongnu.org
+++ b/web-server/apache-conf/030-star.nongnu.org
diff --git a/webserver/apache-conf/www.gnu.org-common b/web-server/apache-conf/www.gnu.org-common
index f0545d9..f0545d9 100644
--- a/webserver/apache-conf/www.gnu.org-common
+++ b/web-server/apache-conf/www.gnu.org-common
diff --git a/webserver/home-wwwcvs/update-gnu-rewritemaps b/web-server/home-wwwcvs/update-gnu-rewritemaps
index 8e2cb61..8e2cb61 100755
--- a/webserver/home-wwwcvs/update-gnu-rewritemaps
+++ b/web-server/home-wwwcvs/update-gnu-rewritemaps
diff --git a/webserver/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/update-symlinks-xargs.py b/web-server/home-wwwcvs/update-symlinks-xargs.py
index 206fac6..206fac6 100644..100755
--- a/webserver/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/update-symlinks-xargs.py
+++ b/web-server/home-wwwcvs/update-symlinks-xargs.py
diff --git a/webserver/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/update-symlinks.sh b/web-server/home-wwwcvs/update-symlinks.sh
index c733e12..c733e12 100755
--- a/webserver/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/update-symlinks.sh
+++ b/web-server/home-wwwcvs/update-symlinks.sh
diff --git a/webserver/update-scripts/create-gnu-sv-www-repo.sh b/web-server/update-scripts/create-gnu-sv-www-repo.sh
index 8c2ea2c..8c2ea2c 100755
--- a/webserver/update-scripts/create-gnu-sv-www-repo.sh
+++ b/web-server/update-scripts/create-gnu-sv-www-repo.sh
diff --git a/webserver/update-scripts/update-all-gnu-sv-www-repo.sh b/web-server/update-scripts/update-all-gnu-sv-www-repo.sh
index 350e9cb..350e9cb 100755
--- a/webserver/update-scripts/update-all-gnu-sv-www-repo.sh
+++ b/web-server/update-scripts/update-all-gnu-sv-www-repo.sh
diff --git a/webserver/update-scripts/update-recent-gnu-sv-www-repo.sh b/web-server/update-scripts/update-recent-gnu-sv-www-repo.sh
index 65d6bf3..65d6bf3 100755
--- a/webserver/update-scripts/update-recent-gnu-sv-www-repo.sh
+++ b/web-server/update-scripts/update-recent-gnu-sv-www-repo.sh
diff --git a/webserver/wwwcvs-orig-files/COPYING b/web-server/wwwcvs-orig-files/COPYING
index dba13ed..dba13ed 100644
--- a/webserver/wwwcvs-orig-files/COPYING
+++ b/web-server/wwwcvs-orig-files/COPYING
diff --git a/webserver/wwwcvs-orig-files/README b/web-server/wwwcvs-orig-files/README
index 1a9ec1d..1a9ec1d 100644
--- a/webserver/wwwcvs-orig-files/README
+++ b/web-server/wwwcvs-orig-files/README
diff --git a/webserver/wwwcvs-orig-files/Vagrantfile b/web-server/wwwcvs-orig-files/Vagrantfile
index 0e6fd43..0e6fd43 100644
--- a/webserver/wwwcvs-orig-files/Vagrantfile
+++ b/web-server/wwwcvs-orig-files/Vagrantfile
diff --git a/webserver/wwwcvs-orig-files/manifests/site.pp b/web-server/wwwcvs-orig-files/manifests/site.pp
index 4967dce..4967dce 100644
--- a/webserver/wwwcvs-orig-files/manifests/site.pp
+++ b/web-server/wwwcvs-orig-files/manifests/site.pp
diff --git a/webserver/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/new.py b/web-server/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/new.py
index dd455a6..dd455a6 100644
--- a/webserver/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/new.py
+++ b/web-server/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/new.py
diff --git a/webserver/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/star.nongnu.org b/web-server/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/star.nongnu.org
index aaaccc1..aaaccc1 100644
--- a/webserver/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/star.nongnu.org
+++ b/web-server/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/star.nongnu.org
diff --git a/webserver/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/update-cvs.sh b/web-server/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/update-cvs.sh
index 62ac513..62ac513 100644
--- a/webserver/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/update-cvs.sh
+++ b/web-server/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/update-cvs.sh
diff --git a/webserver/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/update-gnu-rewritemaps b/web-server/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/update-gnu-rewritemaps
index 96b78ef..96b78ef 100755
--- a/webserver/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/update-gnu-rewritemaps
+++ b/web-server/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/update-gnu-rewritemaps
diff --git a/webserver/home-wwwcvs/update-symlinks-xargs.py b/web-server/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/update-symlinks-xargs.py
index 206fac6..206fac6 100755..100644
--- a/webserver/home-wwwcvs/update-symlinks-xargs.py
+++ b/web-server/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/update-symlinks-xargs.py
diff --git a/webserver/home-wwwcvs/update-symlinks.sh b/web-server/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/update-symlinks.sh
index c733e12..c733e12 100755
--- a/webserver/home-wwwcvs/update-symlinks.sh
+++ b/web-server/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/update-symlinks.sh
diff --git a/webserver/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/www.gnu.org b/web-server/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/www.gnu.org
index 2538442..2538442 100644
--- a/webserver/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/www.gnu.org
+++ b/web-server/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/www.gnu.org
diff --git a/webserver/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/www.gnu.org-common b/web-server/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/www.gnu.org-common
index 7937796..7937796 100644
--- a/webserver/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/www.gnu.org-common
+++ b/web-server/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/www.gnu.org-common
diff --git a/webserver/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/www.nongnu.org b/web-server/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/www.nongnu.org
index f8b3226..f8b3226 100644
--- a/webserver/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/www.nongnu.org
+++ b/web-server/wwwcvs-orig-files/modules/wwwgnu-nongnu/files/www.nongnu.org
diff --git a/webserver/wwwcvs-orig-files/modules/wwwgnu-nongnu/manifests/init.pp b/web-server/wwwcvs-orig-files/modules/wwwgnu-nongnu/manifests/init.pp
index c6e50a2..c6e50a2 100644
--- a/webserver/wwwcvs-orig-files/modules/wwwgnu-nongnu/manifests/init.pp
+++ b/web-server/wwwcvs-orig-files/modules/wwwgnu-nongnu/manifests/init.pp