From 39e2597ba94704777eced60493357e10c4eff173 Mon Sep 17 00:00:00 2001 From: Martin Winkler Date: Sat, 11 Apr 2020 19:04:14 +0200 Subject: [PATCH] Update sequence for mayan EDMS versions >= 3.4 Bump mayan version to 3.4.4 --- seqs/mayan-edms.sh | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/seqs/mayan-edms.sh b/seqs/mayan-edms.sh index ea8d38c..df867dc 100755 --- a/seqs/mayan-edms.sh +++ b/seqs/mayan-edms.sh @@ -1,7 +1,7 @@ #!/bin/bash toolName="Mayan EDMS" -toolVersion="3.3.15" +toolVersion="3.4.4" toolRoot="/opt/mayan-edms" toolMediaFolder="/opt/mayan-edms/media" @@ -20,10 +20,10 @@ step_1() { step_2_info() { echo "Get $toolName binary dependencies"; } step_2() { - exe apt install libimage-exiftool-perl g++ gcc ghostscript gnupg1 graphviz libfuse2 \ - libjpeg-dev libmagic1 libpq-dev libpng-dev libtiff-dev \ - poppler-utils postgresql python3-dev python3-venv python3-virtualenv python3-pip - redis-server sane-utils supervisor tesseract-ocr tesseract-ocr-deu zlib1g-dev -y + exe apt-get install libimage-exiftool-perl g++ gcc coreutils ghostscript gnupg1 \ + graphviz libfuse2 libjpeg-dev libmagic1 libpq-dev libpng-dev libtiff-dev \ + poppler-utils postgresql python3-dev python3-pip python3-venv python3-virtualenv \ + redis-server sane-utils supervisor tesseract-ocr tesseract-ocr-deu zlib1g-dev -y endReturn -o $? "Binary dependencies installation failed" exe systemctl enable supervisor @@ -55,9 +55,9 @@ step_5() { # upgrade pip first step upgradepip - exe sudo -u mayan ${toolRoot}/bin/pip install --no-cache-dir mayan-edms + exe sudo -u mayan ${toolRoot}/bin/pip install --no-cache-dir mayan-edms==$toolVersion endReturn -o $? "pip install for $toolName failed" - exe sudo -u mayan ${toolRoot}/bin/pip install --no-cache-dir psycopg2==2.8.3 redis==3.2.1 + exe sudo -u mayan ${toolRoot}/bin/pip install --no-cache-dir psycopg2==2.8.4 redis==3.4.1 endReturn -o $? } @@ -80,8 +80,7 @@ step_8_info() { echo "Initial setup $toolName and start supervisor"; } step_8() { toolScript initialsetup - exe sudo -u mayan MAYAN_MEDIA_ROOT=${toolMediaFolder} \ - ${toolRoot}/bin/mayan-edms.py collectstatic --noinput + #exe sudo -u mayan MAYAN_MEDIA_ROOT=${toolMediaFolder} ${toolRoot}/bin/mayan-edms.py collectstatic --noinput # only < 3.4 exe systemctl start supervisor } @@ -101,7 +100,7 @@ step_10() { exe sudo -u mayan ${toolRoot}/bin/pip install --no-cache-dir mayan-edms==$toolVersion endReturn -o $? toolScript performupgrade - toolScript preparestatic --noinput + #toolScript preparestatic --noinput # only < 3.4 # Generating new supervisor file step supervisorconf exe systemctl start supervisor @@ -160,6 +159,8 @@ step_22() { echo echo "Available postgresql databases:" exe cd ~postgres && sudo -u postgres psql -c '\l' + echo "Available postgresql user:" + exe cd ~postgres && sudo -u postgres psql -c '\du' } # Read postgres database information dbname/user/pass if empty @@ -191,5 +192,5 @@ toolScript() { ${toolRoot}/bin/mayan-edms.py $*" } -VERSION_SEQREV=8 +VERSION_SEQREV=10 . /usr/local/bin/sequencer.sh