Skip to content

Commit a349b30

Browse files
committed
refactor(components): split components into separate subdirs
* Plan based upon the following comments: - saltstack-formulas#48 (review) - saltstack-formulas#48 (comment)
1 parent 60a0928 commit a349b30

File tree

10 files changed

+51
-15
lines changed

10 files changed

+51
-15
lines changed

template/clean.sls

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# -*- coding: utf-8 -*-
2+
# vim: ft=sls
3+
4+
include:
5+
- .service.clean
6+
- .config.clean
7+
- .pkg.clean

template/config/clean.sls

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# -*- coding: utf-8 -*-
2+
# vim: ft=sls
3+
4+
{#- Get the `topdir` from `tpldir` #}
5+
{%- set topdir = tpldir.split('/')[0] %}
6+
{%- from topdir ~ "/map.jinja" import template with context %}
7+
{%- from topdir ~ "/macros.jinja" import files_switch with context %}
8+
9+
include:
10+
- {{ topdir }}.service.clean
11+
12+
template-config-absent:
13+
file.absent:
14+
- name: {{ template.config }}
15+
- require:
16+
- sls: {{ topdir }}.service.clean
File renamed without changes.

template/config/init.sls

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# -*- coding: utf-8 -*-
2+
# vim: ft=sls
3+
4+
include:
5+
- .file

template/init.sls

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@
33

44
include:
55
- .pkg
6+
- .config
7+
- .service

template/pkg/clean.sls

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,11 @@
55
{%- set topdir = tpldir.split('/')[0] %}
66
{%- from topdir ~ "/map.jinja" import template with context %}
77
8-
template-service-dead:
9-
service.dead:
10-
- name: {{ template.service.name }}
11-
- enable: False
12-
13-
template-config-absent:
14-
file.absent:
15-
- name: {{ template.config }}
16-
- require:
17-
- service: template-service-dead
8+
include:
9+
- {{ topdir }}.config.clean
1810
1911
template-pkg-removed:
2012
pkg.removed:
2113
- name: {{ template.pkg }}
2214
- require:
23-
- file: template-config-absent
15+
- sls: {{ topdir }}.config.clean

template/pkg/init.sls

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,3 @@
33

44
include:
55
- .install
6-
- .config
7-
- .service

template/service/clean.sls

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# -*- coding: utf-8 -*-
2+
# vim: ft=sls
3+
4+
{#- Get the `topdir` from `tpldir` #}
5+
{%- set topdir = tpldir.split('/')[0] %}
6+
{%- from topdir ~ "/map.jinja" import template with context %}
7+
8+
template-service-dead:
9+
service.dead:
10+
- name: {{ template.service.name }}
11+
- enable: False

template/service/init.sls

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# -*- coding: utf-8 -*-
2+
# vim: ft=sls
3+
4+
include:
5+
- .running

template/pkg/service.sls renamed to template/service/running.sls

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
{%- from topdir ~ "/map.jinja" import template with context %}
77
88
include:
9-
- {{ topdir }}.pkg.config
9+
- {{ topdir }}.config.file
1010
1111
template-service:
1212
service.running:
1313
- name: {{ template.service.name }}
1414
- enable: True
1515
- require:
16-
- sls: {{ topdir }}.pkg.config
16+
- sls: {{ topdir }}.config.file

0 commit comments

Comments
 (0)