https option

.dockerignore

@@ -9,3 +9,4 @@ boinc
 apache
 docs
 html/user/img/banner.xcf
+letsencrypt

apache/Dockerfile

@@ -2,14 +2,18 @@ FROM boinc/server_apache:1.3.2-b2d
 
 MAINTAINER Marius Millea <mariusmillea@gmail.com>
 
-#install packages 
-RUN apt-get update && apt-get install -y \
+# install packages 
+RUN echo "deb http://ftp.debian.org/debian jessie-backports main" >> /etc/apt/sources.list \ 
+    && apt-get update && apt-get install -y \
         python-matplotlib \
         python-mysqldb \
         python-numpy \
         python-scipy \
         python-yaml \
-        vim
+        vim \
+    && apt-get install -y python-certbot-apache -t jessie-backports
 
-#get xkcd font
+RUN a2enmod ssl
+
+# get xkcd font
 RUN curl -L http://antiyawn.com/uploads/Humor-Sans-1.0.ttf > /usr/share/matplotlib/mpl-data/fonts/ttf/Humor-Sans.ttf

docker-compose.yml

@@ -36,8 +36,10 @@ services:
      - "project:/root/project"
      - "results:/results"
      - "/var/run/docker.sock:/var/run/docker.sock"
+     - "./letsencrypt:/etc/letsencrypt"
     ports: 
      - "80:80"
+     - "443:443"
     tty: true
 
 

html/project/project.inc

@@ -6,6 +6,7 @@ require_once("../inc/phpmailer/PHPMailerAutoload.php");
 $master_url = parse_config(get_config(), "<master_url>");
 define("PROJECT", "Cosmology@Home");
 define("URL_BASE", $master_url);
+define("SECURE_URL_BASE",str_replace("http","https",$master_url));
 define("IMAGE_PATH", "../user_profile/images/");
 define("IMAGE_URL", "user_profile/images/");
 define("PROFILE_PATH", "../user_profile/");
@@ -97,11 +98,11 @@ END;
 
 function project_banner($title, $prefix) {
     // Put your project title and logo here
-    $master_url = parse_config(get_config(), "<master_url>");
+    $url_base = url_base();
     echo "<div id='container'>	
    <!-- Navigation -->
    <div id='topmatter'>
-    <a href='$master_url'><img src='/img/banner.jpg' border='0' height='200px' width='960px' padding='0px'/></a>
+    <a href='$url_base'><img src='/img/banner.jpg' border='0' height='200px' width='960px' padding='0px'/></a>
       <div id='navmenu'>
         <ul id='nav_ul'>
           <li><a href='/join.php'>JOIN</a></li>