summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Gordon <assafgordon@gmail.com>2014-11-05 04:35:32 (GMT)
committerA. Gordon <assafgordon@gmail.com>2014-11-05 04:35:32 (GMT)
commita65ced60307a99b9f54960bc9b39ccec392ed3ac (patch)
tree8c9e4279350e2220ce8934eb90f673610d8a0937
parent1d9c3c2c99d464c08735fda9d043b89e129dd672 (diff)
downloadgnu-sv-gitweb-a65ced60307a99b9f54960bc9b39ccec392ed3ac.zip
gnu-sv-gitweb-a65ced60307a99b9f54960bc9b39ccec392ed3ac.tar.gz
gnu-sv-gitweb-a65ced60307a99b9f54960bc9b39ccec392ed3ac.tar.bz2
web-server: update README with update-scripts informationdev/webserver2
-rw-r--r--web-server/README-webserver.md17
1 files changed, 11 insertions, 6 deletions
diff --git a/web-server/README-webserver.md b/web-server/README-webserver.md
index a53ee87..7594c18 100644
--- a/web-server/README-webserver.md
+++ b/web-server/README-webserver.md
@@ -79,13 +79,15 @@ The update scripts on this server can simply create new project when they see on
1. The CGI script 'new.py' is exposed by 'gnu.org' apache configuration.
calling it with the project name,type,vcs will create a marker file
in `/usr/local/to-update-git` or `/usr/local/to-update` .
-2. A cron job calls `update-git.sh` script running as `wwwgit` user.
- The script reads the marker files, and does a `git pull` for each project.
-3. Both of the above scripts write messages to syslog with the
- `savannah-update` tag.
-4. rsyslog is configured to write these messages to a log file in
+2. The script `update-git-watch.sh` uses INotify to wait for updates in the
+ above directories. Once updated (a new marker file created by `new.py`),
+ it runs `update-git.sh`.
+3. The `update-git.sh` script reads the marker files, and does a
+ `git pull` for each project.
+4. The above scripts write messages to syslog with the `savannah-update` tag.
+5. rsyslog is configured to write these messages to a log file in
`/var/www/log/savannah-updates.log`.
-5. A CGI script `/var/www/log/show-updates.sh` is exposed in `nongnu.org`
+6. A CGI script `/var/www/log/show-updates.sh` is exposed in `nongnu.org`
and shows the tail of the update log.
Configuration steps:
@@ -116,6 +118,9 @@ Configuration steps:
# Add the rsyslogd configuration file
sudo cp ./rsyslog-conf/10-savannah-updates.conf /etc/rsyslog.d/
+ # Run the watch script (TODO: run it as a daemon)
+ sudo -u wwwgit nohup ./update-scripts/update-git-watch.sh &
+
To trigger an update, run (from `fencepost.gnu.org`):
curl 'http://gnu.housegordon.org/new-savannah-project/new.py?type=gnu&project=autoconf&vcs=git'