Skip to content

Commit 383f737

Browse files
committed
REL-0.10 Upgrading vhost-gen config to latest structure
1 parent ce374b1 commit 383f737

File tree

4 files changed

+36
-2
lines changed

4 files changed

+36
-2
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ LABEL \
1010
image="nginx-mainline" \
1111
vendor="cytopia" \
1212
license="MIT" \
13-
build-date="2017-09-28"
13+
build-date="2017-09-30"
1414

1515

1616
###

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Find me on **[Docker Hub](https://hub.docker.com/r/cytopia/nginx-mainline)**:
1818

1919
[![cytopia/nginx-mainline](http://dockeri.co/image/cytopia/nginx-mainline)](https://hub.docker.com/r/cytopia/nginx-mainline/)
2020

21-
<small>**Latest build:** 2017-09-28</small>
21+
<small>**Latest build:** 2017-09-30</small>
2222

2323
----
2424

data/vhost-gen/conf.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#
1111
# server: nginx
1212
# conf_dir: /etc/nginx/conf.d
13+
# custom:
1314
# vhost:
1415
# port:
1516
# name:
@@ -48,11 +49,27 @@
4849
# server: nginx
4950
server: nginx
5051

52+
5153
# Where to store the generated configuration files.
5254
# This must be a directory the web server will read
5355
# configuration files from.
5456
conf_dir: /etc/httpd/vhost.d
5557

58+
59+
# Custom directive
60+
# Everything specified here will be directly replaced
61+
# into the corresponding vhost directive:
62+
# nginx: server { HERE }
63+
# apache: <VirtualHost *:80> HERE </VirtualHost>
64+
#
65+
# How to add multiline strings?
66+
#
67+
# custom: |
68+
# custom statement 1
69+
# custom statement 2
70+
custom:
71+
72+
5673
# Vhost definition
5774
vhost:
5875
# What port should this virtual host listen on

data/vhost-gen/main.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#
1111
# server: nginx
1212
# conf_dir: /etc/nginx/conf.d
13+
# custom:
1314
# vhost:
1415
# port:
1516
# name:
@@ -48,11 +49,27 @@
4849
# server: nginx
4950
server: nginx
5051

52+
5153
# Where to store the generated configuration files.
5254
# This must be a directory the web server will read
5355
# configuration files from.
5456
conf_dir: /etc/httpd/conf.d
5557

58+
59+
# Custom directive
60+
# Everything specified here will be directly replaced
61+
# into the corresponding vhost directive:
62+
# nginx: server { HERE }
63+
# apache: <VirtualHost *:80> HERE </VirtualHost>
64+
#
65+
# How to add multiline strings?
66+
#
67+
# custom: |
68+
# custom statement 1
69+
# custom statement 2
70+
custom:
71+
72+
5673
# Vhost definition
5774
vhost:
5875
# What port should this virtual host listen on

0 commit comments

Comments
 (0)