Skip to content
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.

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

Add support for Ubuntu 22 #20

Merged
merged 6 commits into from
Feb 15, 2024
Merged
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
3 changes: 0 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ jobs:
- NAME: min_ansible_version
ANSIBLE_VERSION: "==2.7.*"
ANSIBLE_LINT_VERSION: "==4.2.*"
- NAME: latest
ANSIBLE_VERSION: ""
ANSIBLE_LINT_VERSION: ""

steps:
- name: Check out the codebase.
Expand Down
2 changes: 1 addition & 1 deletion meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ galaxy_info:
company: pro!vision
issue_tracker_url: https://wcm-io.atlassian.net
license: Apache
min_ansible_version: 2.7
min_ansible_version: "2.7"

platforms:
- name: Ubuntu
Expand Down
9 changes: 8 additions & 1 deletion tasks/setup_Debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,17 @@

- block:

- name: Install libssl dependency.
- name: Install libssl dependency via package manager.
package:
name: "libssl{{ aem_dispatcher_libssl_version }}"
state: present
when: aem_dispatcher_libssl_deb_package is not defined

- name: Install libssl dependency via deb package.
apt:
deb: "{{ aem_dispatcher_libssl_deb_package }}"
state: present
when: aem_dispatcher_libssl_deb_package is defined

- name: Create compatibility links.
file:
Expand Down
3 changes: 3 additions & 0 deletions tests/requirements.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
---
- name: wcm_io_devops.apache
src: https://github.com/wcm-io-devops/ansible-role-apache.git
version: master
scm: git
3 changes: 3 additions & 0 deletions vars/distribution_Ubuntu-22.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
aem_dispatcher_libssl_path: /lib/x86_64-linux-gnu
aem_dispatcher_libssl_deb_package: http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.0g-2ubuntu4_amd64.deb

Check warning on line 3 in vars/distribution_Ubuntu-22.yml

View workflow job for this annotation

GitHub Actions / Lint (min_ansible_version)

3:121 [line-length] line too long (123 > 120 characters)
Loading