Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
deploy-formula
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
salt
deploy-formula
Commits
3070cc5c
Commit
3070cc5c
authored
5 years ago
by
Jan Philipp Timme
Browse files
Options
Downloads
Patches
Plain Diff
Remove permission stuff as is probably causes issues
parent
62c39346
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
deploy/defaults.yaml
+0
-6
0 additions, 6 deletions
deploy/defaults.yaml
deploy/gitlab.sls
+5
-22
5 additions, 22 deletions
deploy/gitlab.sls
with
5 additions
and
28 deletions
deploy/defaults.yaml
+
0
−
6
View file @
3070cc5c
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
...
...
This diff is collapsed.
Click to expand it.
deploy/gitlab.sls
+
5
−
22
View file @
3070cc5c
...
@@ -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_permission
s:
deploy_target_directory_
exist
s:
file.directory:
file.directory:
- name: {{ deploy.config.deploy_directory }}
- name: {{ deploy.config.deploy_directory }}
- user:
{{
deploy
.config.deploy_directory_before_clone_user }}
- user: deploy
er
- group:
{{
deploy
.config.deploy_directory_before_clone_group }}
- group: deploy
er
- 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_permission
s
- file: deploy_target_directory_
exist
s
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 %}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment