Merge branch 'master' into 'enable-nextcloud-cronjob' (a7db2e9e) · Commits · Varac / stackspin · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

stackspin
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

Due to spam, we had to disable registrations and GitHub login. Please reach out to us at support@greenhost.net if you want to contribute.

a7db2e9e

Commit a7db2e9e authored 5 years ago by Mark

Downloads
- Plain Diff

Merge branch 'master' into 'enable-nextcloud-cronjob'

# Conflicts:
#   ansible/group_vars/all/oas.yml

parents 18d496c1 f63271c5

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 1 addition, 1 deletion

.gitlab-ci.yml
ansible/group_vars/all/oas.yml 0 additions, 1 deletion

ansible/group_vars/all/oas.yml
ansible/roles/setup/tasks/helmfiles.yml 1 addition, 1 deletion

ansible/roles/setup/tasks/helmfiles.yml
helmfiles/README.md 0 additions, 1 deletion

helmfiles/README.md
helmfiles/helmfile.d/20-nextcloud.yaml 1 addition, 0 deletions

helmfiles/helmfile.d/20-nextcloud.yaml
helmfiles/values/nextcloud.yaml.gotmpl 20 additions, 0 deletions

helmfiles/values/nextcloud.yaml.gotmpl
test/behave/features/nextcloud.feature 1 addition, 1 deletion

test/behave/features/nextcloud.feature

with 24 additions and 5 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment