SchultesDev/nginx-php-fpm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Closes #89 fixes webroot in SSL setup

Browse Source
This commit is contained in:
Ric Harvey
2016-10-28 10:40:36 +01:00
parent acaaa0d6e7
commit dbc35c4aa1
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile
View File

@@ -6,7 +6,8 @@ ENV php_conf /etc/php5/php.ini
ENV fpm_conf /etc/php5/php-fpm.conf ENV fpm_conf /etc/php5/php-fpm.conf
ENV composer_hash e115a8dc7871f15d853148a7fbac7da27d6c0030b848d9b3dc09e2a0388afed865e6a3d6b3c0fad45c48e2b5fc1196ae ENV composer_hash e115a8dc7871f15d853148a7fbac7da27d6c0030b848d9b3dc09e2a0388afed865e6a3d6b3c0fad45c48e2b5fc1196ae
RUN apk add --no-cache bash \ RUN apk update && \
apk add --no-cache bash \
openssh-client \ openssh-client \
wget \ wget \
supervisor \ supervisor \

4
scripts/letsencrypt-setup
View File

@@ -10,6 +10,10 @@ else
# change nginx for webroot and domain name # change nginx for webroot and domain name
sed -i "s/##DOMAIN##/${DOMAIN}/g" /etc/nginx/sites-enabled/default-ssl.conf sed -i "s/##DOMAIN##/${DOMAIN}/g" /etc/nginx/sites-enabled/default-ssl.conf
sed -i "s#root /var/www/html;#root ${WEBROOT};#g" /etc/nginx/sites-available/default-ssl.conf sed -i "s#root /var/www/html;#root ${WEBROOT};#g" /etc/nginx/sites-available/default-ssl.conf
if [ ! -z "$WEBROOT" ]; then
webroot=$WEBROOT
sed -i "s#root /var/www/html;#root ${webroot};#g" /etc/nginx/sites-available/default-ssl.conf
fi
supervisorctl restart nginx supervisorctl restart nginx