OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 28-Mar-2003 21:59:58
Branch: HEAD Handle: 2003032820595600
Added files:
openpkg-src/pks pks-apache.conf pks.html
Modified files:
openpkg-src/pks pks.spec pksd.conf rc.pks
Log:
and one more round for bugfixing and enhancing the PKS packaging
Summary:
Revision Changes Path
1.1 +19 -0 openpkg-src/pks/pks-apache.conf
1.1 +52 -0 openpkg-src/pks/pks.html
1.3 +14 -11 openpkg-src/pks/pks.spec
1.2 +7 -5 openpkg-src/pks/pksd.conf
1.3 +2 -2 openpkg-src/pks/rc.pks
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/pks/pks-apache.conf
============================================================================
$ cvs diff -u -r0 -r1.1 pks-apache.conf
--- /dev/null 2003-03-28 21:59:57.000000000 +0100
+++ pks-apache.conf 2003-03-28 21:59:57.000000000 +0100
@@ -0,0 +1,19 @@
+##
+## pks-apache.conf -- Apache Virtual Host Configuration for PKS
+##
+
+Listen 127.0.0.1:80
+
+NameVirtualHost 127.0.0.1:80
+
+<VirtualHost 127.0.0.1>
+ ServerName pks.exampke.com
+ DocumentRoot @l_prefix@/pub/pks
+ <Directory @l_prefix@/pub/pks>
+ Options none
+ AllowOverride none
+ </Directory>
+ ProxyPass /pks http://127.0.0.1:11371/pks
+ ProxyPassReverse /pks http://127.0.0.1:11371/pks
+</VirtualHost>
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pks/pks.html
============================================================================
$ cvs diff -u -r0 -r1.1 pks.html
--- /dev/null 2003-03-28 21:59:57.000000000 +0100
+++ pks.html 2003-03-28 21:59:58.000000000 +0100
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+<html xmlns="http://www.w3.org/1999/xhtml";>
+ <head>
+ <title>OpenPGP Public Key Server</title>
+ </head>
+ <body>
+ <h1>OpenPGP Public Key Server</h1>
+ <hr />
+ <h2>
+ <a id="extract" name="extract">Extracting a OpenPKG Key</a>
+ </h2>
+ <form action="/pks/lookup" method="get">
+ <p>Index:
+ <input type="radio" name="op" value="index" checked="checked" />
+ Verbose Index:
+ <input type="radio" name="op" value="vindex" />
+ </p>
+ <p>Search String:
+ <input name="search" size="40" />
+ </p>
+ <p>
+ <input type="checkbox" name="fingerprint" />
+ Show OpenPGP "fingerprints" for keys</p>
+ <p>
+ <input type="checkbox" name="exact" />
+ Only return exact matches</p>
+ <p>
+ <input type="reset" value="Reset" />
+
+ <input type="submit" value="Search!" />
+ </p>
+ </form>
+ <hr />
+ <h2>
+ <a id="submit" name="submit">Submitting a new OpenPHP Key</a>
+ </h2>
+ <form action="/pks/add" method="post">
+ <p>Enter ASCII-armored OpenPGP key here:</p>
+ <p>
+ <textarea name="keytext" rows="20" cols="66"></textarea>
+ </p>
+ <p>
+ <input type="reset" value="Reset" />
+
+ <input type="submit" value="Submit!" />
+ </p>
+ </form>
+ <hr />
+ </body>
+</html>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pks/pks.spec
============================================================================
$ cvs diff -u -r1.2 -r1.3 pks.spec
--- openpkg-src/pks/pks.spec 28 Mar 2003 19:06:56 -0000 1.2
+++ openpkg-src/pks/pks.spec 28 Mar 2003 20:59:56 -0000 1.3
@@ -41,6 +41,8 @@
Source2: rc.pks
Source3: pksd.conf
Source4: pks-mail.c
+Source5: pks.html
+Source6: pks-apache.conf
# build information
Prefix: %{l_prefix}
@@ -87,24 +89,18 @@
rm -rf $RPM_BUILD_ROOT%{l_prefix}/include/db2
rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/db2
rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/db_*
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/var/%{name}/index.html
mv $RPM_BUILD_ROOT%{l_prefix}/bin/pks-queue-run.sh \
$RPM_BUILD_ROOT%{l_prefix}/bin/pks-queue-run
mv $RPM_BUILD_ROOT%{l_prefix}/var/%{name}/incoming \
$RPM_BUILD_ROOT%{l_prefix}/var/%{name}/queue
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
- # remove non-English language files
- mv $RPM_BUILD_ROOT%{l_prefix}/share/pks/pks_help.en \
- $RPM_BUILD_ROOT%{l_prefix}/share/pks/pks_help.EN
- rm -f $RPM_BUILD_ROOT%{l_prefix}/share/pks/pks_help.[a-z]*
- mv $RPM_BUILD_ROOT%{l_prefix}/share/pks/pks_help.EN \
- $RPM_BUILD_ROOT%{l_prefix}/share/pks/pks_help.en
-
# install HTML top-level page
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/pub/%{name}
- mv $RPM_BUILD_ROOT%{l_prefix}/var/%{name}/index.html \
- $RPM_BUILD_ROOT%{l_prefix}/pub/%{name}/index.html
+ %{l_shtool} install -c -m 644 \
+ %{SOURCE pks.html} $RPM_BUILD_ROOT%{l_prefix}/pub/%{name}/index.html
# install suid wrapper for pks-mail
%{l_shtool} mkdir -f -p -m 755 \
@@ -133,6 +129,9 @@
%{l_shtool} install -c -m 644 \
-e 's;@l_prefix@;%{l_prefix};g' \
%{SOURCE pksd.conf} $RPM_BUILD_ROOT%{l_prefix}/etc/%{name}/
+ %{l_shtool} install -c -m 644 \
+ -e 's;@l_prefix@;%{l_prefix};g' \
+ %{SOURCE pks-apache.conf} $RPM_BUILD_ROOT%{l_prefix}/etc/%{name}/
# determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
@@ -151,13 +150,17 @@
%post
if [ $1 -eq 1 ]; then
# create initial database
- su - %{l_rusr} "%{l_prefix}/bin/pksclient %{l_prefix}/var/%{name}/db
create" # >/dev/null 2>&1
+ su - %{l_rusr} -c "%{l_prefix}/bin/pksclient \
+ %{l_prefix}/var/%{name}/db create" >/dev/null 2>&1
+ su - %{l_rusr} -c "%{l_prefix}/bin/pksclient \
+ %{l_prefix}/var/%{name}/db add %{l_prefix}/etc/openpkg/openpkg.pgp"
>/dev/null 2>&1
# activate in MTA configuration
mta_aliases_file=`%{l_prefix}/etc/rc --query mta_aliases_file`
mta_aliases_update=`%{l_prefix}/etc/rc --query mta_aliases_update`
if [ ".$mta_aliases_file" != . ]; then
- ( echo "pks-request: \"|%{l_prefix}/bin/pks-mail
%{l_prefix}/etc/%{name}/pksd.conf\""
+ ( echo "pks: pks-request"
+ echo "pks-request: \"|%{l_prefix}/bin/pks-mail
%{l_prefix}/etc/%{name}/pksd.conf\""
echo "pks-daemon: MAILER-DAEMON"
echo "pks-admin: postmaster"
echo "pgp-public-keys: pks-request"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pks/pksd.conf
============================================================================
$ cvs diff -u -r1.1 -r1.2 pksd.conf
--- openpkg-src/pks/pksd.conf 28 Mar 2003 13:12:54 -0000 1.1
+++ openpkg-src/pks/pksd.conf 28 Mar 2003 20:59:56 -0000 1.2
@@ -7,20 +7,22 @@
socket_name @l_prefix@/var/pks/pksd.ctl
www_dir @l_prefix@/var/pks
+www_addr 127.0.0.1
www_port 11371
www_readonly 0
-maintainer_email PGP Key Server Administrator <[EMAIL PROTECTED]>
+maintainer_email OpenPGP Key Server Administrator <[EMAIL PROTECTED]>
mail_delivery_client @l_prefix@/sbin/sendmail -t -oi -fpks-daemon
mail_intro_file @l_prefix@/share/pks/mail_intro
mail_dir @l_prefix@/var/pks/queue
help_dir @l_prefix@/share/pks
default_language EN
-#this_site [EMAIL PROTECTED]
+#this_site [EMAIL PROTECTED]
#syncsite [EMAIL PROTECTED]
#syncsite [EMAIL PROTECTED]
-#max_last -1
-#max_last_reply_keys -1
-#max_reply_keys -1
+
+max_last 20
+max_last_reply_keys 20
+max_reply_keys 20
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pks/rc.pks
============================================================================
$ cvs diff -u -r1.2 -r1.3 rc.pks
--- openpkg-src/pks/rc.pks 28 Mar 2003 19:06:56 -0000 1.2
+++ openpkg-src/pks/rc.pks 28 Mar 2003 20:59:56 -0000 1.3
@@ -14,8 +14,8 @@
sleep 2
(nohup @l_prefix@/bin/pks-queue-run \
@l_prefix@/etc/pks/pksd.conf \
- </dev/null >/dev/null 2>&1 &) >/dev/null 2>&1
- echo "$!" >@l_prefix@/var/pks/pks-queue-run.pid
+ </dev/null >/dev/null 2>&1 &
+ echo "$!" >@l_prefix@/var/pks/pks-queue-run.pid ) >/dev/null 2>&1
%stop -p 200 -u @l_rusr@
opServiceEnabled pks || exit 0
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
