From 493b7737dbfb9978212e30d6e8a5dc993f24520d Mon Sep 17 00:00:00 2001 From: Sumit Khanna Date: Thu, 15 Feb 2018 07:45:26 -0600 Subject: [PATCH] simpleid/openid migrated. closes #14 --- dockerfiles/HAProxySetup/haproxy-config.py | 5 +-- dockerfiles/SimpleID/000-default.conf | 13 ++++++++ dockerfiles/SimpleID/Dockerfile | 36 ++++++++++++++++++++++ dockerfiles/SimpleID/config.php | 17 ++++++++++ 4 files changed, 69 insertions(+), 2 deletions(-) create mode 100644 dockerfiles/SimpleID/000-default.conf create mode 100644 dockerfiles/SimpleID/Dockerfile create mode 100644 dockerfiles/SimpleID/config.php diff --git a/dockerfiles/HAProxySetup/haproxy-config.py b/dockerfiles/HAProxySetup/haproxy-config.py index 977f231..de2992d 100644 --- a/dockerfiles/HAProxySetup/haproxy-config.py +++ b/dockerfiles/HAProxySetup/haproxy-config.py @@ -41,8 +41,6 @@ acl is_letsencrypt path_beg -i /.well-known/acme-challenge/ # SSL Redirect - http-request set-header X-Forwarded-Port %[dst_port] - http-request add-header X-Forwarded-Proto https if {{ ssl_fc }} redirect scheme https if !{{ ssl_fc }} !is_letsencrypt use_backend bk_letsencrypt if is_letsencrypt @@ -52,6 +50,9 @@ bind :::443 v4v6 ssl crt /etc/letsencrypt/live mode http + http-request set-header X-Forwarded-Port %[dst_port] + http-request add-header X-Forwarded-Proto https if {{ ssl_fc }} + # Awstats acl is_awstats path_beg -i /stats/ use_backend bk_awstats if is_awstats diff --git a/dockerfiles/SimpleID/000-default.conf b/dockerfiles/SimpleID/000-default.conf new file mode 100644 index 0000000..c09fbd6 --- /dev/null +++ b/dockerfiles/SimpleID/000-default.conf @@ -0,0 +1,13 @@ + + + DocumentRoot /var/www/html + ErrorLog ${APACHE_LOG_DIR}/error.log + CustomLog ${APACHE_LOG_DIR}/access.log combined + + + Options -Indexes +FollowSymLinks + AllowOverride All + Require all granted + + + diff --git a/dockerfiles/SimpleID/Dockerfile b/dockerfiles/SimpleID/Dockerfile new file mode 100644 index 0000000..da598d7 --- /dev/null +++ b/dockerfiles/SimpleID/Dockerfile @@ -0,0 +1,36 @@ +FROM php:7.2.2-apache-stretch + +ENV SIMPLEID_VERSION 1.0.2 +ENV DOMAIN openid.example.com +ENV APP_DIR /var/www/html + +# Apache Setup +RUN a2enmod rewrite +RUN sed -i "s/80/8080/g" /etc/apache2/ports.conf +COPY 000-default.conf /etc/apache2/sites-available/000-default.conf +EXPOSE 8080 + +# PHP Extensions +RUN docker-php-ext-install bcmath +RUN apt-get update && apt-get install -y libgmp-dev \ + && docker-php-ext-install gmp \ + && rm -rf /var/lib/apt/lists/* + +# State +RUN mkdir -p /simpleid/identities +RUN mkdir -p /simpleid/cache +RUN mkdir -p /simpleid/store +VOLUME ["/simpleid"] + +# SimpleID +WORKDIR /opt +RUN mkdir simpleid +RUN curl -L https://downloads.sourceforge.net/project/simpleid/simpleid/$SIMPLEID_VERSION/simpleid-$SIMPLEID_VERSION.tar.gz -o r.tgz +RUN tar xfz r.tgz +RUN mv simpleid/www/.htaccess.dist $APP_DIR/.htaccess +RUN mv simpleid/www/* $APP_DIR +COPY config.php $APP_DIR + +# Cleanup +RUN rm -rf /opt/simpleid +RUN rm -rf /opt/r.tgz diff --git a/dockerfiles/SimpleID/config.php b/dockerfiles/SimpleID/config.php new file mode 100644 index 0000000..e338622 --- /dev/null +++ b/dockerfiles/SimpleID/config.php @@ -0,0 +1,17 @@ +