瀏覽代碼

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

tags/v1.0.0
Benjamin Neff 4 年之前
父節點
當前提交
5798ac12bd
沒有連結到貢獻者的電子郵件帳戶。
共有 4 個檔案被更改,包括 23 行新增5 行删除
  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 查看文件

@@ -1,3 +1,6 @@
# -*- coding: utf-8 -*-
# vim: ft=yaml
---
diaspora:
systemd:
web_template: salt://diaspora/files/diaspora-web.service
@@ -7,7 +10,7 @@ diaspora:

ruby_version: 2.6.6

install_redis: True
install_redis: true

user:
username: diaspora
@@ -16,5 +19,5 @@ diaspora:
type: postgresql
host: localhost
username: diaspora
password:
password: ~
database: diaspora

+ 2
- 0
kitchen.yml 查看文件

@@ -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

+ 8
- 3
pillar.example 查看文件

@@ -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
@@ -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/"

+ 8
- 0
test/salt/pillar/tests.sls 查看文件

@@ -0,0 +1,8 @@
# -*- coding: utf-8 -*-
# vim: ft=yaml
---
diaspora:
install_redis: true

user:
shell: /bin/bash

Loading…
取消
儲存