From 575b45b726ec0f5ec65a5c4501a616e19c0c2519 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Mon, 13 Apr 2015 10:28:34 +0000
Subject: [PATCH] new aurrepo

---
 roles/{container => aurrepo}/files/mirrorlist |  0
 .../{container => aurrepo}/files/pacman.conf  |  1 -
 roles/aurrepo/files/repo-gpg.asc              | 30 +++++++++++++++++++
 roles/aurrepo/tasks/main.yml                  | 13 ++++++++
 roles/container/tasks/main.yml                |  5 ----
 site.yml                                      |  8 +++--
 6 files changed, 49 insertions(+), 8 deletions(-)
 rename roles/{container => aurrepo}/files/mirrorlist (100%)
 rename roles/{container => aurrepo}/files/pacman.conf (98%)
 create mode 100644 roles/aurrepo/files/repo-gpg.asc
 create mode 100644 roles/aurrepo/tasks/main.yml

diff --git a/roles/container/files/mirrorlist b/roles/aurrepo/files/mirrorlist
similarity index 100%
rename from roles/container/files/mirrorlist
rename to roles/aurrepo/files/mirrorlist
diff --git a/roles/container/files/pacman.conf b/roles/aurrepo/files/pacman.conf
similarity index 98%
rename from roles/container/files/pacman.conf
rename to roles/aurrepo/files/pacman.conf
index 84b8170..d59d8ec 100644
--- a/roles/container/files/pacman.conf
+++ b/roles/aurrepo/files/pacman.conf
@@ -98,5 +98,4 @@ Include = /etc/pacman.d/mirrorlist
 # tips on creating your own repositories.
 
 [repo]
-SigLevel = Optional TrustAll
 Server = file:///srv/repo
diff --git a/roles/aurrepo/files/repo-gpg.asc b/roles/aurrepo/files/repo-gpg.asc
new file mode 100644
index 0000000..0c80c23
--- /dev/null
+++ b/roles/aurrepo/files/repo-gpg.asc
@@ -0,0 +1,30 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2
+
+mQENBFUm0GYBCAC3AEg4E4FLDExtc/If9Cf4zyaxeg1XgFoaJZltz8SKdBzh27O7
+067zsWOSIy7uAAswEdwjCnYkKNLMSup/Qn5f1As2eWYhagkUjkGim/cT42aGxlw5
+0JjyzSvlG9D2BeysQT6DXnhrSlCesJkvz1UA5fxjs996Bj5ib5o3ijr8+JlNwg3n
+4DmB+lLXBWD01OuKCBPaTu8bjBhGRUD95WjGfmnTztdOmGeCodnw6C+3N3JrWFer
+Ujt81xEZLVLBi7bEsZg/BwN3gbQ6Sze1nSpZzeoAHw7vbMk3bjrHTii7MKsjuCP4
+ZqU2YrC3/4+/D8r6mG0l2NqL5lg6WhiL+FmrABEBAAG0G0FkbWluIDxhZG1pbkBo
+aWdnc2Jvc29uLnRrPokBNwQTAQgAIQUCVSbQZgIbAwULCQgHAgYVCAkKCwIEFgID
+AQIeAQIXgAAKCRBxykNnzu+mYZq7B/sFTvfgg9mRbA5JJtVBn5g51VGoVUSRGw+x
+s83Rwnx5aQMUd9SAYosWqKPyVuA25TP+JziSa65oZ3RBhKtRzS6tpabFhH3x/okd
+D17pIAEdHWe7Nh9Mj1kICcPsiIm5SO62GtxWNeXGhDNGhxXZO618ekz0um95hKgh
+EAgZ8AU12OGfEJlG1KDgcNvI4BjQylM36l8qP0uiipUGnwTIr4bGun5Eix5vIdZl
+2c94DOmCc/2TIZ5Ihg2eIRnqHQDBEqGKJ+8ZhoDtOOU/bIEK+lBtKcR0Ui7aTpBR
+AB2OEe5eM2owwtFVFib85PSxBSziVXVKuwPOJ9LrjNneDOXCadCSuQENBFUm0GYB
+CADUU1JEIkVoWzJcNOmsaaY3Tsu5ZhMVivLvS/ZfzqW7Jxe/mXTI/r1+Pa3iu5BA
+Zpxt7XX2niXT+OrNXpm7alsU7uw99nCPHhN39Z4JjQZGXYfE5418brJz+LAMM+Oa
+unI93NCWn2caf2XRTNg+xJh3q1niOSCyjrqAcUh/nIKePn8xQRB27rS8ABNOg65R
+aCB3VbUbMkCDS3Tz/FS1yUIOXI9vD4P/svpA8O01owtAUVQjDhoWiTwe2XmgvD6U
+4mmuo9+bimA3biVb8AlIdaPPdbaDfpl+3cItRgLROGKXiijTdmD4mfFcl9AOdtAa
+az+Ku9k0Slur9WspK/HdFk7ZABEBAAGJAR8EGAEIAAkFAlUm0GYCGwwACgkQccpD
+Z87vpmFhjQgAqhv6Azrl0bwboCUf0mX48LJQQX/gHNE99LLWXgT5dBPX5Z5yKqiv
+o+7WJFtNh/nkoO9A27VHP0jGs8uRGY8KpoVwxy7EY7vMgZBU/C9PTCLci7x7OCFC
+LabnL1f76DAbfnKIb31W4KT+HX6qc9Re05Xm+C5sniTTUUrX514pkMffqquUI1I0
+4YLdDHa5JvJkMMUc5ClUUO7gs+EfYaZW4k20IoiXZoHomVi34RRDKaLzUjrcCym6
+2lhm96HfyNMFrnP85qs8CVigrF6ny98wDEDmU0CCsSnPjQF9k/fFvZoLINIc67zf
+tC6Vkxucb9Z7yekiOR9GnOsPUXTm3kZm9w==
+=U5sQ
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/roles/aurrepo/tasks/main.yml b/roles/aurrepo/tasks/main.yml
new file mode 100644
index 0000000..fcc5adc
--- /dev/null
+++ b/roles/aurrepo/tasks/main.yml
@@ -0,0 +1,13 @@
+- name: Write pacman.conf
+  copy: src=pacman.conf dest=/etc/pacman.conf
+- 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/container/tasks/main.yml b/roles/container/tasks/main.yml
index 41fc60b..869088c 100644
--- a/roles/container/tasks/main.yml
+++ b/roles/container/tasks/main.yml
@@ -1,8 +1,3 @@
-- name: Write pacman.conf
-  copy: src=pacman.conf dest=/etc/pacman.conf mode=0644
-- name: Write mirrorlist
-  copy: src=mirrorlist dest=/etc/pacman.d/mirrorlist mode=0644
-
 - name: Mask services
   file: src=/dev/null dest=/etc/systemd/system/{{ item }} state=link
   with_items: masked_services
diff --git a/site.yml b/site.yml
index 0fd5636..fa7763a 100644
--- a/site.yml
+++ b/site.yml
@@ -1,11 +1,15 @@
 ---
-- hosts: all
+- hosts: localhost
   roles:
   - common
 - hosts: php
   roles:
-  - php
+  - aurrepo
+  - common
   - container
+  - php
 - hosts: container
   roles:
+  - aurrepo
+  - common
   - container