33 commits

Author	SHA1	Message	Date
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	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	60726db64b	Issue #61: Add CentOS 6.	2015-12-13 20:20:24 -06:00
Bert Van Vreckem	a24482638b	Add Ubuntu 12.04 as a platform to test	2015-12-14 00:00:39 +01: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	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
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	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
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	2dfd2026ef	Update test.	2014-11-08 14:31:56 -06:00
Jeff Geerling	1a06c72885	Install current version of Ansible when testing instead of 1.5.0.	2014-08-03 21:45:04 -05:00
Jeff Geerling	d2401eb840	Update Travis to test the role itself (less setup work).	2014-04-23 12:59:07 -05:00
Jeff Geerling	48251c9f5a	Fixed up errant quote.	2014-04-22 10:36:30 -05:00
Jeff Geerling	c27d453466	Better formatting for .travis.yml.	2014-04-22 10:21:44 -05:00
Jeff Geerling	14f32f8382	Check for idempotency within .travis.yml.	2014-04-22 09:43:36 -05:00
Jeff Geerling	626578ea9d	Get idempotence test working.	2014-04-22 08:54:04 -05:00
Jeff Geerling	0e3a6bb463	Added idempotence test and integration test via Travis.	2014-04-22 08:47:05 -05:00
Jeff Geerling	489dc306bb	Add Travis CI integration.	2014-04-22 07:39:07 -05:00