Skip to content

Commit

Permalink
refactor(pkg): change to package instead
Browse files Browse the repository at this point in the history
* #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.
  • Loading branch information
myii committed Feb 28, 2019
1 parent b7356b0 commit 2cd82e5
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
10 changes: 5 additions & 5 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ This installs the template package,
manages the template configuration file and then
starts the associated template service.

``template.pkg``
----------------
``template.package``
--------------------

This state will install the template package only.

Expand All @@ -74,7 +74,7 @@ via include list.

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

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

``template.pkg.clean``
----------------------
``template.package.clean``
--------------------------

This state will remove the template package and has a depency on ``template.config.clean``
via include list.
Expand Down
2 changes: 1 addition & 1 deletion template/clean.sls
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
include:
- .service.clean
- .config.clean
- .pkg.clean
- .package.clean
6 changes: 3 additions & 3 deletions template/config/file.sls
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@

{#- Get the `tplroot` from `tpldir` #}
{%- set tplroot = tpldir.split('/')[0] %}
{%- set sls_pkg_install = tplroot ~ '.pkg.install' %}
{%- set sls_package_install = tplroot ~ '.package.install' %}
{%- from tplroot ~ "/map.jinja" import template with context %}
{%- from tplroot ~ "/macros.jinja" import files_switch with context %}
include:
- {{ sls_pkg_install }}
- {{ sls_package_install }}
template-config:
file.managed:
Expand All @@ -24,4 +24,4 @@ template-config:
- group: root
- template: jinja
- require:
- sls: {{ sls_pkg_install }}
- sls: {{ sls_package_install }}
2 changes: 1 addition & 1 deletion template/init.sls
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
# vim: ft=sls

include:
- .pkg
- .package
- .config
- .service
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 2cd82e5

Please sign in to comment.