summaryrefslogtreecommitdiff
path: root/per-service
diff options
context:
space:
mode:
authorAndy Doan <andy.doan@linaro.org>2016-08-05 14:37:25 -0500
committerAndy Doan <andy.doan@linaro.org>2016-08-08 14:13:26 +0000
commitc94d88445e56df33c6ecf1b66738cbbadadccc3a (patch)
tree9800d3fdb8504cc410e0cb94f0f41eb523f7e942 /per-service
parentc93a11d559b61295cb996c62705163daf5be795d (diff)
downloadansible-playbooks-c94d88445e56df33c6ecf1b66738cbbadadccc3a.tar.gz
git: combine apache-website role task files
The main.yml and apache-website-git.yml are both so simple there's really no point keeping them separate. Change-Id: I22aa3375421247b099754abdc4d5b7a1518878f9 Reviewed-on: https://review.linaro.org/13633 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/roles/apache-website/tasks/apache-website-git.yml25
-rw-r--r--per-service/git-servers/roles/apache-website/tasks/main.yml26
2 files changed, 24 insertions, 27 deletions
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
deleted file mode 100644
index 17857de..0000000
--- a/per-service/git-servers/roles/apache-website/tasks/apache-website-git.yml
+++ /dev/null
@@ -1,25 +0,0 @@
----
-# All apache related tasks necessary to set up the git main server.
-
-- name: Create Apache root dir
- file: state=directory
- group={{ git_user }}
- owner={{ git_user }}
- mode=0755
- path={{ apache_root }}/{{ git_host }}
-
-- name: Install Apache git-http-backend suexec script
- template: src=git-http-backend.cgi
- dest={{ apache_root }}/{{ git_host }}/git-http-backend.cgi
- owner={{ git_user }}
- group={{ git_user }}
- mode=0550
- when: hosttype in ["git-main", "git-slave"] and server_access == "public"
-
-- name: Install Apache gitweb suexec script
- template: src=gitweb.cgi
- dest={{ apache_root }}/{{ git_host }}/gitweb.cgi
- owner={{ git_user }}
- group={{ git_user }}
- mode=0550
- when: hosttype in ["git-main", "git-slave"]
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 f829e10..4eed647 100644
--- a/per-service/git-servers/roles/apache-website/tasks/main.yml
+++ b/per-service/git-servers/roles/apache-website/tasks/main.yml
@@ -1,5 +1,27 @@
----
-- include: apache-website-git.yml
+# All apache related tasks necessary to set up the git main server.
+
+- name: Create Apache root dir
+ file: state=directory
+ group={{ git_user }}
+ owner={{ git_user }}
+ mode=0755
+ path={{ apache_root }}/{{ git_host }}
+
+- name: Install Apache git-http-backend suexec script
+ template: src=git-http-backend.cgi
+ dest={{ apache_root }}/{{ git_host }}/git-http-backend.cgi
+ owner={{ git_user }}
+ group={{ git_user }}
+ mode=0550
+ when: hosttype in ["git-main", "git-slave"] and server_access == "public"
+
+- name: Install Apache gitweb suexec script
+ template: src=gitweb.cgi
+ dest={{ apache_root }}/{{ git_host }}/gitweb.cgi
+ owner={{ git_user }}
+ group={{ git_user }}
+ mode=0550
+ when: hosttype in ["git-main", "git-slave"]
- name: Copy robots.txt file
template: src=robots.txt