Merge lp:~widelands-dev/widelands-website/update_ops_script into lp:widelands-website

[SirVer]

Adapt the update script for the new server.

[Toni Förster (stonerl)]

review: Needs Fixing

[SirVer (sirver)]

@stonerl: push back on your comments. In fact, if you try revision 541 of this script on the server, you'll see that the website ends up with the nginx default site being served after the script has ran. I debugged so far to see that there was no www.widelands.org link in /etc/nginx/sites-enabled.

My hunch is that there is a race condition between this link being deleted and created by the two systemd units, so there is a bug. Feel free to test and debug yourself.

However, even though the implementation would work as advertised, I still feel that the way I wrote the code in 542 is more defensive, hence better.

[Toni Förster (stonerl)]

Fixed it. You just need:

sudo systemctl stop wl-website

at the beginning and

sudo systemctl start wl-website

ath the and.

I left the wl-bauarbeiten.service in place but it is not necessary to call it anymore. When stopping the wl-website service it will automatically enable the bauarbeiten configuration for nginx.

[kaputtnik (franku)]

Since this is used by Sirver, he should decide if the 'fix' works or not and if he want more control or not.

@SirVer: Do you want me to merge this once it is ready?

[lp:~widelands-dev/widelands-website/update_ops_script]

543. By SirVer on 2019-06-21

Adressed reviewer comments.

[SirVer (sirver)]

Toni, as discussed in IRC. ptal.

Kaputtnik, jup, will take care of merging.

review: Needs Resubmitting

[Toni Förster (stonerl)]

LGTM :-)

review: Approve

=== modified file '_ops/apt_update.sh'
--- _ops/apt_update.sh	2016-08-26 10:55:57 +0000
+++ _ops/apt_update.sh	2019-06-21 18:30:35 +0000
@@ -1,28 +1,23 @@
 #!/bin/sh
 # Updates all packages on the server, but stops the widelands website before
 # doing so, in case mysql gets updated - it always results in really ugly
-# errors for users otherwise. Ideally, this script would switch the website to
-# a "In Maintenance" banner.
+# errors for users otherwise.
 #
-# This script requires root access.
+# This script requires sudo.
 
 set -ex
 
-if [ -z "$STY" ] && [ -z "$TMUX" ]; then 
+if [ -z "${TMUX}" ]; then 
    echo "Run inside screen or tmux in case SSH gets updated."
    exit 1
 fi
 
-apt-get update
-stop wlwebsite || true
-
-# TODO(sirver): Upgrading widelands-data takes a long time (~30 minutes or
-# longer). Use apt-mark hold to not update widelands and widelands-data to
-# bring the website up quicker again. Then only upgrade those packages later,
-# after the website is up again.
-# See http://askubuntu.com/questions/99774/exclude-packages-from-apt-get-upgrade
-apt-get dist-upgrade
-
-start wlwebsite
-
-apt-get autoremove -y
+sudo apt update
+
+sudo systemctl stop wl-website
+
+sudo apt dist-upgrade
+
+sudo systemctl start wl-website
+
+sudo apt autoremove -y