diff --git a/roles/flyspray/defaults/main.yml b/roles/flyspray/defaults/main.yml index e489c62403874b077cc21892eec0bf7b9b14bc96..f42928efc9b2b640f2e29d9c03f331a57202995c 100644 --- a/roles/flyspray/defaults/main.yml +++ b/roles/flyspray/defaults/main.yml @@ -1,6 +1,7 @@ --- flyspray_dir: '/srv/http/flyspray' flyspray_domain: 'bugs.archlinux.org' +flyspray_user: 'php-flyspray' flyspray_db: 'flyspray' flyspray_db_host: 'localhost' diff --git a/roles/flyspray/tasks/main.yml b/roles/flyspray/tasks/main.yml index 66319e667e78d456532f99ddc84573f245fb9b41..deadde1a546e01634829d4049c49bfcb43377827 100644 --- a/roles/flyspray/tasks/main.yml +++ b/roles/flyspray/tasks/main.yml @@ -4,10 +4,10 @@ pacman: name=git state=present - name: make flyspray user - user: name=flyspray shell=/bin/false home="{{ flyspray_dir }}" createhome=no + user: name="{{ flyspray_user }}" shell=/bin/false home="{{ flyspray_dir }}" createhome=no - name: fix home permissions - file: state=directory owner=flyspray group=flyspray path="{{ flyspray_dir }}" + file: state=directory owner="{{ flyspray_user }}" group="{{ flyspray_user }}" path="{{ flyspray_dir }}" - name: set up nginx template: src=nginx.d.conf.j2 dest=/etc/nginx/nginx.d/flyspray.conf owner=root group=root mode=644 @@ -20,16 +20,17 @@ - name: clone flyspray repo git: repo=git://git.archlinux.org/vhosts/bugs.archlinux.org.git dest="{{ flyspray_dir }}" become: true - become_user: flyspray + become_user: "{{ flyspray_user }}" register: release - name: fix home permissions - file: state=directory owner=flyspray group=flyspray path="{{ flyspray_dir }}" + file: state=directory owner="{{ flyspray_user }}" group="{{ flyspray_user }}" path="{{ flyspray_dir }}" - name: configure flyspray - template: src=flyspray.conf.php.j2 dest=/srv/http/flyspray/flyspray.conf.php owner=flyspray group=flyspray mode=0660 + template: src=flyspray.conf.php.j2 dest=/srv/http/flyspray/flyspray.conf.php owner="{{ flyspray_user }}" group="{{ flyspray_user }}" mode=0660 register: config no_log: true + register: config - name: create flyspray db mysql_db: name="{{ flyspray_db }}" login_host="{{ flyspray_db_host }}" login_password="{{ mariadb_users.root }}" @@ -40,3 +41,10 @@ login_host="{{ flyspray_db_host }}" login_password="{{ mariadb_users.root }}" priv="{{ flyspray_db }}.*:ALL" no_log: true + +- name: configure php-fpm + template: + src=php-fpm.conf.j2 dest=/etc/php/php-fpm.d/flyspray.conf + owner=root group=root mode=0644 + notify: + - restart php-fpm@flyspray