Przeglądaj źródła

replace hardcoded paths with slspath variable

Allows the use of gitfs mountpoint and renaming hte folder without
the need to manually update any of the paths
fixconfig
Rossen Georgiev 7 lat temu
rodzic
commit
13efcbc79a
6 zmienionych plików z 10 dodań i 8 usunięć
  1. +4
    -2
      chrony/config.sls
  2. +1
    -1
      chrony/defaults.yaml
  3. +1
    -1
      chrony/files/chrony_config
  4. +1
    -1
      chrony/init.sls
  5. +2
    -2
      chrony/map.jinja
  6. +1
    -1
      chrony/removed.sls

+ 4
- 2
chrony/config.sls Wyświetl plik

@@ -1,13 +1,15 @@
{% from "chrony/map.jinja" import chrony with context %}
{% from slspath+"/map.jinja" import chrony with context %}

include:
- chrony
- .init

chrony_config:
file.managed:
- name: {{ chrony.config }}
- source: {{ chrony.config_src }}
- template: jinja
- defaults:
slspath: {{ slspath|yaml_encode }}
- user: root
- mode: 644
- watch_in:

+ 1
- 1
chrony/defaults.yaml Wyświetl plik

@@ -4,7 +4,7 @@ chrony:
package: chrony
service: chronyd
config: /etc/chrony.conf
config_src: salt://chrony/files/chrony_config
config_src: salt://{{ slspath }}/files/chrony_config
ntpservers: [ '0.us.pool.ntp.org',
'1.us.pool.ntp.org',
'2.us.pool.ntp.org',

+ 1
- 1
chrony/files/chrony_config Wyświetl plik

@@ -1,4 +1,4 @@
{% from "chrony/map.jinja" import chrony as config with context %}
{% from slspath+"/map.jinja" import chrony as config with context %}
# This file is managed by salt
{% for server in config.ntpservers -%}
server {{ server }} {{ config.options }}

+ 1
- 1
chrony/init.sls Wyświetl plik

@@ -1,4 +1,4 @@
{% from "chrony/map.jinja" import chrony with context %}
{% from slspath+"/map.jinja" import chrony with context %}

chrony:
pkg.installed:

+ 2
- 2
chrony/map.jinja Wyświetl plik

@@ -1,6 +1,6 @@
{## start with defaults from defaults.yaml ##}
{% import_yaml "chrony/defaults.yaml" as defaults %}
{% import_yaml "chrony/osmap.yaml" as osmap %}
{% import_yaml slspath+"/defaults.yaml" as defaults %}
{% import_yaml slspath+"/osmap.yaml" as osmap %}

{% set chrony = salt['grains.filter_by'](
defaults,

+ 1
- 1
chrony/removed.sls Wyświetl plik

@@ -1,4 +1,4 @@
{% from "chrony/map.jinja" import chrony with context %}
{% from slspath+"/map.jinja" import chrony with context %}

chrony_removed:
service.dead:

Ładowanie…
Anuluj
Zapisz