OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 15-Aug-2006 21:06:07
Branch: HEAD Handle: 2006081520060601
Modified files:
openpkg-src/drupal drupal-setup.sh drupal.spec
Log:
don't hard-code MySQL administrator username
Summary:
Revision Changes Path
1.3 +7 -4 openpkg-src/drupal/drupal-setup.sh
1.19 +1 -1 openpkg-src/drupal/drupal.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/drupal/drupal-setup.sh
============================================================================
$ cvs diff -u -r1.2 -r1.3 drupal-setup.sh
--- openpkg-src/drupal/drupal-setup.sh 14 Nov 2005 13:59:54 -0000
1.2
+++ openpkg-src/drupal/drupal-setup.sh 15 Aug 2006 19:06:06 -0000
1.3
@@ -3,22 +3,25 @@
## drupal-setup
##
-# determine MySQL root password
+# determine MySQL administrator username/password
+username=`grep "^user" @l_prefix@/etc/mysql/my.pwd |\
+ sed -e 's;^user[^=]*= *;;' -e 's; *$;;'`
password=`grep "^password" @l_prefix@/etc/mysql/my.pwd |\
sed -e 's;^password[^=]*= *;;' -e 's; *$;;'`
# create the MySQL database for Drupal
[EMAIL PROTECTED]@/bin/mysqladmin --user=root --password=$password create
drupal
[EMAIL PROTECTED]@/bin/mysql --user=root --password=$password mysql <<EOF
[EMAIL PROTECTED]@/bin/mysqladmin --user=$username --password=$password
create drupal
[EMAIL PROTECTED]@/bin/mysql --user=$username --password=$password mysql <<EOF
GRANT ALL ON drupal.* TO [EMAIL PROTECTED] IDENTIFIED BY 'drupal';
FLUSH PRIVILEGES;
EOF
# create the default Drupal database schema
[EMAIL PROTECTED]@/bin/mysql --user=root --password=$password drupal \
[EMAIL PROTECTED]@/bin/mysql --user=$username --password=$password drupal \
<@l_prefix@/share/drupal/database/database.mysql
# configure /etc/drupal/default/settings.php accordingly
@l_prefix@/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.18 -r1.19 drupal.spec
--- openpkg-src/drupal/drupal.spec 4 Aug 2006 17:17:44 -0000 1.18
+++ openpkg-src/drupal/drupal.spec 15 Aug 2006 19:06:07 -0000 1.19
@@ -133,7 +133,7 @@
Group: Web
License: GPL
Version: %{V_drupal}
-Release: 20060804
+Release: 20060815
# list of sources
Source0: http://drupal.org/files/projects/drupal-%{V_drupal}.tar.gz
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
