Added https support

001-ampache.conf

@@ -1,9 +1,8 @@
-DocumentRoot /var/www/
-<Directory /var/www/>
-    Options Indexes FollowSymLinks MultiViews
-    AllowOverride All
-    Order allow,deny
-    Allow from all
+<VirtualHost *:80>
+Include /etc/apache2/sites-available/ampache/common.conf
+</VirtualHost>
 
-    SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
-</Directory>
+<VirtualHost *:443>
+Include /etc/apache2/sites-available/ampache/ssl.conf
+Include /etc/apache2/sites-available/ampache/common.conf
+</VirtualHost>

Dockerfile

@@ -5,7 +5,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 ENV MYSQL_PASS **Random**
 
 ADD create_mysql_admin_user.sh run.sh /
-ADD 001-ampache.conf /etc/apache2/sites-available/
+
 COPY ampache.cfg.* /var/temp/
 
 RUN     chmod 0755 /*.sh \
@@ -34,13 +34,25 @@ RUN     chown -R www-data:www-data /var/www \
     &&  chmod -R 775 /var/www \
     &&  su -s /bin/sh -c 'cd /var/www && composer install --prefer-source --no-interaction' www-data
 RUN     apt-get purge -q -q -y --autoremove git wget ca-certificates gnupg composer \
-    &&  ln -s /etc/apache2/sites-available/001-ampache.conf /etc/apache2/sites-enabled/ \
     &&  a2enmod rewrite \
     &&  rm -rf /var/cache/* /tmp/* /var/tmp/* /root/.cache /var/www/.composer \
     &&  find /var/www -type d -name '.git' -print0 | xargs -0 -L1 -- rm -rf \
     &&  echo '30 7 * * *   /usr/bin/php /var/www/bin/catalog_update.inc' | crontab -u www-data -
 
-VOLUME ["/etc/mysql", "/var/lib/mysql", "/media", "/var/www/config", "/var/www/themes"]
-EXPOSE 80
+RUN mkdir /etc/apache2/sites-available/ampache
+
+ADD 001-ampache.conf /etc/apache2/sites-available/ampache
+ADD ssl.conf /etc/apache2/sites-available/ampache
+ADD common.conf /etc/apache2/sites-available/ampache
+ADD servercert.crt /etc/ssl/certs/
+ADD servercert.key /etc/ssl/keys/
+
+RUN ln -s /etc/apache2/mods-available/ssl.* /etc/apache2/mods-enabled/
+RUN ln -s /etc/apache2/mods-available/socache_shmcb.* /etc/apache2/mods-enabled/
+RUN ln -s /etc/apache2/sites-available/ampache/001-ampache.conf /etc/apache2/sites-available/
+RUN ln -s /etc/apache2/sites-available/001-ampache.conf /etc/apache2/sites-enabled/
+
+VOLUME ["/etc/mysql", "/var/lib/mysql", "/media", "/var/www/config", "/var/www/themes", "/etc/apache2", "/etc/ssl"]
+EXPOSE 80 443
 
 CMD ["/run.sh"]

common.conf

@@ -0,0 +1,9 @@
+DocumentRoot /var/www/
+<Directory /var/www/>
+    Options Indexes FollowSymLinks MultiViews
+    AllowOverride All
+    Order allow,deny
+    Allow from all
+
+    SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
+</Directory>

servercert.crt

@@ -0,0 +1,35 @@
+-----BEGIN CERTIFICATE-----
+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
+2FOs
+-----END CERTIFICATE-----

servercert.key

@@ -0,0 +1,52 @@
+-----BEGIN PRIVATE KEY-----
+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
+TIhEA0ddkrxUkiE4Xst6XoSLT5h2LEA=
+-----END PRIVATE KEY-----

ssl.conf

@@ -0,0 +1,3 @@
+SSLEngine on
+SSLCertificateFile /etc/ssl/certs/servercert.crt
+SSLCertificateKeyFile /etc/ssl/keys/servercert.key