From 2338f51cbfcb6eb497b2f24105752ca3b07656da Mon Sep 17 00:00:00 2001 From: L3D Date: Wed, 11 Mar 2020 10:07:41 +0100 Subject: [PATCH] Update installation method and packages [debian] --- defaults/main.yml | 3 +++ tasks/install-archlinux.yml | 6 ++++++ tasks/install-debian.yml | 19 ++++++++++++++++--- vars/main.yml | 5 ++--- 4 files changed, 27 insertions(+), 6 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 2e7884a..a9703fc 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -10,6 +10,9 @@ weechat: home_directory: "/home/{{ weechat_user }}/.weechat" # plugins we want plugins: [] + # weechat gpg key for debian/ubuntu repo + gpg_id: '11E9DE8848F2B65222AA75B8D1820DB22A11534E' + # version check for this role? (true is recomended) submodules_versioncheck: false diff --git a/tasks/install-archlinux.yml b/tasks/install-archlinux.yml index bd24b77..65a97c1 100644 --- a/tasks/install-archlinux.yml +++ b/tasks/install-archlinux.yml @@ -3,4 +3,10 @@ package: name: - weechat + - weechat-plugins + - weechat-python + - weechat-perl + - weechat-lua + - weechaz-ruby + - weechat-doc state: present diff --git a/tasks/install-debian.yml b/tasks/install-debian.yml index bfd3149..7be5ced 100644 --- a/tasks/install-debian.yml +++ b/tasks/install-debian.yml @@ -2,8 +2,8 @@ - name: Add weechat repository gpg-key become: true apt_key: - keyserver: 'ha.pool.sks-keyservers.net' - id: '11E9DE8848F2B65222AA75B8D1820DB22A11534E' + keyserver: 'keys.openpgp.org' + id: "{{ weechat.gpg_id }}" state: present - name: add weechat repo @@ -13,10 +13,23 @@ state: present update_cache: yes -- name: install weechat and plugins +- name: add weechat repo-src + become: true + apt_repository: + repo: "deb-src https://weechat.org/{{ ansible_distribution|lower }} {{ ansible_distribution_release }} main" + state: present + update_cache: yes + + +- name: install recomended weechat packages become: true apt: name: - weechat-curses - weechat-plugins + - weechat-python + - weechat-perl + - weechat-lua + - weechaz-ruby + - weechat-doc state: present diff --git a/vars/main.yml b/vars/main.yml index c7970e3..b301a2c 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -9,7 +9,7 @@ weechat_plugin_languages: lua: lua # version management -playbook_version_number: 2049 # should be over ninethousand +playbook_version_number: 2050 # should be over ninethousand playbook_version_path: 'role-weechat_roles-ansible_github.com.version' # default values @@ -19,5 +19,4 @@ _weechat: user: "{{ ansible_user_id }}" home_directory: "/home/{{ weechat_user }}/.weechat" plugins: [] - - + gpg_id: '11E9DE8848F2B65222AA75B8D1820DB22A11534E'