OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 07-Mar-2003 17:58:26
Branch: HEAD Handle: 2003030716582202
Added files:
openpkg-src/poweradmin poweradmin.conf poweradmin.patch
Modified files:
openpkg-src/poweradmin poweradmin.spec
openpkg-web news.txt
Log:
polishing, apache config
Summary:
Revision Changes Path
1.1 +31 -0 openpkg-src/poweradmin/poweradmin.conf
1.1 +81 -0 openpkg-src/poweradmin/poweradmin.patch
1.3 +38 -13 openpkg-src/poweradmin/poweradmin.spec
1.3608 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/poweradmin/poweradmin.conf
============================================================================
$ cvs diff -u -r0 -r1.1 poweradmin.conf
--- /dev/null 2003-03-07 17:58:25.000000000 +0100
+++ poweradmin.conf 2003-03-07 17:58:26.000000000 +0100
@@ -0,0 +1,31 @@
+##
+## apache.vhost -- Apache Virtual Host Configuration Template
+## ______________________________________________________
+##
+## PLEASE DO NOT EDIT THIS TEMPLATE!! COPY IT TO "apache.vhost-xxx",
+## REMOVE THIS COMMENT AND EDIT THAT FILE INSTEAD, PLEASE!
+## ______________________________________________________
+##
+
+<VirtualHost localhost:80>
+ # server information
+ ServerName www.foo.com
+ ServerAlias www.foo.net www.foo.org
+ ServerAdmin [EMAIL PROTECTED]
+ ServerSignature on
+
+ # document area
+ DocumentRoot /cw/libexec/poweradmin/htdocs/
+ <Directory "/cw/libexec/poweradmin/htdocs/">
+ Options Indexes FollowSymlinks
+ AllowOverride None
+ Order allow,deny
+ Allow from all
+ DirectoryIndex index.php
+ </Directory>
+ <Directory "/cw/libexec/poweradmin/htdocs/inc/">
+ Order deny,allow
+ Deny from all
+ </Directory>
+</VirtualHost>
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/poweradmin/poweradmin.patch
============================================================================
$ cvs diff -u -r0 -r1.1 poweradmin.patch
--- /dev/null 2003-03-07 17:58:25.000000000 +0100
+++ poweradmin.patch 2003-03-07 17:58:26.000000000 +0100
@@ -0,0 +1,81 @@
+--- inc/config-block.inc.php.dist Fri Feb 28 10:08:24 2003
++++ inc/config-block.inc.php Fri Feb 28 10:11:13 2003
+@@ -29,13 +29,12 @@
+
+ // $BASE_URL
+ // This will be the main URI you will use to connect to PowerAdmin.
+-// For instance: "http://poweradmin.sjeemz.nl";
+-$BASE_URL = "http://wwww.poweradmin.org";;
++$BASE_URL = "http://localhost/";;
+
+ // $BASE_PATH
+ // If PowerAdmin is in a subdir. Specify this here
+-// For instance: "/admin/"
+-$BASE_PATH = "/PowerAdmin/";
++// f.e. /admin/
++$BASE_PATH = "/";
+
+
+ /* DNS Record information */
+@@ -43,18 +42,17 @@
+
+ // $HOSTMASTER
+ // The email address of the hostmaster you want to be mailed.
+-// For instance: "[EMAIL PROTECTED]"
+-$HOSTMASTER = "[EMAIL PROTECTED]";
++$HOSTMASTER = "[EMAIL PROTECTED]";
+
+ // $NS1
+ // Your first nameserver
+ // Should be a domainname! Not an IP.
+-$NS1 = "ns1.trancer.nl";
++$NS1 = "ns1.example.com";
+
+ // $NS2
+ // Your second nameserver.
+ // If you dont have a second nameserver, fill in the same value as $NS1
+-$NS2 = "ns2.trancer.nl";
++$NS2 = "ns2.example.com";
+
+
+ /* You dont have to edit these fields. Change them if you want. */
+@@ -87,7 +85,7 @@
+ $NAME_LEVEL_10 = "Administrator w/ user admin rights";
+
+ // Enable fancy records or not (http://doc.powerdns.com/fancy-records.html)?
true/false
+-$FANCY_RECORDS = true;
++$FANCY_RECORDS = false;
+
+ // Master or slave functionality. Set this to either true or false.
+ // This field indicates if you are running in a MASTER/SLAVE setup or in a NATIVE
setup.
+@@ -107,13 +105,13 @@
+ /* -------------------------------------------------------------------- */
+
+ // $rtypes - array of possible record types
+-$rtypes = array('A', 'AAAA', 'CNAME', 'HINFO', 'MX', 'NAPTR', 'NS', 'PTR', 'SOA',
'TXT');
++$rtypes = array('A', 'AAAA', 'CNAME', 'HINFO', 'MX', 'NAPTR', 'NS', 'PTR', 'SOA',
'TXT', 'LOC' );
+
+ // If fancy records is enabled, extend this field.
+ if($FANCY_RECORDS)
+ {
+- $rtypes[10] = 'URL';
+- $rtypes[11] = 'MBOXFW';
++ $rtypes[11] = 'URL';
++ $rtypes[12] = 'MBOXFW';
+ }
+
+ // $template - array of records that will be applied when adding a new zone file
+@@ -158,13 +156,6 @@
+ "name" => "mail.##DOMAIN##",
+ "type" => "A",
+ "content" => "##MAILIP##",
+- "ttl" => "$DEFAULT_TTL",
+- "prio" => ""
+- ),
+- array(
+- "name" =>
"localhost.##DOMAIN##",
+- "type" => "A",
+- "content" => "127.0.0.1",
+ "ttl" => "$DEFAULT_TTL",
+ "prio" => ""
+ ),
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/poweradmin/poweradmin.spec
============================================================================
$ cvs diff -u -r1.2 -r1.3 poweradmin.spec
--- openpkg-src/poweradmin/poweradmin.spec 5 Mar 2003 18:51:46 -0000 1.2
+++ openpkg-src/poweradmin/poweradmin.spec 7 Mar 2003 16:58:24 -0000 1.3
@@ -23,7 +23,7 @@
## SUCH DAMAGE.
##
-# FIXME: mlelstv: JUNK because no apache config
+# FIXME: mlelstv: JUNK because know to be of little value
# package information
Name: poweradmin
@@ -35,16 +35,20 @@
Group: Network
License: QPL
Version: 1.2.4
-Release: 20030305
+Release: 20030307
# list of sources
Source0:
http://osdn.dl.sourceforge.net/poweradmin/poweradmin-%{version}.tar.bz2
+Source1: poweradmin.conf
+Patch0: poweradmin.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20030103
-PreReq: OpenPKG, openpkg >= 20030103, apache, apache::with_php = yes
+PreReq: OpenPKG, openpkg >= 20030103
+PreReq: apache, apache::with_mod_php = yes, apache::with_mod_php_mysql = yes
+PreReq: php, php::with_pear = yes, php::with_mysql = yes
AutoReq: no
AutoReqProv: no
@@ -58,31 +62,52 @@
%prep
%setup -q
+ %patch -p0
%build
%install
rm -rf $RPM_BUILD_ROOT
+ dir=$RPM_BUILD_ROOT%{l_prefix}/libexec/poweradmin
+
%{l_shtool} mkdir -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/poweradmin/inc \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/poweradmin/images \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/poweradmin/style \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/poweradmin \
+ $dir/bin/ \
+ $dir/htdocs/inc \
+ $dir/htdocs/images \
+ $dir/htdocs/style \
$RPM_BUILD_ROOT%{l_prefix}/share/poweradmin
+
%{l_shtool} install -c -m 644 \
- inc/*.php \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/poweradmin/inc
+ *.php $dir/htdocs/
%{l_shtool} install -c -m 644 \
- images/* \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/poweradmin/images
+ inc/*.php $dir/htdocs/inc/
%{l_shtool} install -c -m 644 \
- style/*.php \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/poweradmin/style
+ images/* $dir/htdocs/images
+ %{l_shtool} install -c -m 644 \
+ style/*.php $dir/htdocs/style
%{l_shtool} install -c -m 644 \
docs/* \
$RPM_BUILD_ROOT%{l_prefix}/share/poweradmin
+ %{l_shtool} install -c -m 644 \
+ migrator.php-pa $dir/bin/migrator.php
+ %{l_shtool} install -c -m 644 \
+ %{SOURCE poweradmin.conf} $RPM_BUILD_ROOT%{l_prefix}/etc/poweradmin/
+
+ # move install script out of htdocs
+ mv $dir/htdocs/install.php $dir/bin/
+
+ # move config file to etc/
+ mv \
+ $dir/htdocs/inc/config-block.inc.php \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/poweradmin/config.inc.php
+ ln -s \
+ %{l_prefix}/etc/poweradmin/config.inc.php \
+ $dir/htdocs/inc/
- %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
+ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
+ '%config %{l_prefix}/etc/*'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.3607 -r1.3608 news.txt
--- openpkg-web/news.txt 7 Mar 2003 16:11:23 -0000 1.3607
+++ openpkg-web/news.txt 7 Mar 2003 16:58:22 -0000 1.3608
@@ -1,3 +1,4 @@
+07-Mar-2003: Upgraded package: P<poweradmin-1.2.4-20030307>
07-Mar-2003: Upgraded package: P<openpkg-tool-20030307-20030307>
07-Mar-2003: Upgraded package: P<mm-1.3.0-20030307>
07-Mar-2003: Upgraded package: P<ddd-3.3.1-20030307>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
