diff --git a/roles/phabricator/tasks/main.yml b/roles/phabricator/tasks/main.yml index c42ae1f954..dceda23002 100644 --- a/roles/phabricator/tasks/main.yml +++ b/roles/phabricator/tasks/main.yml @@ -24,8 +24,11 @@ - name: create phabricator daemon user user: name={{ phabricator_daemon_user }} +- name: add apache user to daemon user group + user: name=apache groups={{ phabricator_daemon_user }} + - name: create vcs user - user: name={{ phabricator_vcs_user }} password={{ phabricator_vcs_user_password }} + user: name={{ phabricator_vcs_user }} password={{ phabricator_vcs_user_password }} groups={{ phabricator_daemon_user }} when: enable_phabricator_git - name: add vcs user to sudoers to write as daemon user with restrictions for git @@ -55,7 +58,7 @@ file: path={{ phabricator_filedir }} state=directory owner=apache group=apache mode=1755 - name: create log directory for phabricator - file: path=/var/log/phabricator state=directory owner={{ phabricator_daemon_user }} group=apache mode=1775 + file: path=/var/log/phabricator state=directory owner={{ phabricator_daemon_user }} group={{ phabricator_daemon_user }} mode=1775 # disabling phabricator env #- name: generate phabricator environment diff --git a/roles/phabricator/templates/local.json.j2 b/roles/phabricator/templates/local.json.j2 index 14bd711f83..2344a431b1 100644 --- a/roles/phabricator/templates/local.json.j2 +++ b/roles/phabricator/templates/local.json.j2 @@ -22,7 +22,6 @@ "metamta.domain" : "{{ phabricator_mail_domain }}", "metamta.reply-handler-domain" : "{{ phabricator_mail_domain }}", "metamta.mail-adapter" : "{{ "PhabricatorMailImplementationPHPMailerLiteAdapter" if phabricator_mail_enabled else "PhabricatorMailImplementationTestAdapter"}}", - "phpmailer.smtp-host" : "bastion.fedoraproject.org", "auth.email-domains" : ["fedoraproject.org"], "phabricator.uninstalled-applications" : { "PhabricatorApplicationPhame" : true,