Commit graph

152 commits

Author SHA1 Message Date
Jeff Geerling
6d623d00c4 Merge pull request #85 from Christoph-D/single-config
Merge the templates for apache 2.2 and 2.4
2016-04-25 13:09:38 -05:00
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
1c536ef995 Add Xenial to supported Ubuntu versions. 2016-04-22 14:06:50 -05:00
Jeff Geerling
14e14f94c3 PR #83 follow-up 2016-04-20 21:09:41 -05:00
Jeff Geerling
d79bc4f3b4 Merge pull request #83 from woohgit/master
Add configuration for listen address
2016-04-20 21:05:02 -05:00
Adam Papai
547c0b404c
Add configuration for listen address
By default I leave it as "*", but for many cases, we don't want to bind our
apache to all network addresses available for the server. For example if we
want to only bind the apache to the localhost, we can use the following
configuration:

  apache_listen_ip: "127.0.0.1"
2016-04-20 11:46:12 +02:00
Jeff Geerling
1bbf949a9f Fix deprecation warnings in Ansible 2.x. Bump required version. 2016-02-28 23:32:02 -06:00
Jeff Geerling
2b44f305e9 Fix Travis tests. 2016-02-08 23:01:57 -06:00
Jeff Geerling
9e4aa0d361 Fix spacing in Travis file. 2016-02-08 13:50:39 -06:00
Jeff Geerling
3e39d0e75d Merge pull request #76 from liquidat/readme
Update README to include Solaris and SLES
2016-02-06 13:47:41 -08:00
liquidat
cf462e2f27 Update README to include Solaris and SLES 2016-02-06 11:27:09 +01:00
Jeff Geerling
f3d56d5c91 Merge pull request #75 from liquidat/master
Add Suse version to meta/main.yml
2016-02-02 09:17:18 -08:00
liquidat
9d9443aedd Add missing versions string 2016-02-02 15:46:03 +01:00
liquidat
656dc8a252 Add Suse version to meta/main.yml 2016-02-01 21:56:48 +01:00
Jeff Geerling
be4f9a20db Add note about Suse support, and fix galaxy_tags. 2016-02-01 12:22:12 -06:00
Jeff Geerling
1c310efaa4 Add notifications for Galaxy. 2016-02-01 12:21:26 -06:00
Jeff Geerling
7a9091c730 Merge pull request #67 from liquidat/master
Solaris and Suse support
2016-02-01 10:12:07 -08: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
8b8d428062 Correct bin name in Suse is httpd2 2016-02-01 10:49:03 +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
Jeff Geerling
4e1dc8434a PR #69: Adjust the wording for new variable. 2016-01-18 10:40:40 -06:00
Jeff Geerling
47d1c0b43f Merge pull request #69 from andreaswolf/master
Only create vHosts if certificate exists
2016-01-18 10:39:30 -06:00
Andreas Wolf
097ddd2eb4 Only create vHosts if certificate exists 2016-01-18 17:25:08 +01:00
Jeff Geerling
49f6feb4d9 Add notes about using geerlingguy.apache-php-fpm role with this role. 2016-01-14 21:04:09 -06:00
liquidat
6e5b5bdadb Add configure Solaris part 2016-01-14 10:35:04 +01:00
liquidat
88b22fae69 Merge remote-tracking branch 'upstream/master' 2016-01-13 17:49:20 +01:00
Jeff Geerling
554c74730c Actually fixes #28: Allow for virtualhost without documentroot. 2016-01-02 22:46:25 -06:00
Jeff Geerling
2f9c001145 Fixes #28: Allow for virtualhost without documentroot. 2016-01-02 22:25:49 -06:00
Jeff Geerling
c627b6c293 Always run apt-get update inside Docker containers. 2016-01-02 20:51:27 +01:00
liquidat
8bcd140b27 Add Solaris as platform
- add Solaris as platform in meta/main.yml
  - version: 11.3
- add Solaris in description in meta/main.yml
2016-01-02 20:42:43 +01:00
Jeff Geerling
b0e6b7ed5a Always run apt-get update inside Docker containers. 2015-12-29 16:46:39 -06: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
18099303cd Add Solaris variables 2015-12-29 22:09:41 +01:00
liquidat
8393eef81e Prepare Debian and Red Hat vars for apache_service
- add apache_service variable with same content as
  apache_daemon
2015-12-29 22:09:09 +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
Jeff Geerling
1a12e57862 Merge pull request #58 from BlackMesh/apache_global_settings
Rename apache_global_settings to apache_global_vhosts_settings
2015-12-16 16:07:29 -06:00
Jeff Geerling
2387c79d75 Fix a couple missed merge conflicts. 2015-12-14 09:17:30 -06:00
Jeff Geerling
a8e0f1c72a Bypass updating apt while Travis is having a bad day. 2015-12-14 09:13:01 -06:00
Jeff Geerling
7a15ff5fd6 PR #61: Consistency in Dockerfile formatting. 2015-12-14 08:38:39 -06:00
Jeff Geerling
ddbefc15c1 Merge branch 'bertvv-master' 2015-12-14 08:37:15 -06:00
Jeff Geerling
e5f3ba3bf1 Merge branch 'master' of https://github.com/bertvv/ansible-role-apache into bertvv-master 2015-12-14 08:36:55 -06:00
Bert Van Vreckem
3a993606b2 Remove container_id from env: 2015-12-14 09:07:17 +01:00
Bert Van Vreckem
a4746557a4 Delete 2015-12-14 08:59:26 +01:00
Bert Van Vreckem
4b0353c2d0 Merge upstream and fixes for #61 2015-12-14 08:58:10 +01:00
Bert Van Vreckem
7c41dd113e Added Centos 6 as target platform 2015-12-14 07:18:01 +01:00
Jeff Geerling
91a0a99f0a Issue #61: Looks like CentOS 6 will be a no-go. 2015-12-13 20:39:36 -06:00
Jeff Geerling
f696c0c89d Issue #61: Make CentOS 6 work x2. 2015-12-13 20:34:08 -06:00