From 1ea936a873da80b02fe653a12161729db60ad2b8 Mon Sep 17 00:00:00 2001
From: Robin Sonnabend <robin@fsmpi.rwth-aachen.de>
Date: Thu, 27 Feb 2020 10:04:07 +0100
Subject: [PATCH] Add group option to deployable-website, make key optional
---
deployable-website/tasks/website.yml | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/deployable-website/tasks/website.yml b/deployable-website/tasks/website.yml
index 2b77010..43b641c 100644
--- a/deployable-website/tasks/website.yml
+++ b/deployable-website/tasks/website.yml
@@ -21,8 +21,8 @@
path: "/var/www/{{website.name}}"
state: "directory"
owner: "{{website.name}}"
- group: "{{website.name}}"
- mode: "0755"
+ group: "{{website.group|default(website.name)}}"
+ mode: "0775"
- name: create an ssh directory
file:
@@ -31,14 +31,15 @@
owner: "{{website.name}}"
group: "{{website.name}}"
mode: "0755"
+ when: website.pubkey is defined
- name: create a deploy directory
file:
path: "/var/www/{{website.name}}/deploy"
state: "directory"
owner: "{{website.name}}"
- group: "{{website.name}}"
- mode: "0755"
+ group: "{{website.group|default(website.name)}}"
+ mode: "0775"
- name: authorize the deploy key
template:
@@ -47,12 +48,13 @@
owner: "{{website.name}}"
group: "{{website.name}}"
mode: "0644"
+ when: website.pubkey is defined
- name: create deploy subdirectories
file:
path: "/var/www/{{website.name}}/deploy/{{item}}"
state: "directory"
owner: "{{website.name}}"
- group: "{{website.name}}"
- mode: "0755"
+ group: "{{website.group|default(website.name)}}"
+ mode: "0775"
with_items: "{{website.subdirs|default([])}}"
--
GitLab