Skip to content

Make some policy parameters optional #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Make some policy parameters optional #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f14fa2
Make some policy parameters optional
xstasi Nov 28, 2019
fba87c5
Change template style to hash.get('key') rather than hash['key']
xstasi Dec 3, 2019
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
20 changes: 14 additions & 6 deletions templates/config.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,20 @@

# policy (key is id as in Foreman)
{% for policy in foreman_scap_client_policies %}
{{ policy['id'] }}:
:profile: {{ policy['profile_id'] }}
:content_path: {{ policy['content_path']}}
{{ policy.get('id') }}:
{% if 'profile_id' in policy %}
:profile: {{ policy.get('profile_id') }}
{% endif %}
:content_path: {{ policy.get('content_path')}}
# Download path
# A path to download SCAP content from proxy
:download_path: {{ policy['download_path'] }}
:tailoring_path: {{ policy['tailoring_path'] }}
:tailoring_download_path: {{ policy['tailoring_download_path'] }}
{% if 'download_path' in policy %}
:download_path: {{ policy.get('download_path') }}
{% endif %}
{% if 'tailoring_path' in policy %}
:tailoring_path: {{ policy.get('tailoring_path') }}
{% endif %}
{% if 'tailoring_download_path' in policy %}
:tailoring_download_path: {{ policy.get('tailoring_download_path') }}
{% endif %}
{% endfor %}
2 changes: 1 addition & 1 deletion templates/cron.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@

# foreman_scap_client cron job
{% for policy in foreman_scap_client_policies %}
{{ policy['minute'] }} {{ policy['hour'] }} {{ policy['monthday'] }} {{ policy['month'] }} {{ policy['weekday'] }} root /bin/sleep {{ foreman_scap_client_cron_splay | random(seed = foreman_scap_client_cron_splay_seed) if foreman_scap_client_cron_splay_seed != '' else foreman_scap_client_cron_splay | random }}; /usr/bin/foreman_scap_client {{ policy['id'] }} 2>&1 | logger -t foreman_scap_client
{{ policy.get('minute') }} {{ policy.get('hour') }} {{ policy.get('monthday') }} {{ policy.get('month') }} {{ policy.get('weekday') }} root /bin/sleep {{ foreman_scap_client_cron_splay | random(seed = foreman_scap_client_cron_splay_seed) if foreman_scap_client_cron_splay_seed != '' else foreman_scap_client_cron_splay | random }}; /usr/bin/foreman_scap_client {{ policy.get('id') }} 2>&1 | logger -t foreman_scap_client
{% endfor %}