OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Torsten Homeyer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 14-Nov-2005 14:59:55
Branch: HEAD Handle: 2005111413595400
Modified files:
openpkg-src/drupal drupal-apache.conf drupal-setup.sh drupal.spec
Log:
make default inst more cosy
Summary:
Revision Changes Path
1.2 +2 -2 openpkg-src/drupal/drupal-apache.conf
1.2 +4 -0 openpkg-src/drupal/drupal-setup.sh
1.10 +8 -5 openpkg-src/drupal/drupal.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/drupal/drupal-apache.conf
============================================================================
$ cvs diff -u -r1.1 -r1.2 drupal-apache.conf
--- openpkg-src/drupal/drupal-apache.conf 1 Apr 2005 15:38:19 -0000
1.1
+++ openpkg-src/drupal/drupal-apache.conf 14 Nov 2005 13:59:54 -0000
1.2
@@ -9,8 +9,8 @@
ServerTokens Prod
User @l_rusr@
Group @l_rgrp@
-Port 8080
-Listen 127.0.0.1:8080
+Port 80
+Listen 127.0.0.1:80
# runtime files
PidFile @l_prefix@/var/drupal/run/apache.pid
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/drupal/drupal-setup.sh
============================================================================
$ cvs diff -u -r1.1 -r1.2 drupal-setup.sh
--- openpkg-src/drupal/drupal-setup.sh 1 Apr 2005 15:38:19 -0000
1.1
+++ openpkg-src/drupal/drupal-setup.sh 14 Nov 2005 13:59:54 -0000
1.2
@@ -18,3 +18,7 @@
@l_prefix@/bin/mysql --user=root --password=$password drupal \
<@l_prefix@/share/drupal/database/database.mysql
+# configure /etc/drupal/default/settings.php accordingly
[EMAIL PROTECTED]@/lib/openpkg/shtool subst \
+ -e '/^\$db_url =/s;mysql://username:[EMAIL
PROTECTED]/database;mysql://drupal:[EMAIL PROTECTED]/drupal;' \
+ @l_prefix@/etc/drupal/default/settings.php
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/drupal/drupal.spec
============================================================================
$ cvs diff -u -r1.9 -r1.10 drupal.spec
--- openpkg-src/drupal/drupal.spec 7 Oct 2005 06:14:39 -0000 1.9
+++ openpkg-src/drupal/drupal.spec 14 Nov 2005 13:59:54 -0000 1.10
@@ -133,7 +133,7 @@
Group: Web
License: GPL
Version: %{V_drupal}
-Release: 20051007
+Release: 20051114
# list of sources
Source0: http://drupal.org/files/projects/drupal-%{V_drupal}.tar.gz
@@ -1050,6 +1050,9 @@
echo " initialize the Drupal database like this:"
echo " \$ $RPM_INSTALL_PREFIX/etc/rc mysql start"
echo " \$ $RPM_INSTALL_PREFIX/sbin/drupal-setup"
+ echo " But remember to configure your MySQL installation first."
+ echo " At least set a MySQL administrator password in:"
+ echo " \$ $RPM_INSTALL_PREFIX/etc/mysql/my.pwd"
echo ""
echo "2. By default, Drupal is run by the OpenPKG cron jobs only
every"
echo " 15 minutes. To run Drupal every 5 minutes for more
granular"
@@ -1061,8 +1064,8 @@
echo " */5 * * * * %{l_rusr}
$RPM_INSTALL_PREFIX/sbin/drupal-cron"
echo ""
echo "3. By default, Drupal runs its own Apache server on IPv4
address"
- echo " 127.0.0.1, TCP port 8080. Please change this by editing
the"
- echo " \"Port 8080\" and \"Listen 127.0.0.1:8080\" directives in"
+ echo " 127.0.0.1, TCP port 80. Please change this by editing the"
+ echo " \"Port 80\" and \"Listen 127.0.0.1:80\" directives in"
echo " $RPM_INSTALL_PREFIX/etc/drupal/drupal-apache.conf"
echo " Also do not forget to adjust the \$base_url variable in:"
echo " $RPM_INSTALL_PREFIX/etc/drupal/default/settings.php"
@@ -1070,7 +1073,7 @@
echo "4. After this postinstallation, start Drupal by running"
echo " \$ $RPM_INSTALL_PREFIX/etc/rc drupal start"
echo " and connect with a browser to:"
- echo " http://127.0.0.1:8080/";
+ echo " http://127.0.0.1:80/";
echo " Create an account and login. The first account will"
echo " automatically become the main administrator account"
echo " with total control over your Drupal site."
@@ -1079,7 +1082,7 @@
if [ $1 -eq 2 ]; then
# display final hints on update installation
( echo "Please perform a Drupal database upgrade by visiting the"
- echo " http://127.0.0.1:8080/update.php";
+ echo " http://127.0.0.1:80/update.php";
echo "page on your Drupal website."
) | %{l_rpmtool} msg -b -t notice
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
