From 3a519a076ece485a9fec767f30fe248e1ef4df26 Mon Sep 17 00:00:00 2001 From: Tim Flink Date: Thu, 1 Oct 2015 15:23:26 +0000 Subject: [PATCH] move taskotron-dev buildmaster to /srv/buildmaster --- inventory/group_vars/taskotron-dev | 3 +-- roles/taskotron/buildmaster/tasks/main.yml | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/inventory/group_vars/taskotron-dev b/inventory/group_vars/taskotron-dev index 14cc3c56e3..aa4ce4682a 100644 --- a/inventory/group_vars/taskotron-dev +++ b/inventory/group_vars/taskotron-dev @@ -67,9 +67,8 @@ 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: /home/buildmaster/master +buildmaster_dir: /srv/buildmaster buildslave_dir: /home/buildslave/slave -master_dir: /home/buildmaster/master master_user: buildmaster diff --git a/roles/taskotron/buildmaster/tasks/main.yml b/roles/taskotron/buildmaster/tasks/main.yml index 1fa39bcf9d..c6004c0a1a 100644 --- a/roles/taskotron/buildmaster/tasks/main.yml +++ b/roles/taskotron/buildmaster/tasks/main.yml @@ -84,3 +84,7 @@ - name: put robots.txt at web root of external hostname 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 + when: deployment_type == 'prod' or deployment_type == 'stg' or deployment_type == 'dev' or deployment_type == 'local'