From eccb2fa263b0a4ab5a3f110c21af1af112f8760a Mon Sep 17 00:00:00 2001
From: Seth Vidal <skvidal@fedoraproject.org>
Date: Sat, 22 Jun 2013 04:11:16 +0000
Subject: [PATCH] - can't start the webserver w/o the dirs it is using present
 - make the  iptables pkg check right

---
 .../copr-be-dev.cloud.fedoraproject.org.yml   | 35 ++++++++++---------
 tasks/iptables.yml                            |  4 +--
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/playbooks/hosts/copr-be-dev.cloud.fedoraproject.org.yml b/playbooks/hosts/copr-be-dev.cloud.fedoraproject.org.yml
index 078ae4f095..d9ebf6ca2a 100644
--- a/playbooks/hosts/copr-be-dev.cloud.fedoraproject.org.yml
+++ b/playbooks/hosts/copr-be-dev.cloud.fedoraproject.org.yml
@@ -43,23 +43,6 @@
     - screen
     
 
-  # setup webserver
-  - name: add config for copr-repo path
-    action: copy src=$files/copr/lighttpd/lighttpd.conf dest=/etc/lighttpd/lighttpd.conf owner=root group=root mode=0644
-    notify: 
-    - restart lighttpd
-
-  # mime default to text/plain and enable dirlisting for indexes
-  - name: update lighttpd configs
-    action: copy src=$files/copr/lighttpd/$item dest=/etc/lighttpd/conf.d/$item owner=root group=root mode=0644
-    with_items:
-    - dirlisting.conf
-    - mime.conf
-    notify: 
-    - restart lighttpd
-
-  - name: start webserver
-    action: service state=running enabled=yes name=lighttpd
   
   - name: make copr account
     action: user name=copr state=present system=yes home=/srv/copr-work/copr 
@@ -100,6 +83,24 @@
     - /srv/copr-work
     - /srv/copr-work/copr
 
+  # setup webserver
+  - name: add config for copr-repo path
+    action: copy src=$files/copr/lighttpd/lighttpd.conf dest=/etc/lighttpd/lighttpd.conf owner=root group=root mode=0644
+    notify: 
+    - restart lighttpd
+
+  # mime default to text/plain and enable dirlisting for indexes
+  - name: update lighttpd configs
+    action: copy src=$files/copr/lighttpd/$item dest=/etc/lighttpd/conf.d/$item owner=root group=root mode=0644
+    with_items:
+    - dirlisting.conf
+    - mime.conf
+    notify: 
+    - restart lighttpd
+
+  - name: start webserver
+    action: service state=running enabled=yes name=lighttpd
+
   # setup dirs for the ansible execution off of provisioning
   - name: dirs from provision
     action: file state=directory path=/srv/copr-work/provision/$item owner=copr group=copr
diff --git a/tasks/iptables.yml b/tasks/iptables.yml
index 9d67aaa446..feec89cb38 100644
--- a/tasks/iptables.yml
+++ b/tasks/iptables.yml
@@ -3,14 +3,14 @@
 
 - name: install iptables if not installed
   yum: name=iptables state=present
-  when: is_rhel == "1"
+  when: is_rhel == 1
   tags:
   - iptables
   - packages
 
 - name: install iptables-services if not installed
   yum: name=iptables-services state=present
-  when: is_fedora == "1"
+  when: is_fedora == 1
   tags:
   - iptables
   - packages