Andreas Tille pushed to branch upstream at Debian Med / gnumed-server
Commits:
e294f8c7 by Andreas Tille at 2018-04-12T18:43:09+02:00
New upstream version 22.1
- - - - -
10 changed files:
- server/bootstrap/fixup_db-v22.conf
- server/bootstrap/update_db-v21_v22.conf
- server/doc/schema/gnumed-entire_schema.html
- server/gm-backup.sh
- server/gm-bootstrap_server
- server/gm-fixup_server
- server/gm-restore.sh
- server/gm-upgrade_server
- server/gm-zip+sign_backups.sh
- + server/sql/v21-v22/fixups/v22-release_notes-fixup.sql
Changes:
=====================================
server/bootstrap/fixup_db-v22.conf
=====================================
--- a/server/bootstrap/fixup_db-v22.conf
+++ b/server/bootstrap/fixup_db-v22.conf
@@ -27,7 +27,7 @@ database alias = gnumed_v22
minimum postgresql version = 9.2
schema base directory = ../sql/v21-v22/fixups/
schema = $schema$
-../dynamic/v22-release_notes-dynamic.sql
+v22-release_notes-fixup.sql
$schema$
#----------------------------------
=====================================
server/bootstrap/update_db-v21_v22.conf
=====================================
--- a/server/bootstrap/update_db-v21_v22.conf
+++ b/server/bootstrap/update_db-v21_v22.conf
@@ -158,6 +158,7 @@ database alias = gnumed_v22
minimum postgresql version = 9.2
schema base directory = ../sql/v21-v22/fixups/
schema = $schema$
+v22-release_notes-fixup.sql
$schema$
#----------------------------------
=====================================
server/doc/schema/gnumed-entire_schema.html
=====================================
--- a/server/doc/schema/gnumed-entire_schema.html
+++ b/server/doc/schema/gnumed-entire_schema.html
@@ -112,7 +112,7 @@
<body>
<!-- Primary Index -->
- <p><br><br>Dumped on 2018-03-18</p>
+ <p><br><br>Dumped on 2018-04-05</p>
<h1><a name="index">Index of database - gnumed_v22</a></h1>
<ul>
=====================================
server/gm-backup.sh
=====================================
--- a/server/gm-backup.sh
+++ b/server/gm-backup.sh
@@ -40,6 +40,11 @@ CONF="/etc/gnumed/gnumed-backup.conf"
#==============================================================
set -o pipefail
+
+# do not run twice
+[ "${FLOCKER}" != "$0" ] && exec env FLOCKER="$0" flock --exclusive --nonblock
"$0" "$0" "$@" || :
+
+
# load config file
if [ -r ${CONF} ] ; then
. ${CONF}
=====================================
server/gm-bootstrap_server
=====================================
--- a/server/gm-bootstrap_server
+++ b/server/gm-bootstrap_server
@@ -17,6 +17,8 @@ GM_LOG_BASE="/var/log/gnumed/server"
GM_SERVER_DIR="/var/lib/gnumed/server/bootstrap"
#==============================================================
+# do not run twice
+[ "${FLOCKER}" != "$0" ] && exec env FLOCKER="$0" flock --exclusive --nonblock
"$0" "$0" "$@" || :
# consider entirely removing this check, for example
# because it does not honour $GM_PORT
=====================================
server/gm-fixup_server
=====================================
--- a/server/gm-fixup_server
+++ b/server/gm-fixup_server
@@ -17,6 +17,8 @@ GM_LOG_BASE="/var/log/gnumed/server"
GM_SERVER_DIR="/var/lib/gnumed/server/bootstrap"
#==============================================================
+# do not run twice
+[ "${FLOCKER}" != "$0" ] && exec env FLOCKER="$0" flock --exclusive --nonblock
"$0" "$0" "$@" || :
cd ${GM_SERVER_DIR} || ( echo "=> Cannot change into ${GM_SERVER_DIR}.
Aborting." ; exit 1 )
mkdir -p ${GM_LOG_BASE}
=====================================
server/gm-restore.sh
=====================================
--- a/server/gm-restore.sh
+++ b/server/gm-restore.sh
@@ -18,6 +18,10 @@
set -o pipefail
+# do not run twice
+[ "${FLOCKER}" != "$0" ] && exec env FLOCKER="$0" flock --exclusive --nonblock
"$0" "$0" "$@" || :
+
+
BACKUP="$1"
if test -z ${BACKUP} ; then
echo "====================================================="
=====================================
server/gm-upgrade_server
=====================================
--- a/server/gm-upgrade_server
+++ b/server/gm-upgrade_server
@@ -17,6 +17,8 @@ GM_LOG_BASE="/var/log/gnumed/server"
GM_SERVER_DIR="/var/lib/gnumed/server/bootstrap"
#==============================================================
+# do not run twice
+[ "${FLOCKER}" != "$0" ] && exec env FLOCKER="$0" flock --exclusive --nonblock
"$0" "$0" "$@" || :
cd ${GM_SERVER_DIR} || ( echo "=> Cannot change into ${GM_SERVER_DIR}.
Aborting." ; exit 1 )
mkdir -p ${GM_LOG_BASE}
=====================================
server/gm-zip+sign_backups.sh
=====================================
--- a/server/gm-zip+sign_backups.sh
+++ b/server/gm-zip+sign_backups.sh
@@ -33,6 +33,7 @@ CONF="/etc/gnumed/gnumed-backup.conf"
#==============================================================
set -o pipefail
+
# do not run twice
[ "${FLOCKER}" != "$0" ] && exec env FLOCKER="$0" flock --exclusive --nonblock
"$0" "$0" "$@" || :
=====================================
server/sql/v21-v22/fixups/v22-release_notes-fixup.sql
=====================================
--- /dev/null
+++ b/server/sql/v21-v22/fixups/v22-release_notes-fixup.sql
@@ -0,0 +1,37 @@
+-- ==============================================================
+-- GNUmed database schema change script
+--
+-- License: GPL v2 or later
+-- Author: karsten.hilb...@gmx.net
+--
+-- ==============================================================
+\set ON_ERROR_STOP 1
+--set default_transaction_read_only to off;
+
+-- --------------------------------------------------------------
+INSERT INTO dem.message_inbox (
+ fk_staff,
+ fk_inbox_item_type,
+ comment,
+ data
+) VALUES (
+ (select pk from dem.staff where db_user = 'any-doc'),
+ (select pk_type from dem.v_inbox_item_type where type = 'memo' and
category = 'administrative'),
+ 'Release Notes for GNUmed 1.7.1 (database v22.1)',
+ 'GNUmed 1.7.1 Release Notes:
+
+ 1.7.1
+
+NEW: add bash completion script
+
+IMPROVED: make DWV optional
+IMPROVED: prerequisites check tool
+IMPROVED: update timeline code to 1.17.0 release
+
+ 22.1
+
+IMPROVED: concurrency robustness of backup/restore scripts
+');
+
+-- --------------------------------------------------------------
+select gm.log_script_insertion('v22-release_notes-fixup.sql', '22.1');
View it on GitLab:
https://salsa.debian.org/med-team/gnumed-server/commit/e294f8c782abb985d1324f3fe095d4b70fd8b48f
---
View it on GitLab:
https://salsa.debian.org/med-team/gnumed-server/commit/e294f8c782abb985d1324f3fe095d4b70fd8b48f
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
