Commit graph

132 commits

Author SHA1 Message Date
Bert Van Vreckem
940968d86f Remove duplicate code, use build matrix 2015-12-12 13:42:26 +01:00
Bert Van Vreckem
33c4876d51 Fix docker run on Ubuntu 2015-12-12 13:36:52 +01:00
Bert Van Vreckem
609812fb48 Set some role variables in the test playbook 2015-12-12 11:36:56 +01:00
Bert Van Vreckem
5260215d28 Change order in build process 2015-12-12 11:36:33 +01:00
Bert Van Vreckem
0060d6d1c8 Add idempotence test 2015-12-12 11:29:05 +01:00
Bert Van Vreckem
5d73dbbb94 Fix path to Dockerfile 2015-12-12 11:20:32 +01:00
Bert Van Vreckem
43c25c0302 Run multi-platform test on Travis-CI 2015-12-12 11:17:40 +01:00
Solomon Gifford
31fcb4859b rename apache_global_settings to apache_global_vhost_settings to avoid confusion of where the globals are placed part 3 2015-12-10 16:46:54 -05:00
Solomon Gifford
6584e7afb6 rename apache_global_settings to apache_global_vhost_settings to avoid confusion of where the globals are placed part 2 2015-12-10 16:40:51 -05:00
Solomon Gifford
906b1094d6 rename apache_global_settings to apache_global_vhost_settings to avoid confusion of where the globals are placed 2015-12-10 15:39:55 -05:00
Solomon Gifford
0b2bce604a Merge pull request #2 from geerlingguy/master
latest
2015-12-10 15:33:01 -05:00
Jeff Geerling
dde986ea3e Merge pull request #54 from BlackMesh/NameVirtualHost
Leaves the NameVirtualHost in the same location in the file
2015-12-08 14:24:33 -06:00
Jeff Geerling
50d42a0a43 PR #56 follow-up: Change ordering and description of new variable. 2015-12-08 14:23:54 -06:00
Jeff Geerling
7f9f793191 Merge pull request #56 from Nextpertise/master
Add global config variable
2015-12-08 14:20:25 -06:00
Teun Ouwehand
8f974b4fdc Add README text for apache_global_settigs 2015-12-08 21:13:03 +01:00
Teun Ouwehand
53990ee997 Add global config variable 2015-12-08 21:03:13 +01:00
Solomon Gifford
ea4186e794 Leaves the NameVirtualHost in the same location in the file 2015-11-16 23:20:54 -05:00
Jeff Geerling
ac77f7835e PR 2015-10-31 21:44:03 -05:00
Jeff Geerling
d57725cf0b Remove multiline config from default vars. 2015-10-31 21:42:34 -05:00
Jeff Geerling
6e6ea9de50 Merge pull request #46 from pgilad/feature/apache-optional-start
Ensure Apache is started should be optional
2015-10-31 21:40:48 -05:00
Gilad Peleg
5cee545c8f Make apache start optional at task end
- Closes #45
2015-09-24 18:33:10 +03:00
Jeff Geerling
8a4f5f3ff2 Fixes #27 and #42: Add example of multiline configuration in apache_vhosts entries. 2015-09-03 16:16:04 -05:00
Jeff Geerling
35e662cd00 Don't install apache2-mpm-prefork in default Debian packages. 2015-08-19 09:27:11 -07:00
Jeff Geerling
f98accbb08 PR #24: Clean up default vhost removal options and document the new var. 2015-07-23 12:04:31 -05:00
Jeff Geerling
2597e7380c Merge pull request #24 from ThijsFeryn/removedefaultvhost
PR #24: Allow default vhost file to be removed on Debian/Ubuntu.
2015-07-23 12:00:15 -05:00
Jeff Geerling
cfda9d6dfb PR #26: Fix spacing for variable name. 2015-07-23 11:58:03 -05:00
Jeff Geerling
dc89c2b987 Merge pull request #26 from FlxPeters/master
Fixes #25: Fails to get installed version of Apache.
2015-07-23 11:55:47 -05:00
Jeff Geerling
0424fbcd87 Issue #34: Add ability to 'disable' Apache mods on Ubuntu/Debian. 2015-05-31 16:01:27 -05:00
Felix Peters
e9d5dedc70 Fix #25 Get installed version of Apache. failed
Add absolute path for apache/httpd to avoid command not found error
2015-02-06 13:21:51 +01:00
Thijs Feryn
8e71d656f4 Allowing the default vhost to be removed. Causes issues because it is linked to port 80, even if you change apache_listen_port 2015-01-28 13:54:09 +01:00
Jeff Geerling
2abee5155c Issue #4: Document apache_packages variable. 2015-01-09 23:51:13 -06:00
Jeff Geerling
36d79e5f26 Revert test and add always_run to solve #20. 2015-01-09 23:46:28 -06:00
Jeff Geerling
e5e6ece01a Add --check test. 2015-01-09 23:43:17 -06:00
Jeff Geerling
17a99089ab Update documentation and fix a few variables for vhosts configuration. 2015-01-09 23:30:07 -06:00
Jeff Geerling
5d8bf8b6fd Merge pull request #23 from LewisW/master
Made "vhost.conf" filename configurable
2015-01-09 23:24:29 -06:00
Jeff Geerling
bc807c9cdb Merge pull request #22 from lesmyrmidons/master
Add optional parameter ServerAlias
2015-01-09 23:22:03 -06:00
Lewis Wright
0fe7d43213 Updated readme with apache_vhosts_filename 2015-01-08 17:32:06 +00:00
Lewis Wright
5eeace69bb Made the vhost.conf filename configurable 2015-01-08 17:29:36 +00:00
Kevin ARBOUIN
c4b6fa8bb4 Add parameters ServerAlias 2014-12-29 21:56:03 +01:00
Jeff Geerling
2dfd2026ef Update test. 2014-11-08 14:31:56 -06:00
Jeff Geerling
8abd97bb32 Issue #17: SSL Support. 2014-11-05 10:07:20 -06:00
Jeff Geerling
a0e4fe4c6e Merge pull request #16 from guillaumededrie/fix/error-vhost-link
Prevent task symlink vhost for Debian to failed.
2014-11-05 08:33:20 -06:00
Guillaume Dedrie
b13cb7d4ba Prevent task symlink vhost for Debian to failed.
When vhost has not been created (using apache_create_vhosts: no), the
tasks should not be executed, otherwise it'll failed as the vhosts.conf
file has not been created and cannot been linked.
2014-11-04 18:02:42 +01:00
Jeff Geerling
d687bb21c5 Issue #14: Fix Apache version detection and related configuration for more flexibility. 2014-10-22 13:41:14 -05:00
Jeff Geerling
aff1f3a524 Issue #15: Role broken on non-Ubuntu Precise and Trusty Debians. 2014-10-15 08:39:44 -05:00
Jeff Geerling
4da5f52668 Update apt cache if necessary. 2014-10-10 09:41:19 -05:00
Jeff Geerling
034bdb7949 Code style cleanup. 2014-10-05 19:13:00 -05:00
Jeff Geerling
d191d3a7fd Issue #12: Use sites-available and sites-enabled Debian convention. 2014-10-05 18:58:35 -05:00
Jeff Geerling
3a277cbff6 Issue #1: Add updated vhosts file for Apache 2.4. 2014-10-05 18:15:56 -05:00
Jeff Geerling
83ab160cff Issue #5: Allow apache_packages to be overridden. 2014-10-05 08:02:17 -05:00