summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
6 daysMerge "Add bindep.txt file"HEADmasterZuul
2018-02-22Allow access to docroot for proxy exclusionsJeremy Stanley
In a httpd::vhost::proxy resource, if proxy exclusions and a docroot are specified, we should allow clients to access contents of the docroot. Change-Id: If30b192b8f2c16375aa534131217a5aa2a9ff47d Notes (review): Code-Review+2: James E. Blair <corvus@inaugust.com> Code-Review+1: Mohammed Naser <mnaser@vexxhost.com> Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Workflow+1: Clark Boylan <cboylan@sapwetik.org> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Thu, 22 Feb 2018 18:25:01 +0000 Reviewed-on: https://review.openstack.org/547062 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
2017-08-18Depend on helper gem for spec_helper_acceptanceColleen Murphy
Instead of keeping a local copy of spec_helper_acceptance.rb and requiring updates to all modules for any change, we can move it into the common helper gem and require it from there. This will make it easier to create and review changes that affect all puppet modules. Also change the Gemfile to look for the gem in the local workspace if running in a zuul environment. Change-Id: I8233333e7c35a3a1191c0f8d070f6de5dfb7b33d Notes (review): Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Workflow+1: Clark Boylan <cboylan@sapwetik.org> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 22 Aug 2017 22:25:15 +0000 Reviewed-on: https://review.openstack.org/495601 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
2017-06-11Stop testing mod-python in beakerColleen Murphy
The python apache mod is deprecated and does not work with the wsgi mod. The apache service dies if both mods are enabled. We can keep the mod class but it is not worth keeping tests for it. Change-Id: Ie411ee5c6e9324371eaabe0a6f1761c912a79600 Notes (review): Code-Review+2: Ian Wienand <iwienand@redhat.com> Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Workflow+1: Clark Boylan <cboylan@sapwetik.org> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 13 Jun 2017 22:17:34 +0000 Reviewed-on: https://review.openstack.org/473119 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
2017-06-11Remove unnecessary beaker testsColleen Murphy
It is not necessary to check every file and package in the puppet functional tests. It can be assumed that if puppet finished corretly then it was also able to successfully find and install packages and apply configs. We leave the service checks, however, because it is possible for services to die due to misconfiguration after puppet starts them. Change-Id: I97682cb9d956803c3ab1be42fe44c0437c3d5f02 Notes (review): Code-Review+2: Ian Wienand <iwienand@redhat.com> Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Workflow+1: Clark Boylan <cboylan@sapwetik.org> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 13 Jun 2017 22:16:03 +0000 Reviewed-on: https://review.openstack.org/473118 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
2017-06-11Parameterize the php mod package nameColleen Murphy
Change-Id: If61473b394605fa2599f53716792dd5568ad24c5 Notes (review): Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Code-Review+2: Ian Wienand <iwienand@redhat.com> Workflow+1: Ian Wienand <iwienand@redhat.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 13 Jun 2017 22:15:57 +0000 Reviewed-on: https://review.openstack.org/473117 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
2017-06-11Update beaker setup for xenialColleen Murphy
Add a xenial nodeset and update the spec helper to install puppet 3 from the Ubuntu repos instead of from puppetlabs. Change-Id: I5d48236074dcb4e5d0fbd3466355d4224250e393 Notes (review): Code-Review+2: Ian Wienand <iwienand@redhat.com> Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Workflow+1: Clark Boylan <cboylan@sapwetik.org> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 13 Jun 2017 22:11:09 +0000 Reviewed-on: https://review.openstack.org/473108 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
2017-06-11Update GemfileColleen Murphy
Use the common spec helper gem instead of managing every gem individually. This will keep the linter gems up to date and unbreak the linter job. Change-Id: I0034055dd172c23366ab5ba37b5b5174647e4f81 Notes (review): Code-Review+2: Ian Wienand <iwienand@redhat.com> Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Workflow+1: Clark Boylan <cboylan@sapwetik.org> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 13 Jun 2017 22:09:41 +0000 Reviewed-on: https://review.openstack.org/473116 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
2017-05-01Add bindep.txt filePaul Belanger
Bindep is a tool for checking the presence of binary packages needed to use an application / library. It started life as a way to make it easier to set up a development environment for OpenStack projects. Change-Id: I6b353492e35f71bce66ea648d5f6f83e3d887587 Signed-off-by: Paul Belanger <pabelanger@redhat.com> Notes (review): Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Workflow+1: Clark Boylan <cboylan@sapwetik.org> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Fri, 20 Apr 2018 18:53:27 +0000 Reviewed-on: https://review.openstack.org/461570 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
2016-07-22Fix selinux problems on vhostYolanda Robla Mota
When running on CentOS, that problem still persists: when trying to access files under a vhost, apache was failing with Access denied because search permissions are missing. So running chcon on the docroot for each vhost Please note that this change was reverted before. That was caused by puppet-cgit sending a dummy location "MEANINGLESS ARGUMENT" to docroot argument of vhost. To avoid that failure, execute only the chcon call if docroot exists and is a directory. Change-Id: I4ab7d4cc6d2115bd8f980be7f14a6a4557ffeb87 Notes (review): Code-Review+2: Ricardo Carrillo Cruz <ricardo.carrillo.cruz@gmail.com> Code-Review+2: Monty Taylor <mordred@inaugust.com> Workflow+1: Monty Taylor <mordred@inaugust.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Fri, 12 Aug 2016 15:59:00 +0000 Reviewed-on: https://review.openstack.org/345349 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
2016-07-20Revert "Fix selinux problems on vhost"Paul Belanger
We are reverting as this breaks our gitXX.o.o servers, which are centos-7. EG: (/Stage[main]/Cgit/Httpd::Vhost[git.openstack.org]/Exec[update_context_MEANINGLESS ARGUMENT]/returns) chcon: cannot access ‘MEANINGLESS’: No such file or directory This reverts commit 10844f7c9e84d1640039e1c6d73930b9b599c304. Change-Id: I06435e6203bd8770bc6a817d3f0b33a05d84bdf6 Notes (review): Code-Review+2: Joshua Hesketh <joshua.hesketh@rackspace.com> Code-Review+2: Jeremy Stanley <fungi@yuggoth.org> Workflow+1: Jeremy Stanley <fungi@yuggoth.org> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 21 Jul 2016 02:28:31 +0000 Reviewed-on: https://review.openstack.org/345049 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
2016-06-26Fix selinux problems on vhostYolanda Robla
When running on CentOS, two problems appeared: - when using proxy, apache was failing with an error 500, fixed by enabling httpd_can_network_connect - when trying to access files under a vhost, apache was failing with Access denied because search permissions are missing. So running chcon on the docroot for each vhost Change-Id: I87c4c0e51f05eab8f5c8e094c2c54504e60b97af Notes (review): Code-Review+2: Elizabeth K. Joseph <lyz@princessleia.com> Code-Review+2: Ricardo Carrillo Cruz <ricardo.carrillo.cruz@gmail.com> Workflow+1: Ricardo Carrillo Cruz <ricardo.carrillo.cruz@gmail.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Mon, 18 Jul 2016 16:24:18 +0000 Reviewed-on: https://review.openstack.org/333873 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
2016-04-14Pin google-api-client; sanitize GemfileSpencer Krum
Change-Id: Icf2aa6e7b44a0219e03cb9786726e0f6f9262a97 Notes (review): Code-Review+2: Monty Taylor <mordred@inaugust.com> Code-Review+2: James E. Blair <corvus@inaugust.com> Workflow+1: James E. Blair <corvus@inaugust.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 14 Apr 2016 23:56:27 +0000 Reviewed-on: https://review.openstack.org/306122 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
2016-03-21Order of the classes parameters is refactoredAndrey Nikitin
Order and intendation of those parameters are changed to follow Puppet Style Guide recommendation [0]. Moreover, it will allow to an user to find much faster a variable in a list of variables. [0]. https://docs.puppetlabs.com/guides/style_guide.html Change-Id: If2443cbc57671784cfcb31bbe0ada0c09f78c996 Notes (review): Code-Review+2: yolanda.robla <yolanda.robla-mota@hpe.com> Code-Review+1: Ricardo Carrillo Cruz <ricardo.carrillo.cruz@gmail.com> Code-Review+2: Paul Belanger <pabelanger@redhat.com> Workflow+1: Paul Belanger <pabelanger@redhat.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 22 Mar 2016 15:49:05 +0000 Reviewed-on: https://review.openstack.org/295157 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
2016-03-01Add SSL Procotol and Cipher config to default vhostMonty Taylor
Infra doesn't really use this template, but in case someone else does, update the protocol to only use TLS and update the cipher list to the list of strong ciphers. Change-Id: Ibd8a0e65800e022ab8bc52f6af63c3c85e84419d Notes (review): Code-Review+1: Andreas Jaeger <jaegerandi@gmail.com> Code-Review+2: Jeremy Stanley <fungi@yuggoth.org> Code-Review+2: Spencer Krum <nibz@spencerkrum.com> Workflow+1: Spencer Krum <nibz@spencerkrum.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 03 Mar 2016 19:43:52 +0000 Reviewed-on: https://review.openstack.org/286610 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
2015-11-03Merge "Fixes vhost and vhost::proxy on Precise."Jenkins
2015-10-21Merge "Enable SNI on Ubuntu 12.04 LTS"Jenkins
2015-10-21Enable SNI on Ubuntu 12.04 LTSJeremy Stanley
Enable Server Name Indication (SNI) on Ubuntu 12.04 LTS which runs Apache 2.2. This allows running multiple HTTPS sites from one IP address/TCP port when SubjectAltNames are specified in the certificate, but MSIE on WinXP does not support this extension and so will cease working for HTTPS sites managed by this module. Note that this behavior is already implicit on Apache 2.4 based platforms (such as Ubuntu 14.04 LTS). Change-Id: I05c8e335f68d9461d8d81a3d12343d1920a738d4 Notes (review): Verified+2: Jenkins Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Code-Review+2: Jeremy Stanley <fungi@yuggoth.org> Workflow+1: Jeremy Stanley <fungi@yuggoth.org> Code-Review+1: Jaiveek Shah <jaiveek.shah@gmail.com> Submitted-by: Jenkins Submitted-at: Wed, 21 Oct 2015 19:43:32 +0000 Reviewed-on: https://review.openstack.org/237181 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
2015-10-20Fixes vhost and vhost::proxy on Precise.Bruno Tavares
We recently introduced on bf7ce40e2fe7e28dab11ee2fb0ae26a50b5fa8bd the use of mod_version. The module is enabled and installed by default on Ubuntu Trusty 14.04, CentOS 6 and CentOS 7. On Ubuntu Precise 12.04 the module comes installed, but not enabled by default. This is needed to maintain compatibility with downstream pool of servers. Change-Id: I01a8a12b959e3cbecd0355562db0393404ae54bf Co-Authored-By: Danilo Ramalho <dramalho@thoughtworks.com> Notes (review): Verified+2: Jenkins Code-Review+2: yolanda.robla <info@ysoft.biz> Workflow+1: yolanda.robla <info@ysoft.biz> Code-Review+2: Spencer Krum <nibz@spencerkrum.com> Code-Review+1: Glauco Oliveira <gvinici@thoughtworks.com> Submitted-by: Jenkins Submitted-at: Tue, 03 Nov 2015 17:16:51 +0000 Reviewed-on: https://review.openstack.org/237765 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
2015-10-20Merge "Grant access for vhosts on Apache >= 2.4"Jenkins
2015-10-20Merge "Fix proxy and redirect configuration file names."Jenkins
2015-10-19Grant access for vhosts on Apache >= 2.4Danilo Ramalho
Apache's configuration for access control has changed on 2.4. To allow access to served directories we need to include the new directive "Require grant all". We scoped the configuration to only be applied on Apache 2.4. More information can be viewed on the Apache's upgrade document[1]. The tests were changed to ensure that the configuration is working without any extra override, as the extra test vhost is on a custom directory that requires the template to grant access to it. [1] http://httpd.apache.org/docs/trunk/upgrading.html Change-Id: I898ca049c5b3592cb70ad8c22eba8d4c681f3b22 Co-Authored-By: Bruno Tavares <btavare@thoughtworks.com> Notes (review): Verified+2: Jenkins Code-Review+2: yolanda.robla <info@ysoft.biz> Workflow+1: yolanda.robla <info@ysoft.biz> Code-Review+2: Joshua Hesketh <joshua.hesketh@rackspace.com> Code-Review+1: Mikhail S Medvedev <mihailmed@gmail.com> Code-Review+1: Clint Adams <clint@gcfm.net> Code-Review+1: Glauco Oliveira <gvinici@thoughtworks.com> Submitted-by: Jenkins Submitted-at: Tue, 20 Oct 2015 08:38:58 +0000 Reviewed-on: https://review.openstack.org/228604 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
2015-10-19Fix proxy and redirect configuration file names.Bruno Tavares
While working on puppet-lodgeit acceptance tests we found that the configuration file that `httpd::mod::proxy` creates was not being picked up by Apache because it was missing the prefix `.conf`. This transition is required to configure httpd modules correctly on Apache >= 2.4 To prevent Apache from loading two the same configuration twice, we remove the file without extension, so this change does not affect running systems. This change has fixes for `httpd::mod::proxy` and `httpd::mod::redirect` as they have the same issue. We added tests as well to increase the confidence on the fix. The acceptance will be fixed on the follow-up patch, as the redirect grants are broken for 2.4 as well. Change-Id: I82241038d687316f91f18209fe8323c12422e2f8 Co-Authored-By: Danilo Ramalho <dramalho@thoughtworks.com> Notes (review): Verified+2: Jenkins Code-Review+2: yolanda.robla <info@ysoft.biz> Workflow+1: yolanda.robla <info@ysoft.biz> Code-Review+2: Spencer Krum <nibz@spencerkrum.com> Code-Review+1: Glauco Oliveira <gvinici@thoughtworks.com> Submitted-by: Jenkins Submitted-at: Tue, 20 Oct 2015 08:36:32 +0000 Reviewed-on: https://review.openstack.org/225331 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
2015-10-14Clean up doubled backslashes in logrotate configJeremy Stanley
According to https://docs.puppetlabs.com/puppet/3.8/reference/lang_datatypes.html there is no way to end a single-quoted string with a literal backslash, so fold this content into the preceding double-quoted string in an effort to satisfy the linter as well. Change-Id: Ic639cd2fc1c7953cbf4311ce7c958f9bdb61e31b Notes (review): Verified+2: Jenkins Code-Review+2: yolanda.robla <info@ysoft.biz> Code-Review+2: Spencer Krum <nibz@spencerkrum.com> Workflow+1: Spencer Krum <nibz@spencerkrum.com> Submitted-by: Jenkins Submitted-at: Wed, 14 Oct 2015 19:44:36 +0000 Reviewed-on: https://review.openstack.org/234373 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
2015-10-06Allow specification of DocumentRoot when reverse-proxying partiallyClint Adams
If any locations are being excluded from reverse-proxying, we need to be able to specify a DocumentRoot to serve up un-proxied files. Change-Id: I1c5fe6f73b5983886578975e89c5e4148b506795 Notes (review): Verified+2: Jenkins Code-Review+2: Jeremy Stanley <fungi@yuggoth.org> Workflow+1: Jeremy Stanley <fungi@yuggoth.org> Code-Review+1: Anita Kuno <anteaya@anteaya.info> Code-Review+2: Elizabeth K. Joseph <lyz@princessleia.com> Submitted-by: Jenkins Submitted-at: Wed, 07 Oct 2015 20:52:41 +0000 Reviewed-on: https://review.openstack.org/231682 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
2015-10-06Merge "Allow specification of locations to not be proxied"Jenkins
2015-10-02Allow specification of locations to not be proxiedClint Adams
A user of httpd::vhost::proxy may wish to exclude certain URLs from being proxied. This change allows the template to be populated with such exclusions. Change-Id: I55a86d3c703a667daf55cb75cf559eb23a556219 Notes (review): Verified+2: Jenkins Code-Review+2: yolanda.robla <info@ysoft.biz> Workflow+1: yolanda.robla <info@ysoft.biz> Code-Review+2: Spencer Krum <nibz@spencerkrum.com> Code-Review+1: Danilo Ramalho <dramalho@thoughtworks.com> Code-Review+1: Bruno Tavares <btavare@thoughtworks.com> Submitted-by: Jenkins Submitted-at: Tue, 06 Oct 2015 07:27:48 +0000 Reviewed-on: https://review.openstack.org/230029 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
2015-09-28Add note of support on Python mods for CentOS 7.Bruno Tavares
CentOS 7 has offically deprecated mod_python in favor of mod_wsgi and the package is not available anymore. This change add a note on the module about the offically supported way to run python applications on CentOS 7. Change-Id: I9bf2e0dde6575f50db6ce12abf896b5890b42419 Co-Authored-By: Danilo Ramalho <dramalho@thoughtworks.com> Notes (review): Verified+2: Jenkins Code-Review+1: Ricardo Carrillo Cruz <ricardo.carrillo.cruz@gmail.com> Code-Review+2: yolanda.robla <info@ysoft.biz> Code-Review+2: Spencer Krum <nibz@spencerkrum.com> Workflow+1: Spencer Krum <nibz@spencerkrum.com> Code-Review+2: Joshua Hesketh <joshua.hesketh@rackspace.com> Workflow+1: Joshua Hesketh <joshua.hesketh@rackspace.com> Code-Review+1: Clint Adams <clint@gcfm.net> Code-Review+1: Glauco Oliveira <gvinici@thoughtworks.com> Submitted-by: Jenkins Submitted-at: Fri, 02 Oct 2015 21:36:36 +0000 Reviewed-on: https://review.openstack.org/224098 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
2015-09-28Add acceptance tests for puppet-httpdGlauco Oliveira
Add acceptance tests for puppet-httpd module so that once the module is applied we check if files were created, packages were installed and services were started. Change-Id: I3e1430f2937bd2bc5ea789c626784af7d5d85959 Co-Authored-By: Bruno Tavares <btavare@thoughtworks.com> Co-Authored-By: Danilo Ramalho <dramalho@thoughtworks.com> Notes (review): Verified+2: Jenkins Code-Review+2: yolanda.robla <info@ysoft.biz> Code-Review+2: Spencer Krum <nibz@spencerkrum.com> Workflow+1: Spencer Krum <nibz@spencerkrum.com> Code-Review+2: Joshua Hesketh <joshua.hesketh@rackspace.com> Workflow+1: Joshua Hesketh <joshua.hesketh@rackspace.com> Code-Review+1: Colleen Murphy <colleen@gazlene.net> Code-Review+1: Clint Adams <clint@gcfm.net> Submitted-by: Jenkins Submitted-at: Fri, 02 Oct 2015 21:34:47 +0000 Reviewed-on: https://review.openstack.org/222721 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
2015-09-28Use httpd::mod when adding Apache modules.Bruno Tavares
Replace usage of httpd_mod with the httpd::mod wrapper to allow classes to be applied as well on RedHat systems and have the httpd service ordering fixed. Change-Id: If790efd7b465e77c2eca7710f79e563d69ee3783 Co-Authored-By: Danilo Ramalho <dramalho@thoughtworks.com> Notes (review): Verified+2: Jenkins Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Code-Review+2: yolanda.robla <info@ysoft.biz> Code-Review+2: Spencer Krum <nibz@spencerkrum.com> Workflow+1: Spencer Krum <nibz@spencerkrum.com> Code-Review+1: Colleen Murphy <colleen@gazlene.net> Code-Review+1: Glauco Oliveira <gvinici@thoughtworks.com> Submitted-by: Jenkins Submitted-at: Fri, 02 Oct 2015 21:34:45 +0000 Reviewed-on: https://review.openstack.org/223578 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
2015-09-28Fix httpd::python.Bruno Tavares
While writing acceptance tests for puppet-httpd we noticed that the manifest of httpd::python is not working on Ubuntu Trusty. The httpd::python manifest was using a non-declared $apache::params::mod_python_package instead of $httpd::params::mod_python_package Change-Id: I4db9298aba7da90a017527b2fb29dcd17af28efc Co-Authored-By: Danilo Ramalho <dramalho@thoughtworks.com> Notes (review): Verified+2: Jenkins Code-Review+2: yolanda.robla <info@ysoft.biz> Workflow+1: yolanda.robla <info@ysoft.biz> Code-Review+2: Spencer Krum <nibz@spencerkrum.com> Workflow+1: Spencer Krum <nibz@spencerkrum.com> Code-Review+2: Joshua Hesketh <joshua.hesketh@rackspace.com> Code-Review+1: Colleen Murphy <colleen@gazlene.net> Code-Review+1: Glauco Oliveira <gvinici@thoughtworks.com> Submitted-by: Jenkins Submitted-at: Fri, 02 Oct 2015 21:30:52 +0000 Reviewed-on: https://review.openstack.org/226474 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
2015-09-28Changed to match 'python_package' to 'mod_python package'Andy James
Matches the parameter name set in params.pp Change-Id: Ib95acfbb5dd510ad6c1cb13cda8741a0ace149d2 Notes (review): Verified+2: Jenkins Code-Review+2: yolanda.robla <info@ysoft.biz> Code-Review+2: Spencer Krum <nibz@spencerkrum.com> Workflow+1: Spencer Krum <nibz@spencerkrum.com> Code-Review+1: Colleen Murphy <colleen@gazlene.net> Code-Review+1: venkatamahesh <venkatamaheshkotha@gmail.com> Code-Review+1: Glauco Oliveira <gvinici@thoughtworks.com> Submitted-by: Jenkins Submitted-at: Fri, 02 Oct 2015 21:27:17 +0000 Reviewed-on: https://review.openstack.org/227422 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
2015-09-28Fix httpd::dev.Bruno Tavares
While writing acceptance tests for puppet-httpd we noticed that the manifest of httpd::dev was not working on Ubuntu Trusty. That is because httpd::dev was trying to install multiple package using the wrong syntax. Also, the one of the modules for Ubuntu was wrong and we updated to keep applying. Co-Authored-By: Bruno Tavares <btavare@thoughtworks.com> Co-Authored-By: Danilo Ramalho <dramalho@thoughtworks.com> Change-Id: Ibe1e107417b4670902f74b8c2fedc0d9d927ce9b Notes (review): Verified+2: Jenkins Code-Review+2: yolanda.robla <info@ysoft.biz> Code-Review+2: Spencer Krum <nibz@spencerkrum.com> Workflow+1: Spencer Krum <nibz@spencerkrum.com> Code-Review+1: Colleen Murphy <colleen@gazlene.net> Code-Review+1: Clint Adams <clint@gcfm.net> Submitted-by: Jenkins Submitted-at: Fri, 02 Oct 2015 21:26:41 +0000 Reviewed-on: https://review.openstack.org/222694 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
2015-09-28Merge "Create a httpd::mod defined type"Jenkins
2015-09-25Create a httpd::mod defined typeSpencer Krum
This allows for before => Service['httpd'] on every resource without being explicit. Co-Authored-By: Bruno Tavares <btavare@thoughtworks.com> Co-Authored-By: Glauco Oliveira <gvinici@thoughtworks.com> Change-Id: I0e991a7a63317e608cc6ef35b58dc79b518ba863 Notes (review): Verified+2: Jenkins Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Code-Review+2: yolanda.robla <info@ysoft.biz> Workflow+1: yolanda.robla <info@ysoft.biz> Code-Review+1: Colleen Murphy <colleen@gazlene.net> Submitted-by: Jenkins Submitted-at: Mon, 28 Sep 2015 17:31:07 +0000 Reviewed-on: https://review.openstack.org/216835 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
2015-09-22Merge "Add logrotate class to Apache"Jenkins
2015-09-17Add "Satisfy any" to default vhost templateJames E. Blair
This is needed for Apache 2.4, and is compatible with 2.2. Change-Id: I5c8243c0031e295b5d88a21ac05f7a467beefa33 Notes (review): Code-Review+2: James E. Blair <corvus@inaugust.com> Workflow+1: James E. Blair <corvus@inaugust.com> Verified+2: Jenkins Code-Review+2: Jeremy Stanley <fungi@yuggoth.org> Submitted-by: Jenkins Submitted-at: Fri, 18 Sep 2015 01:17:18 +0000 Reviewed-on: https://review.openstack.org/224905 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
2015-08-19Fix target path for regular git clone during testsSpencer Krum
Use same target directory for zuul-cloner and the regular git command. Change-Id: Ia93972eb910cbff202820151a0407d36b3317dc4 Co-Authored-By: Fabien Boucher <fabien.boucher@enovance.com> Notes (review): Verified+2: Jenkins Code-Review+2: yolanda.robla <info@ysoft.biz> Workflow+1: yolanda.robla <info@ysoft.biz> Submitted-by: Jenkins Submitted-at: Mon, 24 Aug 2015 11:19:36 +0000 Reviewed-on: https://review.openstack.org/214848 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
2015-08-15Add logrotate class to ApacheYolanda Robla
Adding this subclass to httpd configuration, to allow modules using this manifest to setup log rotation for apache on demand. Please note that apache is installing a logrotate file by default here, but naming that on same way will overwrite it, and allow our desired log rotation. Depends-On: I7451ecc550b50b85c55784ef598f6b45412117fc Change-Id: I3ef60fd9386795007e5b55264cc6e91fa0b67c68 Notes (review): Verified+2: Jenkins Code-Review+1: K Jonathan Harker <code@gentlydownthe.net> Code-Review+2: Spencer Krum <nibz@spencerkrum.com> Code-Review+2: Elizabeth K. Joseph <lyz@princessleia.com> Workflow+1: Elizabeth K. Joseph <lyz@princessleia.com> Code-Review+1: Craige McWhirter <craige@mcwhirter.com.au> Code-Review+1: Clint Adams <clint@gcfm.net> Code-Review+1: Bruno Tavares <btavare@thoughtworks.com> Submitted-by: Jenkins Submitted-at: Tue, 22 Sep 2015 19:17:49 +0000 Reviewed-on: https://review.openstack.org/206582 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
2015-08-12Add vim swp files to gitignoreSpencer Krum
Change-Id: I6787886ee37b8860ad0b8931e012bd488f95fd07 Notes (review): Verified+2: Jenkins Code-Review+2: yolanda.robla <info@ysoft.biz> Code-Review+2: Joshua Hesketh <joshua.hesketh@rackspace.com> Workflow+1: Joshua Hesketh <joshua.hesketh@rackspace.com> Code-Review+1: Timothy R. Chavez <timothy.chavez@hp.com> Submitted-by: Jenkins Submitted-at: Thu, 13 Aug 2015 13:31:27 +0000 Reviewed-on: https://review.openstack.org/211861 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
2015-08-11Merge "Add Gemfile and puppet 4 checks"Jenkins
2015-08-09Merge "Add puppetlabs-firewall dependency to metadata"Jenkins
2015-08-09Merge "Fix $httpd::vhost::proxy::servername parameter"Jenkins
2015-08-07Add puppetlabs-firewall dependency to metadataEmma Barber
$configure_firewall defaults to true, however the related firewall dependency is missing from the module metadata. The lower bound used here reflects that of puppetlabs-apache v0.0.4, the upper bound is the current release. Change-Id: Ic628fcacf11a65786241047f58839544e3d1fc52 Notes (review): Code-Review+2: Monty Taylor <mordred@inaugust.com> Workflow+1: Monty Taylor <mordred@inaugust.com> Verified+2: Jenkins Code-Review+2: yolanda.robla <info@ysoft.biz> Code-Review+1: Colleen Murphy <colleen@gazlene.net> Submitted-by: Jenkins Submitted-at: Sun, 09 Aug 2015 04:20:00 +0000 Reviewed-on: https://review.openstack.org/208624 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
2015-08-03Merge "Revise offensive comment"Jenkins
2015-07-29Add Gemfile and puppet 4 checksColleen Murphy
In anticipation of puppet 4, start trying to deal with puppet 4 things that can be helpfully predicted by puppet lint plugins. Also fix errors caught by the puppet-lint-unquoted_string-check and puppet-lint-absolute_classname-check gems. Change-Id: I9d74d25d2f2c95ec52a6db3bf070903240e1b933 Notes (review): Code-Review+2: Monty Taylor <mordred@inaugust.com> Verified+2: Jenkins Code-Review+1: K Jonathan Harker <code@gentlydownthe.net> Code-Review+2: yolanda.robla <info@ysoft.biz> Code-Review+2: Spencer Krum <nibz@spencerkrum.com> Workflow+1: Spencer Krum <nibz@spencerkrum.com> Code-Review+1: Clint Adams <clint@gcfm.net> Submitted-by: Jenkins Submitted-at: Tue, 11 Aug 2015 05:07:50 +0000 Reviewed-on: https://review.openstack.org/207311 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
2015-07-29Fix $httpd::vhost::proxy::servername parameterColleen Murphy
The $httpd::vhost::proxy::servername parameter was not being used, and the local variable $srvname was defaulting to the name of the defined type. This patch copies the logic from httpd::vhost to conditionally set $srvname to the $servername parameter if it is set, and default to the old behavior if not. Change-Id: I4936be856db1a1af279b7c3824606e2c0375e9a6 Notes (review): Code-Review+2: Monty Taylor <mordred@inaugust.com> Workflow+1: Monty Taylor <mordred@inaugust.com> Verified+2: Jenkins Code-Review+2: yolanda.robla <info@ysoft.biz> Code-Review+1: Clint Adams <clint@gcfm.net> Submitted-by: Jenkins Submitted-at: Sun, 09 Aug 2015 03:00:03 +0000 Reviewed-on: https://review.openstack.org/207310 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
2015-07-29Revise offensive commentTimothy Chavez
Change-Id: I549b82c94551057fe52c47a5c859f7e7e9921450 Notes (review): Verified+2: Jenkins Code-Review+2: yolanda.robla <info@ysoft.biz> Code-Review+2: Spencer Krum <nibz@spencerkrum.com> Workflow+1: Spencer Krum <nibz@spencerkrum.com> Code-Review+1: Clint Adams <clint@gcfm.net> Submitted-by: Jenkins Submitted-at: Mon, 03 Aug 2015 19:09:21 +0000 Reviewed-on: https://review.openstack.org/207222 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
2015-07-28Boilerplate beaker-rspec filesSpencer Krum
Change-Id: I7bd86e006d6e6dc3b97e5e68598b833e18394e33 Notes (review): Code-Review+2: James E. Blair <corvus@inaugust.com> Workflow+1: James E. Blair <corvus@inaugust.com> Verified+2: Jenkins Code-Review+2: yolanda.robla <info@ysoft.biz> Code-Review+1: Clint Adams <clint@gcfm.net> Submitted-by: Jenkins Submitted-at: Thu, 30 Jul 2015 00:25:41 +0000 Reviewed-on: https://review.openstack.org/206384 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
2015-07-10Fix variable access warningsPaul Belanger
Change-Id: I9bb68f50be21885072e7e999063f723b2059a2e9 Signed-off-by: Paul Belanger <pabelanger@redhat.com> Notes (review): Code-Review+2: James E. Blair <corvus@inaugust.com> Workflow+1: James E. Blair <corvus@inaugust.com> Verified+2: Jenkins Code-Review+2: yolanda.robla <info@ysoft.biz> Code-Review+1: Colleen Murphy <colleen@gazlene.net> Code-Review+1: Clint Adams <clint@gcfm.net> Submitted-by: Jenkins Submitted-at: Tue, 14 Jul 2015 18:16:22 +0000 Reviewed-on: https://review.openstack.org/200263 Project: openstack-infra/puppet-httpd Branch: refs/heads/master