Browse Source

refactor(yaml): fix yamllint errors, update pillar for tests

tags/v1.0.0
Benjamin Neff 4 years ago
parent
commit
5798ac12bd
No account linked to committer's email address
4 changed files with 23 additions and 5 deletions
  1. +5
    -2
      diaspora/defaults.yaml
  2. +2
    -0
      kitchen.yml
  3. +8
    -3
      pillar.example
  4. +8
    -0
      test/salt/pillar/tests.sls

+ 5
- 2
diaspora/defaults.yaml View File

# -*- coding: utf-8 -*-
# vim: ft=yaml
---
diaspora: diaspora:
systemd: systemd:
web_template: salt://diaspora/files/diaspora-web.service web_template: salt://diaspora/files/diaspora-web.service


ruby_version: 2.6.6 ruby_version: 2.6.6


install_redis: True
install_redis: true


user: user:
username: diaspora username: diaspora
type: postgresql type: postgresql
host: localhost host: localhost
username: diaspora username: diaspora
password:
password: ~
database: diaspora database: diaspora

+ 2
- 0
kitchen.yml View File

base: base:
'*': '*':
- diaspora - diaspora
- tests
pillars_from_files: pillars_from_files:
diaspora.sls: pillar.example diaspora.sls: pillar.example
tests.sls: test/salt/pillar/tests.sls
verifier: verifier:
inspec_tests: inspec_tests:
- path: test/integration/default - path: test/integration/default

+ 8
- 3
pillar.example View File

# -*- coding: utf-8 -*-
# vim: ft=yaml
---
diaspora: diaspora:
repository: git://github.com/diaspora/diaspora.git
repository: https://github.com/diaspora/diaspora.git


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


install_path: /srv/diaspora install_path: /srv/diaspora


ruby_version: 2.3.4
ruby_version: 2.6.6

install_redis: false


user: user:
username: diaspora username: diaspora
password: secret password: secret
database: diaspora 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: configuration:
environment: environment:
url: "https://example.org/" url: "https://example.org/"

+ 8
- 0
test/salt/pillar/tests.sls View File

# -*- coding: utf-8 -*-
# vim: ft=yaml
---
diaspora:
install_redis: true

user:
shell: /bin/bash

Loading…
Cancel
Save