From 3070cc5c1c791e470d23bd083d1b77b9dadccdb3 Mon Sep 17 00:00:00 2001
From: Jan Philipp Timme <jan.philipp@timme.it>
Date: Thu, 9 Jan 2020 15:23:39 +0100
Subject: [PATCH] Remove permission stuff as is probably causes issues
---
deploy/defaults.yaml | 6 ------
deploy/gitlab.sls | 27 +++++----------------------
2 files changed, 5 insertions(+), 28 deletions(-)
diff --git a/deploy/defaults.yaml b/deploy/defaults.yaml
index 9b8989e..a8060d6 100644
--- a/deploy/defaults.yaml
+++ b/deploy/defaults.yaml
@@ -1,12 +1,6 @@
deploy:
config:
deploy_directory: /srv/repo
- deploy_directory_before_clone_user: deployer
- deploy_directory_before_clone_group: deployer
- deploy_directory_before_clone_mode: 770
- deploy_directory_after_clone_user: deployer
- deploy_directory_after_clone_group: deployer
- deploy_directory_after_clone_mode: 770
venv_directory: /srv/venv
cert_directory: /etc/hsh-certs
static_directory: /srv/static
diff --git a/deploy/gitlab.sls b/deploy/gitlab.sls
index 6f2aee0..47a52f9 100644
--- a/deploy/gitlab.sls
+++ b/deploy/gitlab.sls
@@ -9,12 +9,12 @@ deploy_packages:
- pkgs: [git]
{# Ensure deploy_directory exists with proper permissions to deploy before actually deploying into it. #}
-deploy_target_directory_before_clone_permissions:
+deploy_target_directory_exists:
file.directory:
- name: {{ deploy.config.deploy_directory }}
- - user: {{ deploy.config.deploy_directory_before_clone_user }}
- - group: {{ deploy.config.deploy_directory_before_clone_group }}
- - mode: {{ deploy.config.deploy_directory_before_clone_mode }}
+ - user: deployer
+ - group: deployer
+ - mode: 0770
- require:
- user: deployer
- group: deployer
@@ -32,7 +32,7 @@ deploy_{{ project_name }}_clone_git:
- force_reset: true # ignore local repos changed!
- target: {{ project_config.path }}
- require:
- - file: deploy_target_directory_before_clone_permissions
+ - file: deploy_target_directory_exists
deploy_{{ project_name }}_clone_directory_permissions:
file.directory:
@@ -63,20 +63,3 @@ deploy_{{ project_name }}_run_after_clone_command:
{% endif %}
{% endfor%}
-
-{# Allow fixing permissions of deploy_directory after cloning all projects in there. #}
-deploy_target_directory_after_clone_permissions:
- file.directory:
- - name: {{ deploy.config.deploy_directory }}
- - user: {{ deploy.config.deploy_directory_after_clone_user }}
- - group: {{ deploy.config.deploy_directory_after_clone_group }}
- - mode: {{ deploy.config.deploy_directory_after_clone_mode }}
- - require:
- - user: deployer
- - group: deployer
-{% for project_name, project_config in deploy.projects.items() if project_config.get('gitlab', False) %}
- - git: deploy_{{ project_name }}_clone_git
-{% if project_config.get('venv', False) %}
- - cmd: install_requirements_in_{{ project_name }}_venv
-{% endif %}
-{% endfor %}
--
GitLab