diff --git a/defaults/main.yml b/defaults/main.yml index ae4fee3..bb04b91 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -9,6 +9,7 @@ gitea_version_check: true gitea_gpg_key: '7C9E68152594688862D62AF62D9AE806EC1592E2' gitea_forgejo_gpg_key: 'EB114F5E6C0DC2BCDD183550A4B61A2DC5923710' gitea_gpg_server: 'hkps://keys.openpgp.org' +gitea_gpg_keyserver_option: '' gitea_backup_on_upgrade: false gitea_backup_location: "{{ gitea_home }}/backups/" submodules_versioncheck: false diff --git a/tasks/install_gitea.yml b/tasks/install_gitea.yml index 86823e4..4f88b8f 100644 --- a/tasks/install_gitea.yml +++ b/tasks/install_gitea.yml @@ -59,7 +59,7 @@ verbosity: 1 - name: Import gitea gpg key - ansible.builtin.command: "gpg --keyserver {{ gitea_gpg_server }} --recv {{ gitea_gpg_key }}" + ansible.builtin.command: "gpg --keyserver {{ gitea_gpg_server }} --keyserver-option '{{ gitea_gpg_keyserver_option }}' --recv {{ gitea_gpg_key }}" register: _gitea_import_key become: false changed_when: '"imported: 1" in _gitea_import_key.stderr' diff --git a/tasks/install_systemd.yml b/tasks/install_systemd.yml index 78173a9..1d0084a 100644 --- a/tasks/install_systemd.yml +++ b/tasks/install_systemd.yml @@ -1,6 +1,7 @@ --- - name: "Setup systemd service" become: true + when: ansible_os_family == "Debian" ansible.builtin.template: src: gitea.service.j2 dest: /lib/systemd/system/gitea.service @@ -11,6 +12,19 @@ - "Reload systemd" - "Restart gitea" +- name: "Setup systemd service" + become: true + when: ansible_os_family == "Suse" + ansible.builtin.template: + src: gitea.service.j2 + dest: /etc/systemd/system/gitea.service + owner: root + group: root + mode: 0644 + notify: + - "Reload systemd" + - "Restart gitea" + - name: "Reload systemd" become: true ansible.builtin.systemd: diff --git a/vars/suse.yml b/vars/suse.yml new file mode 100644 index 0000000..027026e --- /dev/null +++ b/vars/suse.yml @@ -0,0 +1,5 @@ +--- +gitea_dependencies: + - git + - gpg2 + - xz