Open Build Service

jsj-installtools.changes Changed

000-ssl-stapling.conf Added

CreateConfig Changed

PrepareApacheConfig Changed

@@ -1,17 +1,31 @@
 #!/bin/bash
-HOSTNAME=$1
-SHOST=$2
+HOSTNAME=""
+SHOST=""
+LOC=jsj
 JSJSHARE="/usr/share/jsjinstalltools"
 . /usr/share/jsjinstalltools/GetVersion
+while  $1"_" \! _ ; do
+  case $1 in
+	"-h")	HOSTNAME=$2; shift; shift;;
+	"-s")	SHOST="s"; shift;;
+	"-l")	LOC=$2; shift; shift;;
+	*)	echo "call: $0 -h <hostname>";
+		echo "         -l <location:jsj>";
+		echo "         -s";
+		exit 1;;
+  esac
+done
 if  -z $HOSTNAME ; then
-  echo call: $0 hostname
+  echo call: $0 -h hostname
   exit 1
 fi
-if  -z $SHOST ; then
-  SHOST=""
-else
-  SHOST="s"
-fi
+case $LOC in
+  jsj)          DOMAIN=botter.cc;;
+  hsbhv)        DOMAIN=hs-bremerhaven.de;;
+  hsb)          DOMAIN=fbw.hs-bremen.de;;
+  bb)		DOMAIN=bremische-buergerschaft.de;;
+  *)            echo Variante $VAR nicht vorgesehen, bitte prüfen!; exit;;
+esac
 echo $HOSTNAME
 zypper -n in -l phpMyAdmin
 for h in $HOSTNAME s$HOSTNAME; do
@@ -31,10 +45,12 @@
   mv $TEMPFILE /etc/apache2/listen.conf
   chmod 644 /etc/apache2/listen.conf
 fi
-if  -f $JSJSHARE/vhost.conf ; then
-  sed -e "s/HOSTNAME/$HOSTNAME/" < $JSJSHARE/vhost.conf > /etc/apache2/vhosts.d/$HOSTNAME.conf
+if  -f $JSJSHARE/vhost.conf -a -f $JSJSHARE/vhost-ssl.conf ; then
+  sed -e "s/HOSTNAME/$HOSTNAME/" -e "s/DOMAINNAME/$DOMAIN/" < $JSJSHARE/vhost-ssl.conf > /etc/apache2/vhosts.d/$HOSTNAME.conf
+  cp $JSJSHARE/dhcparam.pem /etc/ssl/
+  cp $JSJSHARE/000-ssl-stapling.conf /etc/apache2/vhosts.d/
   if  x$SHOST = xs ; then
-    sed -e "s/HOSTNAME/s$HOSTNAME/" < $JSJSHARE/vhost.conf > /etc/apache2/vhosts.d/s$HOSTNAME.conf
+    sed -e "s/HOSTNAME/s$HOSTNAME/" -e "s/DOMAINNAME/$DOMAIN/" < $JSJSHARE/vhost.conf > /etc/apache2/vhosts.d/s$HOSTNAME.conf
   fi
   if  ${VERSION_ID%%.*} -ge 13 ; then
     sed -i -e '/^ *Order .*allow/ i\ \ \ \ \ \ \ \ Require all granted' \

dhparam.pem Added

vhost-ssl.conf Added

@@ -0,0 +1,60 @@
+<VirtualHost *:80>
+    ServerAdmin vmadmin@local
+    ServerName HOSTNAME.DOMAINNAME
+    DocumentRoot /srv/www/HOSTNAME/htdocs/
+    ErrorLog /var/log/apache2/HOSTNAME-error_log
+    CustomLog /var/log/apache2/HOSTNAME-access_log combined
+    HostnameLookups Off
+    UseCanonicalName Off
+    ServerSignature On
+    RewriteEngine On
+    RewriteCond %{HTTPS} off
+    RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} L,R,NE
+</VirtualHost>
+<IfDefine SSL>
+<IfDefine !NOSSL>
+<VirtualHost *:443>
+    ServerName HOSTNAME.DOMAINNAME
+    DocumentRoot /srv/www/HOSTNAME/htdocs/
+    ErrorLog /var/log/apache2/HOSTNAME-error_log
+    CustomLog /var/log/apache2/HOSTNAME-access_log combined
+    CustomLog /var/log/apache2/ssl_request_log   ssl_combined
+    SSLEngine on
+    SSLProtocol All -SSLv2 -SSLv3 -TLSv1 -TLSv1.1
+    SSLCipherSuite EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH
+    SSLHonorCipherOrder on
+    SSLOpenSSLConfCmd DHParameters "/etc/ssl/dhparam.pem"
+    <IfModule mod_headers.c>
+        Header always set Strict-Transport-Security "max-age=63072000; includeSubDomains; preload"
+        Header always set X-Frame-Options SAMEORIGIN
+        Header always set X-Content-Type-Options nosniff
+    </IfModule>
+    # Requires Apache >= 2.4
+    SSLCompression off
+    # Requires Apache >= 2.4.11
+    SSLSessionTickets Off
+    SSLCertificateFile /etc/apache2/ssl.crt/HOSTNAME.DOMAINNAME.fullchain.pem
+    SSLCertificateKeyFile /etc/apache2/ssl.key/HOSTNAME.DOMAINNAME.key
+    <Files ~ "\.(cgi|shtml|phtml|php3?)$">
+        SSLOptions +StdEnvVars
+    </Files>
+    <Directory "/srv/www/cgi-bin">
+        AllowOverride None
+        Options +ExecCGI -Includes
+        SSLOptions +StdEnvVars
+        Require all granted
+    </Directory>
+    <IfModule mod_userdir.c>
+        UserDir public_html
+        Include /etc/apache2/mod_userdir.conf
+    </IfModule>
+    <Directory "/srv/www/HOSTNAME/htdocs">
+        Options -Indexes -FollowSymLinks
+        AllowOverride None
+        Require all granted
+    </Directory>
+    Alias /PM/ /srv/www/htdocs/phpMyAdmin/
+</VirtualHost>                                  
+</IfDefine>
+</IfDefine>
+

vhost.conf Changed

Changes of Revision 103