diff --git a/defaults/main.yml b/defaults/main.yml index 052d5ff..06ce324 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,6 +1,6 @@ --- # defaults file for radicale +radicale_user: radicale radicale_root_path: /srv/radicale - radicale_auth_type: "" diff --git a/meta/main.yml b/meta/main.yml index 3c57916..a2b6c1f 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -12,12 +12,4 @@ galaxy_info: versions: - all -dependencies: - - role: users - vars: - users_role_radicale: - - name: radicale - comment: "Dedicated user for radicale" - update_password: on_create - password_lock: true - shell: /sbin/nologin +dependencies: [] diff --git a/tasks/main.yml b/tasks/main.yml index 497a41c..946ed83 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -2,24 +2,33 @@ # tasks file for radicale - name: Installer les prérequis - ansible.builtin.package: - name: python3-pip + ansible.builtin.apt: state: latest + name: pipx become: true -- name: Installer le paquet via pip - ansible.builtin.pip: - name: radicale +- name: Installer le paquet + community.general.pipx: state: latest + name: radicale + install_deps: true + include_injected: true + become: true + environment: + PIPX_HOME: /opt/pipx + PIPX_BIN_DIR: /usr/local/bin + +- name: S'assurer que les exécutables sont inclus dans le path + ansible.builtin.command: + cmd: pipx ensurepath become: true - notify: Redémarrer radicale.service - name: Créer l'emplacement de stockage ansible.builtin.file: path: "{{ radicale_root_path }}" state: directory - owner: radicale - group: radicale + owner: "{{ radicale_user }}" + group: "{{ radicale_user }}" mode: u=rwX,g=rX,o= become: true @@ -36,7 +45,7 @@ - name: Déployer la configuration ansible.builtin.template: owner: root - group: radicale + group: "{{ radicale_user }}" mode: u=rw,g=r,o= src: radicale.conf.j2 dest: "{{ radicale_root_path }}/radicale.conf" diff --git a/templates/radicale.service.j2 b/templates/radicale.service.j2 index 18810de..5db9e15 100644 --- a/templates/radicale.service.j2 +++ b/templates/radicale.service.j2 @@ -7,7 +7,7 @@ Requires=network.target [Service] Environment="RADICALE_CONFIG={{ radicale_root_path }}/radicale.conf" -ExecStart=/usr/bin/env python3 -m radicale +ExecStart=/usr/local/bin/radicale Restart=on-failure User=radicale # Deny other users access to the calendar data