From 1070603a9c84c68651a6941e699349268b3489b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 3 Oct 2015 22:27:22 +0000 Subject: [PATCH] option to add aurrepo optionally --- roles/aurrepo/defaults/main.yml | 1 + roles/aurrepo/tasks/main.yml | 5 +---- .../aurrepo/{files/pacman.conf => templates/pacman.conf.j2} | 4 +++- 3 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 roles/aurrepo/defaults/main.yml rename roles/aurrepo/{files/pacman.conf => templates/pacman.conf.j2} (95%) diff --git a/roles/aurrepo/defaults/main.yml b/roles/aurrepo/defaults/main.yml new file mode 100644 index 0000000..4df0fa1 --- /dev/null +++ b/roles/aurrepo/defaults/main.yml @@ -0,0 +1 @@ +add_repo_in_pacman_conf: true diff --git a/roles/aurrepo/tasks/main.yml b/roles/aurrepo/tasks/main.yml index fcc5adc..5746079 100644 --- a/roles/aurrepo/tasks/main.yml +++ b/roles/aurrepo/tasks/main.yml @@ -1,13 +1,10 @@ - name: Write pacman.conf - copy: src=pacman.conf dest=/etc/pacman.conf + template: src=pacman.conf.j2 dest=/etc/pacman.conf mode=0644 - name: Write mirrorlist copy: src=mirrorlist dest=/etc/pacman.d/mirrorlist - name: Copy Custom Repo GPG key copy: src=repo-gpg.asc dest=/etc/pacman.d/repo-gpg.asc - register: repo_gpg - name: Import repo gpg key action: command /usr/bin/pacman-key --add /etc/pacman.d/repo-gpg.asc - when: repo_gpg.changed - name: Sign repo gpg key action: command /usr/bin/pacman-key --lsign CEEFA661 - when: repo_gpg.changed diff --git a/roles/aurrepo/files/pacman.conf b/roles/aurrepo/templates/pacman.conf.j2 similarity index 95% rename from roles/aurrepo/files/pacman.conf rename to roles/aurrepo/templates/pacman.conf.j2 index d59d8ec..16ba5d3 100644 --- a/roles/aurrepo/files/pacman.conf +++ b/roles/aurrepo/templates/pacman.conf.j2 @@ -24,7 +24,7 @@ CleanMethod = KeepCurrent Architecture = auto # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup -#IgnorePkg = +IgnorePkg = linux-lts linux-lts-headers spl-lts spl-utils-lts zfs-lts zfs-utils-lts #IgnoreGroup = #NoUpgrade = @@ -97,5 +97,7 @@ Include = /etc/pacman.d/mirrorlist # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. +{% if add_repo_in_pacman_conf %} [repo] Server = file:///srv/repo +{% endif %}