iterating on new nodes index

[plewww.git] / PLCWWW.spec

diff --git a/PLCWWW.spec b/PLCWWW.spec
index 985570b..20b563f 100644 (file)
--- a/PLCWWW.spec
+++ b/PLCWWW.spec
@@ -60,7 +60,7 @@ mkdir -p $RPM_BUILD_ROOT/var/www/html
 rsync -a --exclude \*.spec --exclude .svn --exclude CVS ./ $RPM_BUILD_ROOT/var/www/html/
 
 echo "* PLEWWW: Installing config for httpd"
-install -D -m 644 planetlab.conf $RPM_BUILD_ROOT/etc/httpd/conf.d/planetlab.conf
+install -D -m 644 httpd.conf $RPM_BUILD_ROOT/etc/httpd/conf.d/plcwww.conf
 
 %post
 # attempt to perform most of the drupal post-install stuff - assuming version 6.x
@@ -72,21 +72,20 @@ if [ ! -d $drupal_settings_dir ] ; then
 fi
 pushd $drupal_settings_dir
 # tune $db_url
-if [ ! -f settings.php ] ; then
+if [ ! -f settings.php.distrib ] ; then
+    cp settings.php settings.php.distrib
     sed -e 's|^[ \t]*\$db_url.*|require_once("plc_config.php");$db_url="pgsql://" . PLC_DB_USER . ":" . PLC_DB_PASSWORD . "@" . PLC_DB_HOST . ":" . PLC_DB_PORT . "/drupal";|' \
-        default.settings.php > settings.php
-    chown apache:apache settings.php
-    chmod 444 settings.php
+        settings.php.distrib > settings.php
+fi
+popd
+# append our own database creation hacks to the drupal database schema
+drupal_database_dir=/var/www/html/database
+pushd $drupal_database_dir
+if [ ! -f database.pgsql.distrib ] ; then
+    cp database.pgsql database.pgsql.distrib
+    cat database.pgsql.distrib ../drupal-hacks/database.pgsql > database.pgsql
 fi
 popd
-drupal_files_dirs="/var/www/html/files /var/www/html/sites/default/files"
-for dir in $drupal_files_dirs; do 
-    if [ ! -d $dir ] ; then
-       mkdir -p $dir
-       chown apache:apache $dir
-    fi
-done
-# drupal install script cannot be invoked here yet - pgsql might not even be running
 
 %clean
 rm -rf $RPM_BUILD_ROOT