Skip to content

Commit

Permalink
Merge pull request #13 from guidograzioli/1_1_1_linter
Browse files Browse the repository at this point in the history
ah linter changes
  • Loading branch information
guidograzioli authored Apr 10, 2024
2 parents 88e394d + fdf62d5 commit 8e774e7
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion roles/jbcs/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jbcs_ssl_port: 443
jbcs_version: '2.4.57'
jbcs_distro: RHEL8
jbcs_arch: x86_64
jbcs_bundle_prefix: "jbcs-httpd24-httpd"
jbcs_bundle_prefix: "jbcs-httpd24-httpd"

jbcs_bundle: "{{ jbcs_bundle_prefix }}-{{ jbcs_version }}-{{ jbcs_distro }}-{{ jbcs_arch }}.zip"
jbcs_patch_bundle: "{{ jbcs_bundle_prefix }}-{{ jbcs_version }}-SP[1-9][0-9]*-{{ jbcs_distro }}-{{ jbcs_arch }}.zip"
Expand Down
6 changes: 3 additions & 3 deletions roles/jbcs/tasks/install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
path: "{{ jbcs_zip_path }}"
owner: "{{ httpd.user.name }}"
group: "{{ httpd.group.name }}"
mode: 0750
mode: '0750'
state: directory

## check remote archive
Expand Down Expand Up @@ -94,7 +94,7 @@
- name: Determine install zipfile from search results
ansible.builtin.set_fact:
rhn_filtered_products: "{{ rhn_products.results | selectattr('file_path', 'match', \
'.*/' + [ jbcs_bundle_prefix, jbcs_version, jbcs_distro, jbcs_arch ] | join('-') + '.zip') }}"
'.*/' + [ jbcs_bundle_prefix, jbcs_version, jbcs_distro, jbcs_arch ] | join('-') + '.zip') }}"
delegate_to: localhost
run_once: true

Expand All @@ -121,7 +121,7 @@
dest: "{{ archive }}"
owner: "{{ httpd.user.name }}"
group: "{{ httpd.group.name }}"
mode: 0640
mode: '0640'
register: new_version_downloaded
when:
- not archive_path.stat.exists
Expand Down
2 changes: 1 addition & 1 deletion roles/jbcs/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
dest: "{{ httpd.home }}/httpd/conf.d/mod_cluster.conf"
owner: "{{ httpd.user.name }}"
group: "{{ httpd.group.name }}"
mode: 0640
mode: '0640'
when: jbcs_mod_cluster_enable
notify:
- 'Expire mod_cluster cache and restart'
Expand Down
6 changes: 3 additions & 3 deletions roles/jbcs/tasks/patch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
ansible.builtin.set_fact:
rhn_filtered_products: "{{ rhn_products.results | map(attribute='file_path') | \
select('match', '^[^/]*/' + jbcs_patch_bundle + '$') | \
map('regex_replace', '[^/]*/' + jbcs_bundle_prefix + '-' + jbcs_version + '-SP([1-9][0-9]*)-.*', '\\1' ) | \
map('regex_replace', '[^/]*/' + jbcs_bundle_prefix + '-' + jbcs_version + '-SP([1-9][0-9]*)-.*', '\\1') | \
list | unique }}"
delegate_to: localhost
run_once: true
Expand All @@ -35,7 +35,7 @@
- name: Determine latest patch version
ansible.builtin.set_fact:
rhn_filtered_products: "{{ rhn_products.results | selectattr('file_path', 'match', \
'[^/]*/' + [ jbcs_bundle_prefix, jbcs_version, latest_patch_version, jbcs_distro, jbcs_arch ] | join('-') + '.zip$') }}"
'[^/]*/' + [ jbcs_bundle_prefix, jbcs_version, latest_patch_version, jbcs_distro, jbcs_arch ] | join('-') + '.zip$') }}"
delegate_to: localhost
run_once: true

Expand Down Expand Up @@ -116,7 +116,7 @@
dest: "{{ archive }}"
owner: "{{ httpd.user.name }}"
group: "{{ httpd.group.name }}"
mode: 0640
mode: '0640'
register: new_version_downloaded
when:
- not archive_path.stat.exists
Expand Down
6 changes: 3 additions & 3 deletions roles/jbcs/tasks/post_install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
dest: "/usr/lib/systemd/system/{{ jbcs_service_name }}.service"
owner: "{{ httpd.user.name }}"
group: "{{ httpd.group.name }}"
mode: 0640
mode: '0640'
notify:
- "Reload systemd"

Expand All @@ -18,13 +18,13 @@
- name: 00-base.conf
dest: "{{ httpd.home }}/httpd/conf.modules.d"
- name: httpd.conf
dest: "{{ httpd.home }}/httpd/conf"
dest: "{{ httpd.home }}/httpd/conf"
ansible.builtin.template:
src: "templates/{{ item.name }}.j2"
dest: "{{ item.dest }}/{{ item.name }}"
owner: "{{ httpd.user.name }}"
group: "{{ httpd.group.name }}"
mode: 0640
mode: '0640'

- name: Ensure JBCS module configuration is correct
become: true
Expand Down
4 changes: 2 additions & 2 deletions roles/jbcs/tasks/ssl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
state: hard
owner: "{{ httpd.user.name }}"
group: "{{ httpd.group.name }}"
mode: 0640
mode: '0640'
when:
- ssl_conf_file.stat.exists
- not ssl_conf_disabled_file.stat.exists
Expand All @@ -55,7 +55,7 @@
dest: "{{ ssl_conf }}"
owner: "{{ httpd.user.name }}"
group: "{{ httpd.group.name }}"
mode: 0640
mode: '0640'
notify:
- Restart JBCS

Expand Down

0 comments on commit 8e774e7

Please sign in to comment.