| 1 |
dungog |
1.1 |
diff -Nur -x '*.orig' -x '*.rej' smeserver-zarafa-0.9/root/etc/e-smith/events/actions/zarafa-create-database mezzanine_patched_smeserver-zarafa-0.9/root/etc/e-smith/events/actions/zarafa-create-database |
| 2 |
|
|
--- smeserver-zarafa-0.9/root/etc/e-smith/events/actions/zarafa-create-database 2008-10-03 16:17:36.000000000 -0500 |
| 3 |
|
|
+++ mezzanine_patched_smeserver-zarafa-0.9/root/etc/e-smith/events/actions/zarafa-create-database 2008-10-08 16:40:39.000000000 -0500 |
| 4 |
|
|
@@ -1,11 +1,4 @@ |
| 5 |
|
|
#!/bin/sh |
| 6 |
|
|
|
| 7 |
|
|
-PW=$(/sbin/e-smith/config getprop zarafa-server DbPassword) |
| 8 |
|
|
- |
| 9 |
|
|
-mysqladmin drop zarafa |
| 10 |
|
|
- |
| 11 |
|
|
-mysqladmin create zarafa |
| 12 |
|
|
-mysql -e "grant all privileges on zarafa.* to zarafa@localhost identified by '$PW'" |
| 13 |
|
|
-mysql -e "flush privileges" |
| 14 |
|
|
- |
| 15 |
|
|
-mysqlshow |
| 16 |
|
|
+/sbin/e-smith/expand-template /etc/e-smith/sql/init/80zarafa |
| 17 |
|
|
+/etc/rc.d/init.d/mysql.init start |
| 18 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-zarafa-0.9/root/etc/e-smith/templates/etc/e-smith/sql/init/80zarafa mezzanine_patched_smeserver-zarafa-0.9/root/etc/e-smith/templates/etc/e-smith/sql/init/80zarafa |
| 19 |
|
|
--- smeserver-zarafa-0.9/root/etc/e-smith/templates/etc/e-smith/sql/init/80zarafa 2008-10-02 12:07:12.000000000 -0500 |
| 20 |
|
|
+++ mezzanine_patched_smeserver-zarafa-0.9/root/etc/e-smith/templates/etc/e-smith/sql/init/80zarafa 2008-10-08 17:41:46.000000000 -0500 |
| 21 |
|
|
@@ -1,7 +1,7 @@ |
| 22 |
|
|
{ |
| 23 |
|
|
- my $db = $zarafa{DbName} || 'zarafa'; |
| 24 |
|
|
- my $user = $zarafa{DbUser} || 'zarafa'; |
| 25 |
|
|
- my $pass = $zarafa{DbPassword} || 'changeme'; |
| 26 |
|
|
+ my $db = ${'zarafa-server'}{DbName} || 'zarafa'; |
| 27 |
|
|
+ my $user = ${'zarafa-server'}{DbUser} || 'zarafa'; |
| 28 |
|
|
+ my $pass = ${'zarafa-server'}{DbPassword} || 'changeme'; |
| 29 |
|
|
$OUT .= <<END |
| 30 |
|
|
#! /bin/sh |
| 31 |
|
|
if [ -d /var/lib/mysql/$db ]; then |
| 32 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-zarafa-0.9/root/etc/e-smith/templates/etc/zarafa/server.cfg/server.cfg mezzanine_patched_smeserver-zarafa-0.9/root/etc/e-smith/templates/etc/zarafa/server.cfg/server.cfg |
| 33 |
|
|
--- smeserver-zarafa-0.9/root/etc/e-smith/templates/etc/zarafa/server.cfg/server.cfg 2008-10-03 14:38:43.000000000 -0500 |
| 34 |
|
|
+++ mezzanine_patched_smeserver-zarafa-0.9/root/etc/e-smith/templates/etc/zarafa/server.cfg/server.cfg 2008-10-08 16:40:39.000000000 -0500 |
| 35 |
|
|
@@ -77,13 +77,13 @@ |
| 36 |
|
|
mysql_port = 3306 |
| 37 |
|
|
|
| 38 |
|
|
# The user under which we connect with MySQL |
| 39 |
|
|
-mysql_user = zarafa |
| 40 |
|
|
+mysql_user = { ${'zarafa-server'}{DbUser} || 'zarafa'; } |
| 41 |
|
|
|
| 42 |
|
|
# The password for the user (leave empty for no password) |
| 43 |
|
|
mysql_password = { ${'zarafa-server'}{DbPassword}; } |
| 44 |
|
|
|
| 45 |
|
|
# Database to connect to |
| 46 |
|
|
-mysql_database = zarafa |
| 47 |
|
|
+mysql_database = { ${'zarafa-server'}{DbName} || 'zarafa'; } |
| 48 |
|
|
|
| 49 |
|
|
# Where to place attachments. Value can be 'database' or 'files' |
| 50 |
|
|
attachment_storage = files |
| 51 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-zarafa-0.9/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/80zarafa mezzanine_patched_smeserver-zarafa-0.9/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/80zarafa |
| 52 |
|
|
--- smeserver-zarafa-0.9/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/80zarafa 1969-12-31 18:00:00.000000000 -0600 |
| 53 |
|
|
+++ mezzanine_patched_smeserver-zarafa-0.9/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/80zarafa 2008-10-08 17:46:00.000000000 -0500 |
| 54 |
|
|
@@ -0,0 +1 @@ |
| 55 |
|
|
+PERMS=0750 |
Parent Directory
| 
Revision Log
| 
Revision Graph
