Skip to content
This repository has been archived by the owner on Oct 16, 2024. It is now read-only.

Commit

Permalink
[docs] Switch to nginx with working vhosts: (#2949)
Browse files Browse the repository at this point in the history
This commit updates the nginx submodule to the voxpupuli repo
(https://github.com/jfryman/puppet-nginx.git is just a
reference to the voxpupuli repo, so nothing should change
here) and checks out to a commit before the one that reverted
the hostfix from
voxpupuli/puppet-nginx#624

This fixes the problem with nginx trying to create a vhost
configuration before installing the nginx package. This is
caused by concat not requiring the underlying nginx file
hierarchy.

This solution needs to be reverted when concat devs come up
with a working implementation of the autorequire function
in `lib/puppet/type/concat_file.rb`. The current solution
from ba643617a2a03f0588a0ec6625824a707528d9f0 (L112-L115)
is not working and the original approach:
puppetlabs/puppetlabs-concat#319
has been abandoned at some point.

For more details see the ticket:
https://datacentred.atlassian.net/browse/PD-2567.
  • Loading branch information
Mariusz Karpiarz authored and spjmurray committed Sep 20, 2016
1 parent 56c6645 commit 722b2b4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,6 @@
[submodule "modules/radius"]
path = modules/radius
url = https://github.com/datacentred/datacentred-radius.git
[submodule "modules/nginx"]
path = modules/nginx
url = https://github.com/jfryman/puppet-nginx.git
[submodule "modules/rbenv"]
path = modules/rbenv
url = https://github.com/alup/puppet-rbenv.git
Expand Down Expand Up @@ -343,3 +340,6 @@
[submodule "modules/foreman_proxy"]
path = modules/foreman_proxy
url = https://github.com/theforeman/puppet-foreman_proxy.git
[submodule "modules/nginx"]
path = modules/nginx
url = https://github.com/voxpupuli/puppet-nginx.git

0 comments on commit 722b2b4

Please sign in to comment.