From 7ce3190986cf8e5fe037a7ccd4c1076505b117f4 Mon Sep 17 00:00:00 2001
From: Micah <micah@leap.se>
Date: Tue, 12 Jul 2016 16:41:59 -0400
Subject: remove submodules in preparation for move to subrepos

Change-Id: Ia7655153b556337f676e3d909559c4a7306bedd6
---
 puppet/modules/apt | 1 -
 1 file changed, 1 deletion(-)
 delete mode 160000 puppet/modules/apt

(limited to 'puppet/modules/apt/manifests/key/plain.pp')

diff --git a/puppet/modules/apt b/puppet/modules/apt
deleted file mode 160000
index 33c61e8d..00000000
--- a/puppet/modules/apt
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 33c61e8df59db1abbed379a9e9790946060a8f1e
-- 
cgit v1.2.3


From 2e384e68fb867d8ba7178c4398e35653ab567538 Mon Sep 17 00:00:00 2001
From: Micah <micah@leap.se>
Date: Tue, 12 Jul 2016 16:45:30 -0400
Subject: git subrepo clone https://leap.se/git/puppet_apt puppet/modules/apt

subrepo:
  subdir:   "puppet/modules/apt"
  merged:   "33c61e8"
upstream:
  origin:   "https://leap.se/git/puppet_apt"
  branch:   "master"
  commit:   "33c61e8"
git-subrepo:
  version:  "0.3.0"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "1e79595"

Change-Id: I6515ec49bbacdffd9f3729d486d2868162f9ac78
---
 puppet/modules/apt/manifests/key/plain.pp | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 puppet/modules/apt/manifests/key/plain.pp

(limited to 'puppet/modules/apt/manifests/key/plain.pp')

diff --git a/puppet/modules/apt/manifests/key/plain.pp b/puppet/modules/apt/manifests/key/plain.pp
new file mode 100644
index 00000000..dff8b51b
--- /dev/null
+++ b/puppet/modules/apt/manifests/key/plain.pp
@@ -0,0 +1,13 @@
+define apt::key::plain ($source) {
+  file {
+    "${apt::apt_base_dir}/keys/${name}":
+      source  => $source;
+    "${apt::apt_base_dir}/keys":
+      ensure  => directory;
+  }
+  exec { "apt-key add '${apt::apt_base_dir}/keys/${name}'":
+    subscribe   => File["${apt::apt_base_dir}/keys/${name}"],
+    refreshonly => true,
+    notify      => Exec['apt_updated'],
+  }
+}
-- 
cgit v1.2.3