1 |
slords |
1.1 |
diff -Nur -x '*.orig' -x '*.rej' smeserver-postgresql-0.0.1/createlinks mezzanine_patched_smeserver-postgresql-0.0.1/createlinks |
2 |
|
|
--- smeserver-postgresql-0.0.1/createlinks 2006-12-01 16:56:09.000000000 -0500 |
3 |
|
|
+++ mezzanine_patched_smeserver-postgresql-0.0.1/createlinks 2006-10-20 17:45:07.000000000 -0400 |
4 |
|
|
@@ -20,7 +20,7 @@ |
5 |
|
|
|
6 |
|
|
# When we do a restore, we want to start from a completely clean slate |
7 |
|
|
$event = "pre-restore"; |
8 |
|
|
-safe_symlink("stop", "root/etc/e-smith/events/$event/services2adjust/pgsqld"); |
9 |
|
|
+safe_symlink("stop", "root/etc/e-smith/events/$event/services2adjust/postgresql"); |
10 |
|
|
# Needs to be after shutdown of pgsqld |
11 |
|
|
event_link("pgsql-delete-db-files", $event, "99"); |
12 |
|
|
|
13 |
|
|
@@ -37,6 +37,6 @@ |
14 |
|
|
#-------------------------------------------------- |
15 |
|
|
$event = "timezone-update"; |
16 |
|
|
|
17 |
|
|
-safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/pgsqld"); |
18 |
|
|
+safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/postgresql"); |
19 |
|
|
|
20 |
|
|
|
21 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-postgresql-0.0.1/root/etc/e-smith/events/actions/pgsql-dump-tables mezzanine_patched_smeserver-postgresql-0.0.1/root/etc/e-smith/events/actions/pgsql-dump-tables |
22 |
|
|
--- smeserver-postgresql-0.0.1/root/etc/e-smith/events/actions/pgsql-dump-tables 2006-12-01 16:56:09.000000000 -0500 |
23 |
|
|
+++ mezzanine_patched_smeserver-postgresql-0.0.1/root/etc/e-smith/events/actions/pgsql-dump-tables 2006-12-01 16:55:31.000000000 -0500 |
24 |
|
|
@@ -6,5 +6,7 @@ |
25 |
|
|
echo "postgresql is disabled - no tables dumped" >&2 |
26 |
|
|
exit 0 |
27 |
|
|
fi |
28 |
|
|
+umask 027 |
29 |
|
|
exec >/home/e-smith/db/pgsql/pgsql.dump |
30 |
|
|
+chgrp postgres /home/e-smith/db/pgsql/pgsql.dump |
31 |
|
|
exec chpst -u postgres pg_dumpall |
32 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-postgresql-0.0.1/root/etc/e-smith/templates/etc/e-smith/pgsql/init/00_restore_backup mezzanine_patched_smeserver-postgresql-0.0.1/root/etc/e-smith/templates/etc/e-smith/pgsql/init/00_restore_backup |
33 |
|
|
--- smeserver-postgresql-0.0.1/root/etc/e-smith/templates/etc/e-smith/pgsql/init/00_restore_backup 2006-12-01 16:56:09.000000000 -0500 |
34 |
|
|
+++ mezzanine_patched_smeserver-postgresql-0.0.1/root/etc/e-smith/templates/etc/e-smith/pgsql/init/00_restore_backup 2006-12-01 16:52:39.000000000 -0500 |
35 |
|
|
@@ -3,5 +3,11 @@ |
36 |
|
|
use strict; |
37 |
|
|
|
38 |
|
|
$ENV\{PATH\} = "/usr/bin"; |
39 |
|
|
-open(STDIN, "/home/e-smith/db/pgsql/pgsql.dump"); |
40 |
|
|
-exec(qw(chpst -u postgres psql -q -f - template1)); |
41 |
|
|
+delete $ENV\{BASH_ENV\}; |
42 |
|
|
+ |
43 |
|
|
+if (-e "/home/e-smith/db/pgsql/pgsql.dump") |
44 |
|
|
+{ |
45 |
|
|
+ open(STDIN, "/home/e-smith/db/pgsql/pgsql.dump"); |
46 |
|
|
+ exec(qw(chpst -u postgres psql -q -f - template1)); |
47 |
|
|
+} |
48 |
|
|
+exit 0; |