Skip to content
Snippets Groups Projects
Commit 3070cc5c authored by Jan Philipp Timme's avatar Jan Philipp Timme
Browse files

Remove permission stuff as is probably causes issues

parent 62c39346
No related branches found
No related tags found
No related merge requests found
deploy: deploy:
config: config:
deploy_directory: /srv/repo 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 venv_directory: /srv/venv
cert_directory: /etc/hsh-certs cert_directory: /etc/hsh-certs
static_directory: /srv/static static_directory: /srv/static
......
...@@ -9,12 +9,12 @@ deploy_packages: ...@@ -9,12 +9,12 @@ deploy_packages:
- pkgs: [git] - pkgs: [git]
{# Ensure deploy_directory exists with proper permissions to deploy before actually deploying into it. #} {# 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: file.directory:
- name: {{ deploy.config.deploy_directory }} - name: {{ deploy.config.deploy_directory }}
- user: {{ deploy.config.deploy_directory_before_clone_user }} - user: deployer
- group: {{ deploy.config.deploy_directory_before_clone_group }} - group: deployer
- mode: {{ deploy.config.deploy_directory_before_clone_mode }} - mode: 0770
- require: - require:
- user: deployer - user: deployer
- group: deployer - group: deployer
...@@ -32,7 +32,7 @@ deploy_{{ project_name }}_clone_git: ...@@ -32,7 +32,7 @@ deploy_{{ project_name }}_clone_git:
- force_reset: true # ignore local repos changed! - force_reset: true # ignore local repos changed!
- target: {{ project_config.path }} - target: {{ project_config.path }}
- require: - require:
- file: deploy_target_directory_before_clone_permissions - file: deploy_target_directory_exists
deploy_{{ project_name }}_clone_directory_permissions: deploy_{{ project_name }}_clone_directory_permissions:
file.directory: file.directory:
...@@ -63,20 +63,3 @@ deploy_{{ project_name }}_run_after_clone_command: ...@@ -63,20 +63,3 @@ deploy_{{ project_name }}_run_after_clone_command:
{% endif %} {% endif %}
{% endfor%} {% 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 %}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment