diff --git a/.dockerignore b/.dockerignore index d1217cc..d0ff068 100644 --- a/.dockerignore +++ b/.dockerignore @@ -9,3 +9,4 @@ boinc apache docs html/user/img/banner.xcf +letsencrypt diff --git a/apache/Dockerfile b/apache/Dockerfile index e4c82e3..ea859b2 100644 --- a/apache/Dockerfile +++ b/apache/Dockerfile @@ -2,14 +2,18 @@ FROM boinc/server_apache:1.3.2-b2d MAINTAINER Marius Millea -#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 diff --git a/docker-compose.yml b/docker-compose.yml index 0dfbafb..7887f5f 100644 --- a/docker-compose.yml +++ b/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 diff --git a/html/project/project.inc b/html/project/project.inc index b06a5fa..1f53da3 100755 --- a/html/project/project.inc +++ b/html/project/project.inc @@ -6,6 +6,7 @@ require_once("../inc/phpmailer/PHPMailerAutoload.php"); $master_url = parse_config(get_config(), ""); 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(), ""); + $url_base = url_base(); echo "
- +