Merge branch '3' back to master for release.

Author: RainerEmrich

README.md

@@ -1,6 +1,6 @@
 # install-cloud-server
 
-Script collection to setup a cloud server with Ubuntu 16.04 or Debian 8.
+Script collection to setup a cloud server with Ubuntu 16.04, Debian 8 or Debian 9.
 Installs and sets up all required packages for nextcloud.
 Finally installs nextcloud.
 
@@ -10,7 +10,7 @@ Optionally installs additional nextcloud apps.
 ## Requirements
 
 The scripts collection is tested for an 1&1 cloud server, Ubuntu 16.04,
-64-bit, standard installation and Debian 8, 64-bit, standard installation.
+64-bit, standard installation, Debian 8 and Debian 9, 64-bit, standard installation.
 
 1. For the scripts to work, you have to setup such a server as descripted in my blog at https://blog.emrich-ebersheim.de/2016/09/05/11-cloud-server-unter-ubuntu-16-04-1-lts-teil-1-server-erstellen/ (in german). For testing purposes a Cloud Server S incl. one public IP is sufficient.
 2. You have to point a DNS Entry for the host itself and a DNS Entry for the nexcloud instance to the public IP you've got.
@@ -201,5 +201,4 @@ The script collection is based on my two article series about 1&1 cloud serv
 
 ## Status
 
-Last tested with Ubuntu 16.04 on 4th of April 2018.
-Last tested with Debian 8 on 4th of April 2018.
+Last tested with Ubuntu 16.04, Debian 8 and Debian 9 on 13th of April 2018.

archives/html.debian8.tar

@@ -1,6 +1,8 @@
 <IfModule mod_ssl.c>
 <VirtualHost *:443>
-	Protocols h2 http/1.1
+	<IfModule http2_module>
+		Protocols h2 http/1.1
+	</IfModule>
 
 	# The ServerName directive sets the request scheme, hostname and port that
 	# the server uses to identify itself. This is used when creating

archives/html.debian9.tar

@@ -1,4 +1,8 @@
 <VirtualHost myhost.mydomain.tld:443>
+	<IfModule http2_module>
+		Protocols h2 http/1.1
+	</IfModule>
+
 	# The ServerName directive sets the request scheme, hostname and port that
 	# the server uses to identify itself. This is used when creating
 	# redirection URLs. In the context of virtual hosts, the ServerName

data/etc/apache2/sites-available/000-default-le-ssl.conf

@@ -1,4 +1,8 @@
 <VirtualHost myhost.mydomain.tld:443>
+	<IfModule http2_module>
+		Protocols h2 http/1.1
+	</IfModule>
+
 	# The ServerName directive sets the request scheme, hostname and port that
 	# the server uses to identify itself. This is used when creating
 	# redirection URLs. In the context of virtual hosts, the ServerName

data/etc/apache2/sites-available/998-mycloud-mydomain-tld.conf

@@ -1,6 +1,8 @@
 <IfModule mod_ssl.c>
 <VirtualHost myhost.mydomain.tld:443>
-	Protocols h2 http/1.1
+	<IfModule http2_module>
+		Protocols h2 http/1.1
+	</IfModule>
 
 	# The ServerName directive sets the request scheme, hostname and port that
 	# the server uses to identify itself. This is used when creating
@@ -30,16 +32,6 @@
 		SetEnv HTTP_HOME my_document_root
 	</Directory>
 
-	# Directory for letsencrypt webroot challenge.
-
-	Alias /.well-known/ "/var/www/html/.well-known/"
-
-	<Directory "/var/www/html/.well-known/">
-		Options None
-		AllowOverride None
-		Require all granted
-	</Directory>
-
 	# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
 	# error, crit, alert, emerg.
 	# It is also possible to configure the loglevel for particular

data/etc/apache2/sites-available/998-myoffice-mydomain-tld.conf

@@ -1,6 +1,8 @@
 <IfModule mod_ssl.c>
 <VirtualHost myhost.mydomain.tld:443>
-	Protocols h2 http/1.1
+	<IfModule http2_module>
+		Protocols h2 http/1.1
+	</IfModule>
 
 	# The ServerName directive sets the request scheme, hostname and port that
 	# the server uses to identify itself. This is used when creating

data/etc/apache2/sites-available/999-mycloud-mydomain-tld-le-ssl.conf

@@ -1,6 +1,8 @@
 <IfModule mod_ssl.c>
 <VirtualHost myhost.mydomain.tld:443>
-	Protocols h2 http/1.1
+	<IfModule http2_module>
+		Protocols h2 http/1.1
+	</IfModule>
 
 	# The ServerName directive sets the request scheme, hostname and port that
 	# the server uses to identify itself. This is used when creating
@@ -49,9 +51,9 @@
 
 	# Directory for letsencrypt webroot challenge.
 
-	Alias /.well-known/ "/var/www/html/.well-known/"
+	Alias /.well-known/acme-challenge/ "/var/www/html/.well-known/acme-challenge/"
 
-	<Directory "/var/www/html/.well-known/">
+	<Directory "/var/www/html/.well-known/acme-challenge/">
 		Options None
 		AllowOverride None
 		Require all granted

data/etc/apache2/sites-available/999-myhost-mydomain-tld-le-ssl.conf

@@ -3,7 +3,7 @@
 # MySQL databases backup script
 # keeps numbackup backups
 #
-# Copyright 2017 Rainer Emrich, <[email protected]>
+# Copyright (C) 2017-2018 Rainer Emrich, <[email protected]>
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by