From 8165032e43ed4eb76411547ab542aaa9df9cf9f0 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Tue, 30 Jun 2020 10:55:22 +0200 Subject: [PATCH 1/4] fixes restart on rpm or deb installations Removes jsvc from rpm and deb package and makes more use of systemd --- CHANGELOG.md | 1 + scm-packaging/deb/pom.xml | 36 ----- scm-packaging/deb/src/main/bin/scm-server | 146 ++---------------- .../deb/src/main/fs/etc/default/scm-server | 9 -- .../deb/src/main/fs/etc/scm/logging.xml | 3 +- .../fs/etc/systemd/system/scm-server.service | 11 +- scm-packaging/rpm/pom.xml | 41 ----- scm-packaging/rpm/src/main/bin/scm-server | 146 ++---------------- .../rpm/src/main/fs/etc/default/scm-server | 9 -- .../rpm/src/main/fs/etc/scm/logging.xml | 3 +- .../fs/etc/systemd/system/scm-server.service | 11 +- .../src/main/scripts/after-installation.sh | 6 +- 12 files changed, 42 insertions(+), 380 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 09947917d0..b108cd0f11 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - Fixed installation of debian packages on distros without preinstalled `at` ([#1216](https://github.com/scm-manager/scm-manager/issues/1216) and [#1217](https://github.com/scm-manager/scm-manager/pull/1217)) +- Fixed restart with deb or rpm installation ([#1222](https://github.com/scm-manager/scm-manager/issues/1222)) ## [2.1.1] - 2020-06-23 ### Fixed diff --git a/scm-packaging/deb/pom.xml b/scm-packaging/deb/pom.xml index 7a3d0c9b47..960225020e 100644 --- a/scm-packaging/deb/pom.xml +++ b/scm-packaging/deb/pom.xml @@ -73,30 +73,6 @@ true - - copy-jsvc - prepare-package - - unpack - - - - - commons-daemon - commons-daemon-native - 1.1.0 - tar.gz - - - - - - **/jsvc-linux-* - ${project.build.directory}/deb/libexec - false - true - - copy-webapp prepare-package @@ -208,18 +184,6 @@ - - directory - ${project.build.directory}/deb/libexec - - perm - /opt/scm-server/libexec - root - scm - 0755 - - - file src/main/fs/opt/scm-server/var/webapp/docroot/index.html diff --git a/scm-packaging/deb/src/main/bin/scm-server b/scm-packaging/deb/src/main/bin/scm-server index 1321985a59..4adbc09294 100755 --- a/scm-packaging/deb/src/main/bin/scm-server +++ b/scm-packaging/deb/src/main/bin/scm-server @@ -18,58 +18,14 @@ # Copyright (c) 2001-2002 The Apache Software Foundation. All rights # reserved. -# user used to run the daemon (defaults to current user) -USER="scm" - # extra jvm arguments EXTRA_JVM_ARGUMENTS="-Djava.awt.headless=true -Dlogback.configurationFile=logging.xml" BASEDIR="/opt/scm-server" -# set pid path for jsvc -PIDFILE="/var/run/scm-server.pid" - -# set log dir for jsvc -LOGDIR="/var/log/scm" - # load settings from defaults directory [ -r /etc/default/scm-server ] && . /etc/default/scm-server -OS=`uname | tr '[:upper:]' '[:lower:]'` -ARCH=`uname -m` - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -case "$OS" in - sunos*) OS="solaris" - ARCH=`uname -p` - ;; - cygwin*) cygwin=true ;; - darwin*) darwin=true - if [ -z "$JAVA_VERSION" ] ; then - JAVA_VERSION="CurrentJDK" - else - echo "Using Java version: $JAVA_VERSION" - fi - if [ -z "$JAVA_HOME" ] ; then - JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home - fi - ;; -esac - -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=`java-config --jre-home` - fi -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"` -fi - # If a specific java binary isn't specified search for the standard 'java' binary if [ -z "$JAVACMD" ] ; then if [ -n "$JAVA_HOME" ] ; then @@ -97,96 +53,12 @@ fi CLASSPATH=$CLASSPATH_PREFIX:"$BASEDIR"/conf:"$REPO"/* -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --windows "$CLASSPATH"` - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - [ -n "$HOME" ] && HOME=`cygpath --path --windows "$HOME"` - [ -n "$BASEDIR" ] && BASEDIR=`cygpath --path --windows "$BASEDIR"` - [ -n "$REPO" ] && REPO=`cygpath --path --windows "$REPO"` -fi - -jsvc=false; -stop=""; - -if [ "$1" == "start" ] -then - jsvc=true; -else - if [ "$1" == "stop" ] - then - jsvc=true; - stop='-stop'; - fi -fi - -USER_ARGUMENT="" - -if [ "x$USER" != "x" ] -then - USER_ARGUMENT="-user $USER" -fi - -DARWIN_USE_ARCH="false" - -if $jsvc; then - - JSVCCMD="" - if [ "$OS" == "darwin" ]; then - if [ "$DARWIN_USE_ARCH" == "true" ]; then - JSVCCMD="/usr/bin/arch -arch $ARCH $BASEDIR/libexec/jsvc-$OS" - else - JSVCCMD="exec $BASEDIR/libexec/jsvc-$OS" - fi - else - JSVCCMD="exec $BASEDIR/libexec/jsvc-$OS-$ARCH" - fi - - # try to extract JAVA_HOME from JAVACMD - if [ -z "$JAVA_HOME" ] ; then - PRG="$JAVACMD" - while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG="`dirname "$PRG"`/$link" - fi - done - DIR="$(dirname "$PRG")" - DIR="$(dirname "$DIR")" - if [ -d "$DIR" ] ; then - JAVA_HOME="$DIR" - fi - fi - - # TODO JVM Arguments - - $JSVCCMD -cp "$CLASSPATH" $JAVA_OPTS \ - $EXTRA_JVM_ARGUMENTS $USER_ARGUMENT \ - -outfile "$LOGDIR/scm-server.out" \ - -errfile "$LOGDIR/scm-server.err" \ - -pidfile "$PIDFILE" \ - -jvm server \ - -home "$JAVA_HOME" \ - -Dapp.name="scm-server" \ - -Dapp.pid="$$" \ - -Dapp.repo="$REPO" \ - -Dbasedir="$BASEDIR" \ - $stop sonia.scm.server.ScmServerDaemon \ - "$@" - -else - - exec "$JAVACMD" $JAVA_OPTS \ - $EXTRA_JVM_ARGUMENTS \ - -classpath "$CLASSPATH" \ - -Dapp.name="scm-server" \ - -Dapp.pid="$$" \ - -Dapp.repo="$REPO" \ - -Dbasedir="$BASEDIR" \ - sonia.scm.server.ScmServerDaemon \ - "$@" - -fi +exec "$JAVACMD" $JAVA_OPTS \ + $EXTRA_JVM_ARGUMENTS \ + -classpath "$CLASSPATH" \ + -Dapp.name="scm-server" \ + -Dapp.pid="$$" \ + -Dapp.repo="$REPO" \ + -Dbasedir="$BASEDIR" \ + sonia.scm.server.ScmServerDaemon \ + "$@" diff --git a/scm-packaging/deb/src/main/fs/etc/default/scm-server b/scm-packaging/deb/src/main/fs/etc/default/scm-server index 959947d33f..619e61eaf9 100644 --- a/scm-packaging/deb/src/main/fs/etc/default/scm-server +++ b/scm-packaging/deb/src/main/fs/etc/default/scm-server @@ -29,21 +29,12 @@ HOST=0.0.0.0 # scm-server port PORT=8080 -# change user -USER=scm - # home of scm-manager export SCM_HOME=/var/lib/scm # force jvm path # JAVA_HOME="/usr/lib/jvm/java-11-openjdk-amd64" -# path to pid -PIDFILE=/var/run/scm/scm.pid - -# path to log directory -LOGDIR=/var/log/scm - # increase memory # EXTRA_JVM_ARGUMENTS="$EXTRA_JVM_ARGUMENTS -Xms1g -Xmx1g" diff --git a/scm-packaging/deb/src/main/fs/etc/scm/logging.xml b/scm-packaging/deb/src/main/fs/etc/scm/logging.xml index b3f4014265..b048b71c29 100644 --- a/scm-packaging/deb/src/main/fs/etc/scm/logging.xml +++ b/scm-packaging/deb/src/main/fs/etc/scm/logging.xml @@ -100,7 +100,8 @@ - + + diff --git a/scm-packaging/deb/src/main/fs/etc/systemd/system/scm-server.service b/scm-packaging/deb/src/main/fs/etc/systemd/system/scm-server.service index 58ef9de558..e37e8f5ee7 100644 --- a/scm-packaging/deb/src/main/fs/etc/systemd/system/scm-server.service +++ b/scm-packaging/deb/src/main/fs/etc/systemd/system/scm-server.service @@ -3,14 +3,19 @@ Description=SCM-Manager Server After=syslog.target network.target [Service] -Type=forking +Type=simple User=scm Group=scm WorkingDirectory=/opt/scm-server -ExecStart=/opt/scm-server/bin/scm-server start -ExecStop=/opt/scm-server/bin/scm-server stop +ExecStart=/opt/scm-server/bin/scm-server +Restart=on-failure + +# Exit code 143 means that the program received a SIGTERM signal to instruct it to exit, +# but it did not handle the signal properly. +# we suppress that warning for now +SuccessExitStatus=143 [Install] WantedBy=multi-user.target diff --git a/scm-packaging/rpm/pom.xml b/scm-packaging/rpm/pom.xml index fa5743c9c5..6fa1dff083 100644 --- a/scm-packaging/rpm/pom.xml +++ b/scm-packaging/rpm/pom.xml @@ -73,30 +73,6 @@ true - - copy-jsvc - prepare-package - - unpack - - - - - commons-daemon - commons-daemon-native - 1.1.0 - tar.gz - - - - - - **/jsvc-linux-* - ${project.build.directory}/rpm/libexec - false - true - - copy-webapp prepare-package @@ -163,15 +139,6 @@ scm 0644 - - - file - /opt/scm-server/libexec - - root - scm - 0755 - @@ -229,14 +196,6 @@ default - - /opt/scm-server/libexec - - ${project.build.directory}/rpm/libexec - - default - - /opt/scm-server/var/webapp/docroot/index.html src/main/fs/opt/scm-server/var/webapp/docroot/index.html diff --git a/scm-packaging/rpm/src/main/bin/scm-server b/scm-packaging/rpm/src/main/bin/scm-server index 1321985a59..4adbc09294 100755 --- a/scm-packaging/rpm/src/main/bin/scm-server +++ b/scm-packaging/rpm/src/main/bin/scm-server @@ -18,58 +18,14 @@ # Copyright (c) 2001-2002 The Apache Software Foundation. All rights # reserved. -# user used to run the daemon (defaults to current user) -USER="scm" - # extra jvm arguments EXTRA_JVM_ARGUMENTS="-Djava.awt.headless=true -Dlogback.configurationFile=logging.xml" BASEDIR="/opt/scm-server" -# set pid path for jsvc -PIDFILE="/var/run/scm-server.pid" - -# set log dir for jsvc -LOGDIR="/var/log/scm" - # load settings from defaults directory [ -r /etc/default/scm-server ] && . /etc/default/scm-server -OS=`uname | tr '[:upper:]' '[:lower:]'` -ARCH=`uname -m` - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -case "$OS" in - sunos*) OS="solaris" - ARCH=`uname -p` - ;; - cygwin*) cygwin=true ;; - darwin*) darwin=true - if [ -z "$JAVA_VERSION" ] ; then - JAVA_VERSION="CurrentJDK" - else - echo "Using Java version: $JAVA_VERSION" - fi - if [ -z "$JAVA_HOME" ] ; then - JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home - fi - ;; -esac - -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=`java-config --jre-home` - fi -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"` -fi - # If a specific java binary isn't specified search for the standard 'java' binary if [ -z "$JAVACMD" ] ; then if [ -n "$JAVA_HOME" ] ; then @@ -97,96 +53,12 @@ fi CLASSPATH=$CLASSPATH_PREFIX:"$BASEDIR"/conf:"$REPO"/* -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --windows "$CLASSPATH"` - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - [ -n "$HOME" ] && HOME=`cygpath --path --windows "$HOME"` - [ -n "$BASEDIR" ] && BASEDIR=`cygpath --path --windows "$BASEDIR"` - [ -n "$REPO" ] && REPO=`cygpath --path --windows "$REPO"` -fi - -jsvc=false; -stop=""; - -if [ "$1" == "start" ] -then - jsvc=true; -else - if [ "$1" == "stop" ] - then - jsvc=true; - stop='-stop'; - fi -fi - -USER_ARGUMENT="" - -if [ "x$USER" != "x" ] -then - USER_ARGUMENT="-user $USER" -fi - -DARWIN_USE_ARCH="false" - -if $jsvc; then - - JSVCCMD="" - if [ "$OS" == "darwin" ]; then - if [ "$DARWIN_USE_ARCH" == "true" ]; then - JSVCCMD="/usr/bin/arch -arch $ARCH $BASEDIR/libexec/jsvc-$OS" - else - JSVCCMD="exec $BASEDIR/libexec/jsvc-$OS" - fi - else - JSVCCMD="exec $BASEDIR/libexec/jsvc-$OS-$ARCH" - fi - - # try to extract JAVA_HOME from JAVACMD - if [ -z "$JAVA_HOME" ] ; then - PRG="$JAVACMD" - while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG="`dirname "$PRG"`/$link" - fi - done - DIR="$(dirname "$PRG")" - DIR="$(dirname "$DIR")" - if [ -d "$DIR" ] ; then - JAVA_HOME="$DIR" - fi - fi - - # TODO JVM Arguments - - $JSVCCMD -cp "$CLASSPATH" $JAVA_OPTS \ - $EXTRA_JVM_ARGUMENTS $USER_ARGUMENT \ - -outfile "$LOGDIR/scm-server.out" \ - -errfile "$LOGDIR/scm-server.err" \ - -pidfile "$PIDFILE" \ - -jvm server \ - -home "$JAVA_HOME" \ - -Dapp.name="scm-server" \ - -Dapp.pid="$$" \ - -Dapp.repo="$REPO" \ - -Dbasedir="$BASEDIR" \ - $stop sonia.scm.server.ScmServerDaemon \ - "$@" - -else - - exec "$JAVACMD" $JAVA_OPTS \ - $EXTRA_JVM_ARGUMENTS \ - -classpath "$CLASSPATH" \ - -Dapp.name="scm-server" \ - -Dapp.pid="$$" \ - -Dapp.repo="$REPO" \ - -Dbasedir="$BASEDIR" \ - sonia.scm.server.ScmServerDaemon \ - "$@" - -fi +exec "$JAVACMD" $JAVA_OPTS \ + $EXTRA_JVM_ARGUMENTS \ + -classpath "$CLASSPATH" \ + -Dapp.name="scm-server" \ + -Dapp.pid="$$" \ + -Dapp.repo="$REPO" \ + -Dbasedir="$BASEDIR" \ + sonia.scm.server.ScmServerDaemon \ + "$@" diff --git a/scm-packaging/rpm/src/main/fs/etc/default/scm-server b/scm-packaging/rpm/src/main/fs/etc/default/scm-server index 4a5d2fe86c..8f882580c4 100644 --- a/scm-packaging/rpm/src/main/fs/etc/default/scm-server +++ b/scm-packaging/rpm/src/main/fs/etc/default/scm-server @@ -29,21 +29,12 @@ HOST=0.0.0.0 # scm-server port PORT=8080 -# change user -USER=scm - # home of scm-manager export SCM_HOME=/var/lib/scm # force jvm path # JAVA_HOME="/usr/lib/jvm/jre-11" -# path to pid -PIDFILE=/var/run/scm/scm.pid - -# path to log directory -LOGDIR=/var/log/scm - # increase memory # EXTRA_JVM_ARGUMENTS="$EXTRA_JVM_ARGUMENTS -Xms1g -Xmx1g" diff --git a/scm-packaging/rpm/src/main/fs/etc/scm/logging.xml b/scm-packaging/rpm/src/main/fs/etc/scm/logging.xml index b3f4014265..b048b71c29 100644 --- a/scm-packaging/rpm/src/main/fs/etc/scm/logging.xml +++ b/scm-packaging/rpm/src/main/fs/etc/scm/logging.xml @@ -100,7 +100,8 @@ - + + diff --git a/scm-packaging/rpm/src/main/fs/etc/systemd/system/scm-server.service b/scm-packaging/rpm/src/main/fs/etc/systemd/system/scm-server.service index 58ef9de558..e37e8f5ee7 100644 --- a/scm-packaging/rpm/src/main/fs/etc/systemd/system/scm-server.service +++ b/scm-packaging/rpm/src/main/fs/etc/systemd/system/scm-server.service @@ -3,14 +3,19 @@ Description=SCM-Manager Server After=syslog.target network.target [Service] -Type=forking +Type=simple User=scm Group=scm WorkingDirectory=/opt/scm-server -ExecStart=/opt/scm-server/bin/scm-server start -ExecStop=/opt/scm-server/bin/scm-server stop +ExecStart=/opt/scm-server/bin/scm-server +Restart=on-failure + +# Exit code 143 means that the program received a SIGTERM signal to instruct it to exit, +# but it did not handle the signal properly. +# we suppress that warning for now +SuccessExitStatus=143 [Install] WantedBy=multi-user.target diff --git a/scm-packaging/rpm/src/main/scripts/after-installation.sh b/scm-packaging/rpm/src/main/scripts/after-installation.sh index 474eae5df9..671d91fdff 100644 --- a/scm-packaging/rpm/src/main/scripts/after-installation.sh +++ b/scm-packaging/rpm/src/main/scripts/after-installation.sh @@ -32,8 +32,8 @@ if [ -d "${WORKDIR}" ]; then fi # reload systemd and make service available -systemctl daemon-reload +systemctl --system daemon-reload >/dev/null || true # enable and start the service -sudo systemctl enable scm-server -sudo systemctl start scm-server +systemctl enable scm-server +systemctl start scm-server From dac25f54562e8abcf94cea8afc754487e4db2d54 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Tue, 30 Jun 2020 11:13:06 +0200 Subject: [PATCH 2/4] restart service on rpm or deb package upgrade --- CHANGELOG.md | 1 + .../deb/src/main/deb/control/postinst | 23 +++++++++++++++---- .../src/main/scripts/after-installation.sh | 18 +++++++++++---- 3 files changed, 34 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b108cd0f11..cb4d824441 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased ### Added - enrich commit mentions in markdown viewer by internal links ([#1210](https://github.com/scm-manager/scm-manager/pull/1210)) +- restart service after rpm or deb package upgrade ### Changed - Checkboxes can now be 'indeterminate' ([#1215](https://github.com/scm-manager/scm-manager/pull/1215)) diff --git a/scm-packaging/deb/src/main/deb/control/postinst b/scm-packaging/deb/src/main/deb/control/postinst index 0bd5ff952d..0ca852da1f 100644 --- a/scm-packaging/deb/src/main/deb/control/postinst +++ b/scm-packaging/deb/src/main/deb/control/postinst @@ -37,7 +37,22 @@ systemctl daemon-reload # enable and start the service sudo systemctl enable scm-server -# we start scm-manager after 5 seconds -# this is required, because if we install scm-manager with recommend java -# java is not fully setup if we ran our postint script -nohup sh -c "sleep 5; systemctl start scm-server" >/dev/null 2>&1 & +# reload systemd and make service available +systemctl --system daemon-reload || true + +# enable service +if ! systemctl is-enabled scm-server >/dev/null +then + systemctl enable scm-server +fi + +# start or restart service +if systemctl is-active scm-server >/dev/null +then + systemctl restart scm-server +else + # we start scm-manager after 5 seconds + # this is required, because if we install scm-manager with recommend java + # java is not fully setup if we ran our postint script + nohup sh -c "sleep 5; systemctl start scm-server" >/dev/null 2>&1 & +fi diff --git a/scm-packaging/rpm/src/main/scripts/after-installation.sh b/scm-packaging/rpm/src/main/scripts/after-installation.sh index 671d91fdff..6bd95afbe0 100644 --- a/scm-packaging/rpm/src/main/scripts/after-installation.sh +++ b/scm-packaging/rpm/src/main/scripts/after-installation.sh @@ -32,8 +32,18 @@ if [ -d "${WORKDIR}" ]; then fi # reload systemd and make service available -systemctl --system daemon-reload >/dev/null || true +systemctl --system daemon-reload || true -# enable and start the service -systemctl enable scm-server -systemctl start scm-server +# enable service +if ! systemctl is-enabled scm-server >/dev/null +then + systemctl enable scm-server +fi + +# start or restart service +if systemctl is-active scm-server >/dev/null +then + systemctl restart scm-server +else + systemctl start scm-server +fi From 9f1d1f85ecca6ae8172720cfbdca6f4214f852b0 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Tue, 30 Jun 2020 11:18:32 +0200 Subject: [PATCH 3/4] added pr link to changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cb4d824441..be35396499 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - Fixed installation of debian packages on distros without preinstalled `at` ([#1216](https://github.com/scm-manager/scm-manager/issues/1216) and [#1217](https://github.com/scm-manager/scm-manager/pull/1217)) -- Fixed restart with deb or rpm installation ([#1222](https://github.com/scm-manager/scm-manager/issues/1222)) +- Fixed restart with deb or rpm installation ([#1222](https://github.com/scm-manager/scm-manager/issues/1222) and [#1227](https://github.com/scm-manager/scm-manager/pull/1227)) ## [2.1.1] - 2020-06-23 ### Fixed From d26873f9c6366eaddf271a61f761db6a365e64ec Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Wed, 1 Jul 2020 07:09:51 +0200 Subject: [PATCH 4/4] adds missing architecture to debian installation documentation --- CHANGELOG.md | 1 + docs/en/installation/debian.md | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d101790c7..7eb88e6c62 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - Fixed installation of debian packages on distros without preinstalled `at` ([#1216](https://github.com/scm-manager/scm-manager/issues/1216) and [#1217](https://github.com/scm-manager/scm-manager/pull/1217)) - Fixed broken migration with empty security.xml ([#1219](https://github.com/scm-manager/scm-manager/issues/1219) and [#1221](https://github.com/scm-manager/scm-manager/pull/1221)) +- Added missing architecture to debian installation documentation ([#1230](https://github.com/scm-manager/scm-manager/pull/1230)) ## [2.1.1] - 2020-06-23 ### Fixed diff --git a/docs/en/installation/debian.md b/docs/en/installation/debian.md index 79344139b3..fb4e7d0a06 100644 --- a/docs/en/installation/debian.md +++ b/docs/en/installation/debian.md @@ -9,7 +9,7 @@ displayToc: true The following code block will configure an apt repository for scm-manager and install it. ```bash -echo 'deb https://packages.scm-manager.org/repository/apt-v2-releases/ stable main' | sudo tee /etc/apt/sources.list.d/scm-manager.list +echo 'deb [arch=all] https://packages.scm-manager.org/repository/apt-v2-releases/ stable main' | sudo tee /etc/apt/sources.list.d/scm-manager.list sudo apt-key adv --recv-keys --keyserver hkps://keys.openpgp.org 0x975922F193B07D6E sudo apt-get update sudo apt-get install scm-server @@ -24,7 +24,7 @@ To install SCM-Manager as a debian package (.deb), we have to configure an apt r Create a file at `/etc/apt/sources.list.d/scm-manager.list` with the following content: ```text -deb https://packages.scm-manager.org/repository/apt-v2-releases/ stable main +deb [arch=all] https://packages.scm-manager.org/repository/apt-v2-releases/ stable main ``` This will add the apt repository of the scm-manager stable releases to the list of your apt repositories.