Commit graph

36 commits

Author SHA1 Message Date
Christoph Dittmann
ae3a1a6332 Merge the templates for 2.2 and 2.4
The only real difference between apache version 2.2 and 2.4 are the
"Order/Allow" directives which have been replaced with "Require", so
there seems to be no need to maintain two separate templates.

As a side-effect, this merges geerlingguy/ansible-role-apache#69 into
the apache 2.2 config.
2016-04-25 18:29:26 +02:00
Jeff Geerling
1bbf949a9f Fix deprecation warnings in Ansible 2.x. Bump required version. 2016-02-28 23:32:02 -06:00
liquidat
77a766e4fb Fix configuration path in Solaris 2016-02-01 11:29:10 +01:00
liquidat
7aa1f2e0c8 Add Suse configuration and proper service handling
- Suse listen configuration points to listen.conf file
- service handler uses service variable
2016-02-01 11:17:20 +01:00
liquidat
8c39811daa Add distribution to task name 2016-02-01 10:48:41 +01:00
liquidat
170a9c2446 Add Suse support
- set proper package and service name apache2
- configure given packages for Suse
- install packages
- start service
2016-02-01 10:37:57 +01:00
liquidat
80d2a89369 Merge remote-tracking branch 'upstream/master' 2016-01-29 23:53:35 +01:00
Andreas Wolf
097ddd2eb4 Only create vHosts if certificate exists 2016-01-18 17:25:08 +01:00
liquidat
6e5b5bdadb Add configure Solaris part 2016-01-14 10:35:04 +01:00
liquidat
d472d0881d Add Solaris configuration
- add Solaris os family to main role definition
- add Solaris setup file
- add Solaris configuration
2015-12-29 22:10:07 +01:00
liquidat
55a5b2d07f Prepare role when service differs from daemon name
- introduce new apache_service in addition to apache_daemon for systems
  where service name is different from daemon name
- replace apache_daemon by apache_service in service status check
2015-12-29 21:57:25 +01:00
Gilad Peleg
5cee545c8f Make apache start optional at task end
- Closes #45
2015-09-24 18:33:10 +03: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
36d79e5f26 Revert test and add always_run to solve #20. 2015-01-09 23:46:28 -06:00
Lewis Wright
5eeace69bb Made the vhost.conf filename configurable 2015-01-08 17:29:36 +00: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
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
Jeff Geerling
f7f52740f0 Add ids for environments. 2014-05-10 13:33:06 -05:00
Jeff Geerling
ca4e5f8cfe Adjust Apache mod enabling on Debian/Ubuntu. 2014-04-23 09:49:55 -05:00
Jeff Geerling
917b9edbc7 Add apache_create_vhosts var, and allow mods to be enabled on Debian hosts. 2014-04-23 09:47:33 -05:00
Jeff Geerling
b8bd8d5e4c Back to a passing build. 2014-04-22 10:58:01 -05:00
Jeff Geerling
ea62c96c5a Test idempotence test in playbook. 2014-04-22 10:02:31 -05:00
Jeff Geerling
5cbf84a9a5 Make Apache role work correctly with both RHEL and Debian. 2014-04-22 07:34:37 -05:00
Jeff Geerling
25f03a033b Remove EPEL repository dependency. 2014-03-14 11:28:08 -05:00
Jeff Geerling
ca82309c13 Add handlers, meta info, tasks, templates, and vars. 2014-02-28 16:23:24 -06:00