Skip to content

Commit

Permalink
Merge pull request #73 from systemli/enh/debian12
Browse files Browse the repository at this point in the history
Add debian12 support, remove debian10
  • Loading branch information
doobry-systemli authored Aug 4, 2023
2 parents 1f7c727 + 11a4580 commit 854bbb3
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ jobs:
uses: systemli/github-ansible-workflow/.github/workflows/ansible-integration-workflow.yaml@v1.2.0
with:
disable-apparmor-mysql: true
distros: '[ "debian11" ]'
distros: '[ "debian12", "debian11" ]'
7 changes: 4 additions & 3 deletions defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
# Nextcloud version to install. Raise for upgrading.
nextcloud_version: "25.0.8"
#nextcloud_version: "26.0.4"
nextcloud_version: "{% if ansible_distribution_major_version | int == 11 %}25.0.9{% else %}26.0.4{% endif %}"
# Upgrade via Ansible? Set to `False` if upgrades are handled manually.
# Make sure to set `nextcloud_instance` to something without `nextcloud_version`.
nextcloud_upgrade: True
Expand Down Expand Up @@ -65,7 +66,7 @@ nextcloud_config:
# Configure the Apache2 php.ini automatically?
nextcloud_apache_php: yes

nextcloud_php_version: "{% if ansible_distribution_major_version | int == 10 %}7.3{% else %}7.4{% endif %}"
nextcloud_php_version: "{% if ansible_distribution_major_version | int == 11 %}7.4{% else %}8.2{% endif %}"

# Set custom PHP file size limits
nextcloud_php_settings:
Expand Down Expand Up @@ -127,7 +128,7 @@ nextcloud_dependencies_general:
- acl # for ansible temp files
- "{{ 'git' if nextcloud_src_type == 'git' else 'bzip2' }}"
- "{{ 'gpgv' if nextcloud_src_type == 'tar' }}"
- "{{ 'libmagickcore-6.q16-6-extra' if ansible_distribution_major_version | int == 10 else 'libmagickcore-6.q16-3-extra' }}"
- libmagickcore-6.q16-6-extra
- php-pear
nextcloud_dependencies_php_post_jessie:
- php-apcu
Expand Down
1 change: 1 addition & 0 deletions meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ galaxy_info:
platforms:
- name: Debian
versions:
- bookworm
- bullseye

dependencies: []
8 changes: 6 additions & 2 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@ driver:
provider:
name: virtualbox
platforms:
- name: nextcloud-bullseye64
box: debian/bullseye64
- name: nextcloud-bookworm64
box: debian/bookworm64
provisioner:
name: ansible
ansible_args:
- --diff
lint: |
set -e
yamllint .
Expand Down

0 comments on commit 854bbb3

Please sign in to comment.