Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion pillar.example
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,11 @@ remi:
remi:
disabled: True
remi-php70:
disabled: False
disabled: False

module:
glpi:
disabled: True
php:
disabled: False
version: remi-7.4
24 changes: 24 additions & 0 deletions remi/init.sls
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,28 @@ enable_{{ repo }}:
{% endfor %}
{% endif %}

{% if 'module' in remi_settings %}
{% for module,opts in remi_settings.module.items() %}
{% if opts.disabled|default(False) %}
disable_module_{{ module }}:
cmd.run:
- name: dnf -y module disable {{ module }}{% if opts.version|default(False) %}:{{ opts.version }}{% endif %}
- unless: dnf module --disabled list {{ module }}{% if opts.version|default(False) %}:{{ opts.version }}{% endif %}
{% else %}
reset_module_{{ module }}:
cmd.run:
- name: dnf -y module reset {{ module }}
- onlyif: dnf module --enabled list {{ module }}
{% if opts.version|default(False) %}
- unless: dnf module --enabled list {{ module }}:{{ opts.version }}
{% endif %}

enable_module_{{ module }}:
cmd.run:
- name: dnf -y module enable {{ module }}{% if opts.version|default(False) %}:{{ opts.version }}{% endif %}
- unless: dnf module --enabled list {{ module }}{% if opts.version|default(False) %}:{{ opts.version }}{% endif %}
{% endif %}
{% endfor %}
{% endif %}
Comment on lines +80 to +102
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To make this a little easier to follow, would you mind applying the following indentation, or something similar?

Suggested change
{% if 'module' in remi_settings %}
{% for module,opts in remi_settings.module.items() %}
{% if opts.disabled|default(False) %}
disable_module_{{ module }}:
cmd.run:
- name: dnf -y module disable {{ module }}{% if opts.version|default(False) %}:{{ opts.version }}{% endif %}
- unless: dnf module --disabled list {{ module }}{% if opts.version|default(False) %}:{{ opts.version }}{% endif %}
{% else %}
reset_module_{{ module }}:
cmd.run:
- name: dnf -y module reset {{ module }}
- onlyif: dnf module --enabled list {{ module }}
{% if opts.version|default(False) %}
- unless: dnf module --enabled list {{ module }}:{{ opts.version }}
{% endif %}
enable_module_{{ module }}:
cmd.run:
- name: dnf -y module enable {{ module }}{% if opts.version|default(False) %}:{{ opts.version }}{% endif %}
- unless: dnf module --enabled list {{ module }}{% if opts.version|default(False) %}:{{ opts.version }}{% endif %}
{% endif %}
{% endfor %}
{% endif %}
{% if 'module' in remi_settings %}
{% for module,opts in remi_settings.module.items() %}
{% if opts.disabled|default(False) %}
disable_module_{{ module }}:
cmd.run:
- name: dnf -y module disable {{ module }}{% if opts.version|default(False) %}:{{ opts.version }}{% endif %}
- unless: dnf module --disabled list {{ module }}{% if opts.version|default(False) %}:{{ opts.version }}{% endif %}
{% else %}
reset_module_{{ module }}:
cmd.run:
- name: dnf -y module reset {{ module }}
- onlyif: dnf module --enabled list {{ module }}
{% if opts.version|default(False) %}
- unless: dnf module --enabled list {{ module }}:{{ opts.version }}
{% endif %}
enable_module_{{ module }}:
cmd.run:
- name: dnf -y module enable {{ module }}{% if opts.version|default(False) %}:{{ opts.version }}{% endif %}
- unless: dnf module --enabled list {{ module }}{% if opts.version|default(False) %}:{{ opts.version }}{% endif %}
{% endif %}
{% endfor %}
{% endif %}


{% endif %}