Merge pull request #219 from leseb/fix-rgw-socket

Fix Rados Gateway socket path

roles/ceph-radosgw/files/s3gw.fcgi

@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/radosgw -c /etc/ceph/ceph.conf -n client.radosgw.gateway

roles/ceph-radosgw/tasks/install_debian.yml

@@ -136,8 +136,8 @@
     - restart apache2
 
 - name: Install s3gw.fcgi script
-  copy: >
-    src=s3gw.fcgi
+  template: >
+    src=s3gw.fcgi.j2
     dest=/var/www/s3gw.fcgi
     mode=0555
     owner=root

roles/ceph-radosgw/tasks/install_redhat.yml

@@ -47,8 +47,8 @@
     mode=0644
 
 - name: Install s3gw.fcgi script
-  copy: >
-    src=s3gw.fcgi
+  template: >
+    src=s3gw.fcgi.j2
     dest=/var/www/s3gw.fcgi
     mode=0555
     owner=root

roles/ceph-radosgw/templates/rgw.conf

@@ -1,6 +1,6 @@
 # {{ ansible_managed }}
 
-FastCgiExternalServer /var/www/s3gw.fcgi -socket /tmp/radosgw.sock
+FastCgiExternalServer /var/www/s3gw.fcgi -socket  /tmp/radosgw-{{ ansible_hostname }}.sock
 <VirtualHost *:80>
         ServerName {{ ansible_hostname }}
         ServerAdmin {{ email_address }}@{{ ansible_fqdn }}

roles/ceph-radosgw/templates/s3gw.fcgi.j2

@@ -0,0 +1,3 @@
+# {{ ansible_managed }}
+#!/bin/sh
+exec /usr/bin/radosgw -c /etc/ceph/ceph.conf -n client.radosgw.{{ ansible_hostname }}