projects
/
koha_fer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bug_9824' into 3.14-master
[koha_fer]
/
debian
/
scripts
/
koha-restore
diff --git
a/debian/scripts/koha-restore
b/debian/scripts/koha-restore
index
f4750e4
..
caf4c7d
100755
(executable)
--- a/
debian/scripts/koha-restore
+++ b/
debian/scripts/koha-restore
@@
-54,7
+54,12
@@
name=$(tar tf "$configdump" |
sed -n '/^etc\/koha\/sites\/\([^/]*\)\/$/s//\1/p')
username="$name-koha"
adduser --no-create-home --disabled-login --gecos "Koha instance $username" \
sed -n '/^etc\/koha\/sites\/\([^/]*\)\/$/s//\1/p')
username="$name-koha"
adduser --no-create-home --disabled-login --gecos "Koha instance $username" \
- --quiet "$username"
+ --home "/var/lib/koha/$name" --quiet "$username"
+
+
+# Create dirs. Some of them will be in the tarball, but not all, e.g.,
+# /var/run and /var/lock.
+koha-create-dirs "$name"
# Unpack tarball.
# Unpack tarball.
@@
-64,12
+69,12
@@
tar -C / -xf "$configdump"
# Re-create database and database user.
mysqldb="koha_$name"
mysqluser="koha_$name"
# Re-create database and database user.
mysqldb="koha_$name"
mysqluser="koha_$name"
-mysqlpwd="$(
sed -n '/.*<pass>\(.*\)<\/pass>.*/s//\1/p' /etc/koha/sites/$name/koha-conf.xml
)"
-zcat "$sqldump" | mysql --defaults-extra-file=/etc/mysql/
debia
n.cnf
-mysql --defaults-extra-file=/etc/mysql/
debia
n.cnf <<eof || true
+mysqlpwd="$(
xmlstarlet sel -t -v 'yazgfs/config/pass' /etc/koha/sites/$name/koha-conf.xml
)"
+zcat "$sqldump" | mysql --defaults-extra-file=/etc/mysql/
koha-commo
n.cnf
+mysql --defaults-extra-file=/etc/mysql/
koha-commo
n.cnf <<eof || true
DROP USER '$mysqluser';
eof
DROP USER '$mysqluser';
eof
-mysql --defaults-extra-file=/etc/mysql/
debia
n.cnf << eof || true
+mysql --defaults-extra-file=/etc/mysql/
koha-commo
n.cnf << eof || true
CREATE USER '$mysqluser' IDENTIFIED BY '$mysqlpwd';
GRANT ALL PRIVILEGES ON $mysqldb.* TO '$mysqluser';
FLUSH PRIVILEGES;
CREATE USER '$mysqluser' IDENTIFIED BY '$mysqlpwd';
GRANT ALL PRIVILEGES ON $mysqldb.* TO '$mysqluser';
FLUSH PRIVILEGES;