From b1239047d223394d1f6d9cd96507e3efcf36c529 Mon Sep 17 00:00:00 2001
From: Roman Demidov <roman.demidov@onlyoffice.com>
Date: Mon, 1 Mar 2021 11:57:42 +0300
Subject: [PATCH 1/3] Add database update
---
run-document-server.sh | 55 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 55 insertions(+)
diff --git a/run-document-server.sh b/run-document-server.sh
index 626b72a..b378045 100755
--- a/run-document-server.sh
+++ b/run-document-server.sh
@@ -11,16 +11,31 @@ shopt -s globstar
APP_DIR="/var/www/${COMPANY_NAME}/documentserver"
DATA_DIR="/var/www/${COMPANY_NAME}/Data"
+PRIVATE_DATA_DIR="${DATA_DIR}/.private"
LOG_DIR="/var/log/${COMPANY_NAME}"
DS_LOG_DIR="${LOG_DIR}/documentserver"
LIB_DIR="/var/lib/${COMPANY_NAME}"
DS_LIB_DIR="${LIB_DIR}/documentserver"
CONF_DIR="/etc/${COMPANY_NAME}/documentserver"
+IS_UPGRADE="false"
ONLYOFFICE_DATA_CONTAINER=${ONLYOFFICE_DATA_CONTAINER:-false}
ONLYOFFICE_DATA_CONTAINER_HOST=${ONLYOFFICE_DATA_CONTAINER_HOST:-localhost}
ONLYOFFICE_DATA_CONTAINER_PORT=80
+RELEASE_DATE="$(stat -c="%y" ${APP_DIR}/server/DocService/docservice | sed -r 's/=([0-9]+)-([0-9]+)-([0-9]+) ([0-9:.+ ]+)/\1-\2-\3/')";
+if [ -f ${PRIVATE_DATA_DIR}/release_date ]; then
+ PREV_RELEASE_DATE=$(head -n 1 ${PRIVATE_DATA_DIR}/release_date)
+else
+ PREV_RELEASE_DATE="0"
+fi
+
+if [ "${RELEASE_DATE}" != "${PREV_RELEASE_DATE}" ]; then
+ mkdir -p ${PRIVATE_DATA_DIR}
+ echo ${RELEASE_DATE} > ${PRIVATE_DATA_DIR}/release_date
+ IS_UPGRADE="true";
+fi
+
SSL_CERTIFICATES_DIR="${DATA_DIR}/certs"
if [[ -z $SSL_CERTIFICATE_PATH ]] && [[ -f ${SSL_CERTIFICATES_DIR}/onlyoffice.crt ]]; then
SSL_CERTIFICATE_PATH=${SSL_CERTIFICATES_DIR}/onlyoffice.crt
@@ -327,6 +342,39 @@ create_db_tbl() {
esac
}
+upgrade_db_tbl() {
+ case $DB_TYPE in
+ "postgres")
+ upgrade_postgresql_tbl
+ ;;
+ "mariadb"|"mysql")
+ upgrade_mysql_tbl
+ ;;
+ esac
+}
+
+upgrade_postgresql_tbl() {
+ if [ -n "$DB_PWD" ]; then
+ export PGPASSWORD=$DB_PWD
+ fi
+
+ PSQL="psql -q -h$DB_HOST -p$DB_PORT -d$DB_NAME -U$DB_USER -w"
+
+ for i in $(ls $APP_DIR/server/schema/postgresql/upgrade/upgrade*); do
+ echo "$PSQL -f ${i}" > /app/rfx-upgrade.txt
+ $PSQL -f "${i}";
+ done
+}
+
+upgrade_mysql_tbl() {
+ CONNECTION_PARAMS="-h$DB_HOST -P$DB_PORT -u$DB_USER -p$DB_PWD -w"
+ MYSQL="mysql -q $CONNECTION_PARAMS"
+
+ for i in $(ls $APP_DIR/server/schema/mysql/upgrade/upgrade*); do
+ $MYSQL "$DB_NAME" < ${i} >/dev/null 2>&1;
+ done
+}
+
create_postgresql_tbl() {
if [ -n "$DB_PWD" ]; then
export PGPASSWORD=$DB_PWD
@@ -460,6 +508,7 @@ if [ ${ONLYOFFICE_DATA_CONTAINER_HOST} = "localhost" ]; then
update_db_settings
waiting_for_db
create_db_tbl
+ IS_UPGRADE="false"
else
# change rights for postgres directory
chown -R postgres:postgres ${PG_ROOT}
@@ -518,6 +567,12 @@ done
if [ ${PG_NEW_CLUSTER} = "true" ]; then
create_postgresql_db
create_postgresql_tbl
+ IS_UPGRADE="false"
+fi
+
+if [ "${IS_UPGRADE}" = "true" ]; then
+ waiting_for_db
+ upgrade_db_tbl
fi
if [ ${ONLYOFFICE_DATA_CONTAINER} != "true" ]; then
From a7334483d05e403a2a2f9f1df0fc4fdcae8b51f4 Mon Sep 17 00:00:00 2001
From: Roman Demidov <roman.demidov@onlyoffice.com>
Date: Mon, 1 Mar 2021 12:02:00 +0300
Subject: [PATCH 2/3] Small changes
---
run-document-server.sh | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/run-document-server.sh b/run-document-server.sh
index b378045..a58c296 100755
--- a/run-document-server.sh
+++ b/run-document-server.sh
@@ -361,7 +361,6 @@ upgrade_postgresql_tbl() {
PSQL="psql -q -h$DB_HOST -p$DB_PORT -d$DB_NAME -U$DB_USER -w"
for i in $(ls $APP_DIR/server/schema/postgresql/upgrade/upgrade*); do
- echo "$PSQL -f ${i}" > /app/rfx-upgrade.txt
$PSQL -f "${i}";
done
}
@@ -372,7 +371,7 @@ upgrade_mysql_tbl() {
for i in $(ls $APP_DIR/server/schema/mysql/upgrade/upgrade*); do
$MYSQL "$DB_NAME" < ${i} >/dev/null 2>&1;
- done
+ done
}
create_postgresql_tbl() {
From 2d665f79570c58406d71c6d665a0edd4c86e714c Mon Sep 17 00:00:00 2001
From: Roman Demidov <roman.demidov@onlyoffice.com>
Date: Mon, 1 Mar 2021 17:53:22 +0300
Subject: [PATCH 3/3] Small changes
---
run-document-server.sh | 1 -
1 file changed, 1 deletion(-)
diff --git a/run-document-server.sh b/run-document-server.sh
index a58c296..3e0a318 100755
--- a/run-document-server.sh
+++ b/run-document-server.sh
@@ -570,7 +570,6 @@ if [ ${PG_NEW_CLUSTER} = "true" ]; then
fi
if [ "${IS_UPGRADE}" = "true" ]; then
- waiting_for_db
upgrade_db_tbl
fi