From f3d2ba47dbf31d32e5a4f044fecde9e92def9897 Mon Sep 17 00:00:00 2001 From: tausq <> Date: Wed, 4 Sep 2002 13:03:45 +0000 Subject: [PATCH] web headers/footers update from Josip --- web/.wmlrc | 16 +++--- web/Makefile | 48 +++++++++++++----- web/doc-direct.html | 110 ++++++++++++++++++++++++---------------- web/doc-direct.wml | 3 +- web/doc-general.html | 110 ++++++++++++++++++++++++---------------- web/doc-general.wml | 3 +- web/doc-mail.html | 111 ++++++++++++++++++++++++---------------- web/doc-mail.wml | 3 +- web/forward.html | 110 ++++++++++++++++++++++++---------------- web/forward.wml | 3 +- web/hostinfo.html | 112 +++++++++++++++++++++++++---------------- web/hostinfo.wml | 2 +- web/login.html | 112 +++++++++++++++++++++++++---------------- web/login.wml | 3 +- web/password.html | 110 ++++++++++++++++++++++++---------------- web/password.wml | 3 +- web/searchform.html | 112 +++++++++++++++++++++++++---------------- web/searchform.wml | 3 +- web/searchhelp.html | 112 +++++++++++++++++++++++++---------------- web/searchhelp.wml | 3 +- web/searchresults.html | 110 ++++++++++++++++++++++++---------------- web/searchresults.wml | 3 +- web/update.html | 112 +++++++++++++++++++++++++---------------- web/update.wml | 3 +- 24 files changed, 806 insertions(+), 511 deletions(-) diff --git a/web/.wmlrc b/web/.wmlrc index 34a7596..2320f93 100644 --- a/web/.wmlrc +++ b/web/.wmlrc @@ -1,14 +1,10 @@ -D WML_SRC_REALNAME="Debian Webmaster" -D WML_SRC_USERNAME=webmaster -D WML_GEN_HOSTNAME=debian.org --D WWWDO=http://www.debian.org --D HOME=. --D ENGLISHDIR=../english --D CUR_LANG=English --D CUR_ISO_LANG=en --D PICS=/Pics --D INTRO=http://www.debian.org/intro --D DISTRIB=http://www.debian.org/distrib --D HTMLDIR=. --D CHARSET=iso-8859-1 +-D CUR_ISO_LANG="en" -I template +-D SEARCH="http://search.debian.org/" +-D INTRO="http://www.debian.org/intro" +-D DISTRIB="http://www.debian.org/distrib" +-D HOME="http://www.debian.org" +-D PICS="http://www.debian.org/Pics" diff --git a/web/Makefile b/web/Makefile index 011421b..a98cdda 100644 --- a/web/Makefile +++ b/web/Makefile @@ -1,16 +1,40 @@ -# This Makefile should need no changes from webwml/english/Makefile -# Please send a message to debian-www if you need to modify anything -# so the problem can be fixed. +# special Makefile +# requires a checkout of webwml/template/debian from the webwml tree! -WMLBASE=. -CUR_DIR= -# list any subdirectories in the following variable. Any directories listed -# must exist or the make will not work -SUBS= +TEMPLDIR := ../../webwml/english/template/debian +DEBTEMPLATES := $(wildcard $(TEMPLDIR)/*.wml) \ + $(TEMPLDIR)/countries.def \ + $(TEMPLDIR)/language_names.def \ + $(wildcard template/*.wml) \ + .wmlrc +TARGETDIR := /var/www/userdir-ldap -include $(WMLBASE)/Make.lang -include $(WMLBASE)/Make.common +WMLFILES := $(wildcard *.wml) +HTMLFILES := $(subst .wml,.html,$(WMLFILES)) +DESTHTMLFILES := $(patsubst %.wml,$(TARGETDIR)/%.html,$(WMLFILES)) +OTHERFILES := $(wildcard *.cgi) $(wildcard *.cfg) $(wildcard *.tab) +DESTOTHERFILES := $(patsubst %,$(TARGETDIR)/%,$(OTHERFILES)) -include $(WMLBASE)/Make.dep.generic -include $(WMLBASE)/Make.dep.templ +WML_DEFS := -I $(subst /debian,,$(TEMPLDIR)) +all: $(HTMLFILES) + +%.html: %.wml $(DEBTEMPLATES) + wml $(WML_DEFS) $< -o UNDEFuEN:$@ + +install: $(DESTHTMLFILES) $(DESTOTHERFILES) + +$(DESTHTMLFILES) $(DESTOTHERFILES): $(TARGETDIR)/%: % + @test -d $(TARGETDIR) || mkdir -p $(TARGETDIR) + install -m 644 -p $(@F) $(TARGETDIR) + +clean: + rm -f $(HTMLFILES) + +$(TEMPLDIR)/countries.def: $(TEMPLDIR)/countries.wml + cd $(TEMPLDIR) && sed -e /^#/d countries.wml | eperl -B '<:' -E ':>' - >/dev/null + +$(TEMPLDIR)/language_names.def: $(TEMPLDIR)/language_names.wml + cd $(TEMPLDIR) && sed -e '/^#/d' -e '/^<:/,/^:>/!d' language_names.wml | eperl -B '<:' -E ':>' - >/dev/null + +.SUFFIXES: diff --git a/web/doc-direct.html b/web/doc-direct.html index 536fe73..9dc1f48 100644 --- a/web/doc-direct.html +++ b/web/doc-direct.html @@ -1,37 +1,55 @@ - - -
-- - - | -
- - - - - - - - | -
+ + + | +
+ + | ++ + + + + + + + | ++ + | +
+ + | ++ + | +
The LDAP utilities package provides a program called ldapsearch that can be used to execute direct queries to the database. Generally this is done by @@ -89,13 +107,19 @@ it to work, please email if you have any luck. To my knowledge there are no interfaces for popular mailers like mutt and gnus. Such an interface would allow using the directory as an enhanced address book. -
Back to the Debian Project homepage. -
-Last Modified: Wed, Oct 25 05:43:55 UTC 2000
-Copyright © 1997-1999 SPI; See license terms
-
-
-
-
+
+
+Last Modified: Fri, Jul 12 17:23:30 UTC 2002
+
+ Copyright © 1997-2002
+ SPI; See license terms
+
+
+
diff --git a/web/doc-direct.wml b/web/doc-direct.wml
index fc6b74b..3d285b8 100644
--- a/web/doc-direct.wml
+++ b/web/doc-direct.wml
@@ -1,4 +1,5 @@
-#use wml::debian::template title="Direct LDAP Access"
+#use wml::db.d.o title="Direct LDAP Access"
+
The LDAP utilities package provides a program called ldapsearch that can be used to execute direct queries to the database. Generally this is done by diff --git a/web/doc-general.html b/web/doc-general.html index 40de257..99d7d04 100644 --- a/web/doc-general.html +++ b/web/doc-general.html @@ -1,37 +1,55 @@ - - -
-- - - | -
- - - - - - - - | -
+ + + | +
+ + | ++ + + + + + + + | ++ + | +
+ + | ++ + | +
debian.org uses a single LDAP driven directory for account management across all the project run machines. This directory @@ -71,13 +89,19 @@ The directory has several means to access it:
Lost or forgotten password instructions -
Back to the Debian Project homepage. -
-Last Modified: Wed, Oct 25 05:38:37 UTC 2000
-Copyright © 1997-1999 SPI; See license terms
-
-
-
-
+
+
+Last Modified: Fri, Jul 12 17:23:30 UTC 2002
+
+ Copyright © 1997-2002
+ SPI; See license terms
+
+
+
diff --git a/web/doc-general.wml b/web/doc-general.wml
index 697847b..61419c7 100644
--- a/web/doc-general.wml
+++ b/web/doc-general.wml
@@ -1,4 +1,5 @@
-#use wml::debian::template title="General LDAP Documentation"
+#use wml::db.d.o title="General LDAP Documentation"
+
debian.org uses a single LDAP driven directory for account management across all the project run machines. This directory diff --git a/web/doc-mail.html b/web/doc-mail.html index 2bf46cb..5a38975 100644 --- a/web/doc-mail.html +++ b/web/doc-mail.html @@ -1,37 +1,56 @@ - - -
-- - - | -
- - - - - - - - | -
+ + + | +
+ + | ++ + + + + + + + | ++ + | +
+ + | ++ + | +
The LDAP directory has a PGP secured mail gateway that allows users to safely and conveniently effect changes to their entries. It makes use of PGP signed input messages to positively identify the user and @@ -128,13 +147,19 @@ are pgp -fast which does the same as gpg --clearsign Debian.org machines rely on secured replication to transfer login data out of the database. Replication is performed at 15 min intervals so it can take a short while before any changes made take effect. -
Back to the Debian Project homepage. -
-Last Modified: Thu, Feb 1 03:30:27 UTC 2001
-Copyright © 1997-1999 SPI; See license terms
-
-
-
-
+
+
+Last Modified: Fri, Jul 12 17:23:30 UTC 2002
+
+ Copyright © 1997-2002
+ SPI; See license terms
+
+
+
diff --git a/web/doc-mail.wml b/web/doc-mail.wml
index 4da0f8f..43a0408 100644
--- a/web/doc-mail.wml
+++ b/web/doc-mail.wml
@@ -1,5 +1,6 @@
-#use wml::debian::template title="LDAP Gateway"
+#use wml::db.d.o title="LDAP Gateway"
+
The LDAP directory has a PGP secured mail gateway that allows users to safely and conveniently effect changes to their entries. It makes use of PGP signed input messages to positively identify the user and diff --git a/web/forward.html b/web/forward.html index 48bc866..41c670b 100644 --- a/web/forward.html +++ b/web/forward.html @@ -1,37 +1,55 @@ - - -
-- - - | -
- - - - - - - - | -
+ + + | +
+ + | ++ + + + + + + + | ++ + | +
+ + | ++ + | +
Emails to @debian.org addresses now go through a LDAP distributed email system. This system uses the forwarding field in the LDAP directory to route mail @@ -105,13 +123,19 @@ unrelated to the actual contents of the message:
Such that, $RECIPIENT = $LOCAL-$EXTENSION@<something>. -
Back to the Debian Project homepage. -
-Last Modified: Tue, Nov 7 05:53:34 UTC 2000
-Copyright © 1997-1999 SPI; See license terms
-
-
-
-
+
+
+Last Modified: Fri, Jul 12 17:23:30 UTC 2002
+
+ Copyright © 1997-2002
+ SPI; See license terms
+
+
+
diff --git a/web/forward.wml b/web/forward.wml
index 172ef01..a07030c 100644
--- a/web/forward.wml
+++ b/web/forward.wml
@@ -1,4 +1,5 @@
-#use wml::debian::template title="Email Forwarding"
+#use wml::db.d.o title="Email Forwarding"
+
Emails to @debian.org addresses now go through a LDAP distributed email system. This system uses the forwarding field in the LDAP directory to route mail diff --git a/web/hostinfo.html b/web/hostinfo.html index 38fbd02..1b3d254 100644 --- a/web/hostinfo.html +++ b/web/hostinfo.html @@ -1,38 +1,56 @@ - - -
-- - - | -
- - - - - - - - | -
+ + + | +
+ + | ++ + + + + + + + | ++ + | +
+ + | ++ + | +
Lookup: @@ -50,13 +68,19 @@ |
Back to the Debian Project homepage. -
-Last Modified: Thu, Sep 30 05:38:06 UTC 1999
-Copyright © 1997-1999 SPI; See license terms
-
-
-
-
+
+
+Last Modified: Fri, Jul 12 17:23:30 UTC 2002
+
+ Copyright © 1997-2002
+ SPI; See license terms
+
+
+
diff --git a/web/hostinfo.wml b/web/hostinfo.wml
index d9e7f25..4a5fc81 100644
--- a/web/hostinfo.wml
+++ b/web/hostinfo.wml
@@ -1,4 +1,4 @@
-#use wml::debian::template title="debian.org Developer Machines"
+#use wml::db.d.o title="debian.org Developer Machines"