Skip to content

Commit

Permalink
refactor(yaml): fix yamllint errors, update pillar for tests
Browse files Browse the repository at this point in the history
  • Loading branch information
SuperTux88 committed Oct 11, 2020
1 parent f45790a commit 5798ac1
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 5 deletions.
7 changes: 5 additions & 2 deletions diaspora/defaults.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# -*- coding: utf-8 -*-
# vim: ft=yaml
---
diaspora:
systemd:
web_template: salt://diaspora/files/diaspora-web.service
Expand All @@ -7,7 +10,7 @@ diaspora:

ruby_version: 2.6.6

install_redis: True
install_redis: true

user:
username: diaspora
Expand All @@ -16,5 +19,5 @@ diaspora:
type: postgresql
host: localhost
username: diaspora
password:
password: ~
database: diaspora
2 changes: 2 additions & 0 deletions kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,10 @@ suites:
base:
'*':
- diaspora
- tests
pillars_from_files:
diaspora.sls: pillar.example
tests.sls: test/salt/pillar/tests.sls
verifier:
inspec_tests:
- path: test/integration/default
11 changes: 8 additions & 3 deletions pillar.example
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
# -*- coding: utf-8 -*-
# vim: ft=yaml
---
diaspora:
repository: git://github.com/diaspora/diaspora.git
repository: https://github.com/diaspora/diaspora.git

# version can be a branch or a tag
version: develop

install_path: /srv/diaspora

ruby_version: 2.3.4
ruby_version: 2.6.6

install_redis: false

user:
username: diaspora
Expand All @@ -20,7 +25,7 @@ diaspora:
password: secret
database: diaspora

# have a look at https://github.com/diaspora/diaspora/blob/develop/config/diaspora.yml.example
# see https://github.com/diaspora/diaspora/blob/develop/config/diaspora.toml.example
configuration:
environment:
url: "https://example.org/"
Expand Down
8 changes: 8 additions & 0 deletions test/salt/pillar/tests.sls
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# -*- coding: utf-8 -*-
# vim: ft=yaml
---
diaspora:
install_redis: true

user:
shell: /bin/bash

0 comments on commit 5798ac1

Please sign in to comment.