From 6dcba34e3fd65ce123b7cf28f00eb2e9ce31fa55 Mon Sep 17 00:00:00 2001 From: Mariusz Karpiarz Date: Tue, 20 Sep 2016 11:39:57 +0100 Subject: [PATCH] [docs] Switch to nginx with working vhosts: 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 https://github.com/voxpupuli/puppet-nginx/pull/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: https://github.com/puppetlabs/puppetlabs-concat/pull/319 has been abandoned at some point. For more details see the ticket: https://datacentred.atlassian.net/browse/PD-2567. --- .gitmodules | 6 +++--- modules/nginx | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index a0bc7e5c1..234d2e52a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 @@ -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 diff --git a/modules/nginx b/modules/nginx index d3826d74d..310ed828c 160000 --- a/modules/nginx +++ b/modules/nginx @@ -1 +1 @@ -Subproject commit d3826d74d83379c253be92d41bd48324061ab3d6 +Subproject commit 310ed828c252de9b4f2946585d5436698eca5d79