summaryrefslogtreecommitdiff
path: root/per-service
diff options
context:
space:
mode:
authorAndy Doan <andy.doan@linaro.org>2016-08-05 14:34:03 -0500
committerAndy Doan <andy.doan@linaro.org>2016-08-08 14:13:21 +0000
commitc93a11d559b61295cb996c62705163daf5be795d (patch)
treefddf6842a0a4c45a78b8e75473169385fedef0fc /per-service
parent81bc4da55955e0bc1d2b202d9b8ac25fb677c085 (diff)
downloadansible-playbooks-c93a11d559b61295cb996c62705163daf5be795d.tar.gz
git: clean up tags for apache-website-role
I was doing some clean up in this area and noticed the tags to access this role were a bit awkward and went against our decision to stop doing "install" tags. This makes it part of "website-conf" Change-Id: I1cb325b3cfa0a184ce820c0c722182adfcf6d81c Reviewed-on: https://review.linaro.org/13632 Reviewed-by: Ben Copeland <ben.copeland@linaro.org> Reviewed-by: Paul Sokolovsky <paul.sokolovsky@linaro.org>
Diffstat (limited to 'per-service')
-rw-r--r--per-service/git-servers/gitolite.yml2
-rw-r--r--per-service/git-servers/roles/apache-website/tasks/apache-website-git.yml6
-rw-r--r--per-service/git-servers/roles/apache-website/tasks/main.yml3
3 files changed, 1 insertions, 10 deletions
diff --git a/per-service/git-servers/gitolite.yml b/per-service/git-servers/gitolite.yml
index 87b780e..6fd7cdc 100644
--- a/per-service/git-servers/gitolite.yml
+++ b/per-service/git-servers/gitolite.yml
@@ -15,7 +15,7 @@
- {role: gitolite, when: hosttype == 'git-main'}
- apache-conf
- {role: apache-auth, host_name: "{{git_host}}", when: server_access == "private", tags: [apache-auth, website-conf]}
- - apache-website
+ - {role: apache-website, tags: [website-conf]}
- {role: apache-site, src: "{{git_host}}.conf", config: "{{git_host}}", tags: [apache, website-conf] }
- {role: cronjobs}
- {role: gitweb, tags: [gitweb]}
diff --git a/per-service/git-servers/roles/apache-website/tasks/apache-website-git.yml b/per-service/git-servers/roles/apache-website/tasks/apache-website-git.yml
index 7fb7d51..17857de 100644
--- a/per-service/git-servers/roles/apache-website/tasks/apache-website-git.yml
+++ b/per-service/git-servers/roles/apache-website/tasks/apache-website-git.yml
@@ -7,8 +7,6 @@
owner={{ git_user }}
mode=0755
path={{ apache_root }}/{{ git_host }}
- tags:
- - install
- name: Install Apache git-http-backend suexec script
template: src=git-http-backend.cgi
@@ -17,8 +15,6 @@
group={{ git_user }}
mode=0550
when: hosttype in ["git-main", "git-slave"] and server_access == "public"
- tags:
- - install
- name: Install Apache gitweb suexec script
template: src=gitweb.cgi
@@ -27,5 +23,3 @@
group={{ git_user }}
mode=0550
when: hosttype in ["git-main", "git-slave"]
- tags:
- - install
diff --git a/per-service/git-servers/roles/apache-website/tasks/main.yml b/per-service/git-servers/roles/apache-website/tasks/main.yml
index 8ca0b55..f829e10 100644
--- a/per-service/git-servers/roles/apache-website/tasks/main.yml
+++ b/per-service/git-servers/roles/apache-website/tasks/main.yml
@@ -7,6 +7,3 @@
mode=0444
owner={{ git_user }}
group={{ git_user }}
- tags:
- - update
- - apache