Skip to content

Commit 2cd82e5

Browse files
myiimyii
committed
refactor(pkg): change to package instead
* #48 (comment) BREAKING CHANGE: Changing the `pkg` directory to `package` will break implementations that are depending on `pkg` for `include` or `sls`-based requisite purposes.
1 parent b7356b0 commit 2cd82e5

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

‎README.rst‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ This installs the template package,
5252
manages the template configuration file and then
5353
starts the associated template service.
5454

55-
``template.pkg``
56-
----------------
55+
``template.package``
56+
--------------------
5757

5858
This state will install the template package only.
5959

@@ -74,7 +74,7 @@ via include list.
7474

7575
Meta-state (This is a state that includes other states)
7676

77-
This state will undo everything performed in the ``template`` meta-state in reverse order, i.e.
77+
this state will undo everything performed in the ``template`` meta-state in reverse order, i.e.
7878
stops the service,
7979
removes the configuration file and
8080
then uninstalls the package.
@@ -90,8 +90,8 @@ This state will stop the template service and disable it at boot time.
9090
This state will remove the configuration of the template service and has a depency on ``template.service.clean``
9191
via include list.
9292

93-
``template.pkg.clean``
94-
----------------------
93+
``template.package.clean``
94+
--------------------------
9595

9696
This state will remove the template package and has a depency on ``template.config.clean``
9797
via include list.

‎template/clean.sls‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
include:
55
- .service.clean
66
- .config.clean
7-
- .pkg.clean
7+
- .package.clean

‎template/config/file.sls‎

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

44
{#- Get the `tplroot` from `tpldir` #}
55
{%- set tplroot = tpldir.split('/')[0] %}
6-
{%- set sls_pkg_install = tplroot ~ '.pkg.install' %}
6+
{%- set sls_package_install = tplroot ~ '.package.install' %}
77
{%- from tplroot ~ "/map.jinja" import template with context %}
88
{%- from tplroot ~ "/macros.jinja" import files_switch with context %}
99
1010
include:
11-
- {{ sls_pkg_install }}
11+
- {{ sls_package_install }}
1212
1313
template-config:
1414
file.managed:
@@ -24,4 +24,4 @@ template-config:
2424
- group: root
2525
- template: jinja
2626
- require:
27-
- sls: {{ sls_pkg_install }}
27+
- sls: {{ sls_package_install }}

‎template/init.sls‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
# vim: ft=sls
33

44
include:
5-
- .pkg
5+
- .package
66
- .config
77
- .service

template/pkg/clean.sls renamed to template/package/clean.sls

File renamed without changes.

template/pkg/init.sls renamed to template/package/init.sls

File renamed without changes.

template/pkg/install.sls renamed to template/package/install.sls

File renamed without changes.

0 commit comments

Comments
 (0)