diff --git a/inventory/group_vars/taskotron-dev b/inventory/group_vars/taskotron-dev index aa4ce4682a..cbfe764fa1 100644 --- a/inventory/group_vars/taskotron-dev +++ b/inventory/group_vars/taskotron-dev @@ -67,7 +67,7 @@ buildmaster_endpoint: taskmaster buildslave_ssh_pubkey: 'ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA4EOTNfPIvIjCLNRYauVquS2LA8CZvCi6f87TASDZv4moFTv3mrCIdA3ycYLg+r+ODdPDjF9Cjpw1os/8L07XegTt9gAJVIpxzu3ZgQDkSQbx/hlDi+RG4EOIHL8nNJmu27dOVd1tb3k3aOkP5twO4uEq9RygrQBWMZTmOHdS/q8ZVUQG0d1sKv2J8EuBENgICjjIhhYvdvluu3G65jKxMgDbSXjkK6vZpbDbS2d6JI3VeLbVGlyFbHkTu7vH/vzTJZfOYgp0ZbvW9Wo3VSq/ia5qtrLKwRcBkpyCkP6uOQ14zqj4zJd/Hv7qhEcUhC8Jsb7d/Z6b3q5ID0s/9nuHdQ== buildslave@taskotron-dev01.qa.fedoraproject.org' buildslave_port: 9989 cgit_root_title: "Taskotron Dev Server Git Mirror" -buildmaster_dir: /srv/buildmaster +buildmaster_dir: /srv/buildmaster/master buildslave_dir: /home/buildslave/slave master_user: buildmaster diff --git a/roles/taskotron/buildmaster/tasks/main.yml b/roles/taskotron/buildmaster/tasks/main.yml index c6004c0a1a..385e2836b0 100644 --- a/roles/taskotron/buildmaster/tasks/main.yml +++ b/roles/taskotron/buildmaster/tasks/main.yml @@ -85,6 +85,6 @@ when: robots_path is defined template: src=robots.txt.j2 dest={{ robots_path }}/robots.txt owner=apache group=apache mode=0644 -- name: ensure buildmaster user can use buildmaster dir - file: path={{ buildmaster_dir }} state=directory owner=buildmaster group=buildmaster mode=0775 +- name: ensure buildmaster user can use parent of buildmaster dir + file: path="{{ buildmaster_dir }}/.." state=directory owner=buildmaster group=buildmaster mode=0775 when: deployment_type == 'prod' or deployment_type == 'stg' or deployment_type == 'dev' or deployment_type == 'local'