That vars syntax was invalid.

2015-01-19 20:53:29 +00:00 · 2015-01-19 20:53:29 +00:00 · 4192c9d11d
commit 4192c9d11d
parent 415eb39fd7
3 changed files with 6 additions and 7 deletions
--- a/playbooks/groups/proxies-miscellaneous.yml
+++ b/playbooks/groups/proxies-miscellaneous.yml
@ -24,6 +24,9 @@
    path: /fedmsg

  - role: fedmsg/gateway/slave
+    stunnel_service: "websockets"
+    stunnel_source_port: 9939
+    stunnel_destination_port: 9938

  - role: httpd/fingerprints
    website: admin.fedoraproject.org
--- a/roles/fedmsg/gateway/slave/tasks/main.yml
+++ b/roles/fedmsg/gateway/slave/tasks/main.yml
@ -59,10 +59,6 @@
            owner=root group=root mode=0600
  with_items:
  - { file: stunnel-conf.j2, dest: /etc/stunnel/stunnel.conf }
-  vars:
-  - service: "websockets"
-  - source_port: 9939
-  - destination_port: 9938
  tags:
  - fedmsg/gateway
  - fedmsg/gateway/slave
--- a/roles/fedmsg/gateway/slave/templates/stunnel-conf.j2
+++ b/roles/fedmsg/gateway/slave/templates/stunnel-conf.j2
@ -2,7 +2,7 @@ cert = /etc/pki/tls/certs/wildcard-2014.fedoraproject.org.cert
 key = /etc/pki/tls/private/wildcard-2014.fedoraproject.org.key
 pid = /var/run/stunnel.pid

-[{{ service }}]
+[{{ stunnel_service }}]

-accept = {{ source_port }}
-connect = {{ destination_port }}
+accept = {{ stunnel_source_port }}
+connect = {{ stunnel_destination_port }}