Skip to content

Commit

Permalink
Merge pull request #12 from devilbox/release-0.17
Browse files Browse the repository at this point in the history
Release 0.17
  • Loading branch information
cytopia committed Jun 23, 2018
2 parents d0ad25d + e233006 commit cfe1141
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MAINTAINER "cytopia" <[email protected]>
###
### Build arguments
###
ARG VHOST_GEN_GIT_REF=0.5
ARG VHOST_GEN_GIT_REF=0.7
ARG CERT_GEN_GIT_REF=0.2

ENV BUILD_DEPS \
Expand Down Expand Up @@ -37,7 +37,6 @@ ENV HTTPD_RELOAD="/usr/local/apache2/bin/httpd -k stop"
# required packages
RUN set -x \
&& apt-get update \
&& apt-get upgrade -y \
&& apt-get install --no-install-recommends --no-install-suggests -y \
${BUILD_DEPS} \
${RUN_DEPS} \
Expand Down
3 changes: 3 additions & 0 deletions data/vhost-gen/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ vhost:
# to prepend another subdirectory here.
docroot:
suffix:
# Array of indecies to serve as default files (e.g.: index.php, index.html, etc)
index:
- index.php
# SSL Definition
ssl:
dir_crt: /etc/httpd/cert/main
Expand Down
5 changes: 5 additions & 0 deletions data/vhost-gen/mass.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,11 @@ vhost:
# to prepend another subdirectory here.
docroot:
suffix: __DOCROOT_SUFFIX__
# Array of indecies to serve as default files (e.g.: index.php, index.html, etc)
index:
- index.php
- index.html
- index.htm
# SSL Definition
ssl:
dir_crt: /etc/httpd/cert/mass
Expand Down

0 comments on commit cfe1141

Please sign in to comment.