diff --git a/.github/workflows/installer.yml b/.github/workflows/installer.yml index d90fec6..07a16fa 100644 --- a/.github/workflows/installer.yml +++ b/.github/workflows/installer.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.8, 3.9, '3.10', '3.11'] + python-version: [3.9, '3.10', '3.11', '3.12'] fail-fast: false steps: @@ -24,19 +24,20 @@ jobs: run: | pip install -r test-requirements.txt - name: Run tests - if: ${{ matrix.python-version != '3.11' }} + if: ${{ matrix.python-version != '3.12' }} run: | python tests.py - name: Run tests and coverage - if: ${{ matrix.python-version == '3.11' }} + if: ${{ matrix.python-version == '3.12' }} run: | coverage run tests.py - name: Upload coverage result - if: ${{ matrix.python-version == '3.11' }} + if: ${{ matrix.python-version == '3.12' }} uses: actions/upload-artifact@v4 with: name: coverage-results path: .coverage + include-hidden-files: true coverage: needs: test @@ -46,7 +47,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: '3.11' + python-version: '3.12' - name: Install dependencies run: | pip install codecov diff --git a/modoboa_installer/scripts/files/radicale/config.tpl b/modoboa_installer/scripts/files/radicale/config.tpl index f3c8a85..e0b420c 100644 --- a/modoboa_installer/scripts/files/radicale/config.tpl +++ b/modoboa_installer/scripts/files/radicale/config.tpl @@ -71,7 +71,7 @@ # Authentication method # Value: none | htpasswd | remote_user | http_x_remote_user -type = radicale_dovecot_auth +type = dovecot # Htpasswd filename # htpasswd_filename = users @@ -85,7 +85,7 @@ type = radicale_dovecot_auth # Incorrect authentication delay (seconds) #delay = 1 -auth_socket = %{auth_socket_path} +dovecot_socket = %{auth_socket_path} [rights] diff --git a/modoboa_installer/scripts/radicale.py b/modoboa_installer/scripts/radicale.py index 04d039e..4fe6ca2 100644 --- a/modoboa_installer/scripts/radicale.py +++ b/modoboa_installer/scripts/radicale.py @@ -33,7 +33,7 @@ class Radicale(base.Installer): """Prepare a dedicated virtualenv.""" python.setup_virtualenv(self.venv_path, sudo_user=self.user) packages = [ - "Radicale", "radicale-dovecot-auth", "pytz" + "Radicale", "pytz" ] python.install_packages(packages, self.venv_path, sudo_user=self.user) python.install_package_from_repository(