Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAleksey Lim <alsroot@member.fsf.org>2009-09-26 11:13:09 (GMT)
committer Aleksey Lim <alsroot@member.fsf.org>2009-09-26 11:13:09 (GMT)
commitfd48b2765e02ed4e61405766ff51bc49dd03e521 (patch)
tree7c11aa0f4ccf8a7e665a4d91b6bb1d19b3519c6b
parent734dd2d28d9fb0833ff54ec6a76f0dc50013095b (diff)
Use init.d script to start apache
-rwxr-xr-xaslo/db-create-stub.sh15
-rw-r--r--aslo/sql/sugar-stub-data.sql5
2 files changed, 9 insertions, 11 deletions
diff --git a/aslo/db-create-stub.sh b/aslo/db-create-stub.sh
index 2c66b82..5a7e658 100755
--- a/aslo/db-create-stub.sh
+++ b/aslo/db-create-stub.sh
@@ -2,7 +2,9 @@
root=$(cd $(dirname $0)/..; pwd)
-service httpd stop
+/etc/init.d/apache2 stop
+
+. /etc/apache2/envvars
if [ $# -gt 0 ]; then
for i in "$@"; do
@@ -11,6 +13,7 @@ if [ $# -gt 0 ]; then
done
else
mysql -u remora --password=remora -D remora < $root/site/app/config/sql/remora.sql
+ mysql -u remora --password=remora -D remora < $root/aslo/sql/sugar-stub.sql
mysql -u remora --password=remora -D remora < $root/aslo/sql/sugar-stub-data.sql
fi
@@ -24,20 +27,20 @@ mkdir $root/site/app/tmp/cache
mkdir $root/site/app/tmp/cache/persistent
mkdir $root/site/app/tmp/cache/models
mkdir $root/site/app/tmp/cache/views
-chown -R apache:apache $root/site/app/tmp
+chown -R $APACHE_RUN_USER:$APACHE_RUN_GROUP $root/site/app/tmp
mkdir $root/downloads
-chown -R apache:apache $root/downloads
+chown -R $APACHE_RUN_USER:$APACHE_RUN_GROUP $root/downloads
mkdir $root/files
mkdir $root/files/temp
mkdir $root/files/extracted
-chown -R apache:apache $root/files
+chown -R $APACHE_RUN_USER:$APACHE_RUN_GROUP $root/files
mkdir $root/log
-chown -R apache:apache $root/log
+chown -R $APACHE_RUN_USER:$APACHE_RUN_GROUP $root/log
cp $root/aslo/config-local.php $root/site/app/config/
cp $root/aslo/config.php $root/site/app/config/
-service httpd start
+/etc/init.d/apache2 start
diff --git a/aslo/sql/sugar-stub-data.sql b/aslo/sql/sugar-stub-data.sql
index 7869fd7..3fb1145 100644
--- a/aslo/sql/sugar-stub-data.sql
+++ b/aslo/sql/sugar-stub-data.sql
@@ -1,10 +1,5 @@
SET FOREIGN_KEY_CHECKS=0;
-ALTER TABLE users ADD (
- notifybroadcast tinyint(1) unsigned NOT NULL default '0',
- KEY notifybroadcast (notifybroadcast)
-);
-
INSERT INTO `groups` (`id`, `name`, `rules`, `created`, `modified`) VALUES
(1, 'Admins', '*:*', '2007-02-10 13:29:03', '2007-02-10 16:57:10'),
(2, 'Editors', 'Editors:*', '2007-02-10 16:32:21', '2007-02-10 16:32:21');