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 |
|
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
|
b0e6b7ed5a
|
Always run apt-get update inside Docker containers.
|
2015-12-29 16:46:39 -06: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 |
|
Jeff Geerling
|
533703d32d
|
Issue #61: Make CentOS 6 work.
|
2015-12-13 20:22:55 -06:00 |
|
Jeff Geerling
|
60726db64b
|
Issue #61: Add CentOS 6.
|
2015-12-13 20:20:24 -06:00 |
|
Jeff Geerling
|
e5d0d58ffe
|
Issue #61: Fix Ubuntu 12.04 Dockerfile.
|
2015-12-13 20:11:16 -06:00 |
|
Bert Van Vreckem
|
5ca9ccc7c3
|
Install apt-add-repository
|
2015-12-14 00:15:55 +01:00 |
|
Bert Van Vreckem
|
a24482638b
|
Add Ubuntu 12.04 as a platform to test
|
2015-12-14 00:00:39 +01:00 |
|
Jeff Geerling
|
1526d4f74c
|
Issue #61: Dockerfile, not shell script.
|
2015-12-13 15:37:43 -06:00 |
|
Jeff Geerling
|
c1f932a641
|
Issue #61: Ensure apt-add-repository is present on Ubuntu 12.04.
|
2015-12-13 15:33:07 -06:00 |
|
Jeff Geerling
|
fda9e90f9d
|
Issue #61: Add Ubuntu 12.04 and rearrange env vars for readability.
|
2015-12-13 15:29:44 -06:00 |
|
Jeff Geerling
|
1b64ceefbb
|
Issue #61: Attempt to set dockerfile name via varaible.
|
2015-12-13 15:07:40 -06:00 |
|
Jeff Geerling
|
a3f86ab912
|
PR #60: Back to a working state, will debug locally.
|
2015-12-13 14:30:46 -06:00 |
|
Jeff Geerling
|
28274b530f
|
PR #60: Back to a working state, will debug locally.
|
2015-12-13 14:30:05 -06:00 |
|
Jeff Geerling
|
219cd5feac
|
PR #60: Prepare to add Ubuntu 12.04 a third time.
|
2015-12-13 14:27:47 -06:00 |
|
Jeff Geerling
|
7628bd8637
|
PR #60: Prepare to add Ubuntu 12.04 again.
|
2015-12-13 14:23:51 -06:00 |
|
Jeff Geerling
|
49437eaeb4
|
PR #60: Prepare to add Ubuntu 12.04.
|
2015-12-13 14:19:26 -06:00 |
|
Jeff Geerling
|
379953325c
|
PR #60: Small syntax tweaks for better highlighting.
|
2015-12-13 14:06:12 -06:00 |
|
Jeff Geerling
|
42a51bc5af
|
Merge pull request #60 from bertvv/master
Run multi-platform tests on Travis-CI using Docker
|
2015-12-13 13:46:35 -06:00 |
|
Bert Van Vreckem
|
d8d1770482
|
Don’t install test code on Ubuntu Docker container, remove requirements.yml
|
2015-12-13 19:27:21 +01:00 |
|
Bert Van Vreckem
|
840423b1b9
|
Test the current code, not the last release on Galaxy; colored output
|
2015-12-13 10:14:50 +01:00 |
|
Bert Van Vreckem
|
b9d629ae98
|
CentOS build should mount cgroups and run privileged
|
2015-12-12 13:54:56 +01:00 |
|
Bert Van Vreckem
|
1ac286c4dd
|
Fix differences in init systems
|
2015-12-12 13:48:44 +01:00 |
|
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 |
|