From 612954e5864b17eefd7de54bf4c51ec22e5645c4 Mon Sep 17 00:00:00 2001
From: Nate Riffe <inkblot@movealong.org>
Date: Tue, 11 Oct 2016 07:45:37 -0500
Subject: [PATCH] Update for puppet 4

---
 Modulefile      | 11 -----------
 data/hiera.yaml |  6 ------
 hiera.yaml      | 11 +++++++++++
 metadata.json   | 25 +++++++++++++++++++++++++
 4 files changed, 36 insertions(+), 17 deletions(-)
 delete mode 100644 Modulefile
 delete mode 100644 data/hiera.yaml
 create mode 100644 hiera.yaml
 create mode 100644 metadata.json

diff --git a/Modulefile b/Modulefile
deleted file mode 100644
index df6bfb9..0000000
--- a/Modulefile
+++ /dev/null
@@ -1,11 +0,0 @@
-name    'inkblot/tor'
-version '2.0.0'
-source  'git://githubcom/inkblot/puppet-tor'
-author  'inkblot'
-license 'Apache 2.0'
-summary 'Tor onion router'
-description 'A Puppet module to deploy and manage Tor nodes'
-project_page 'https://github.com/inkblot/puppet-tor'
-
-dependency 'puppetlabs/concat', '>= 1.0.0'
-dependency 'ripienaar/module_data', '>= 0.0.3'
diff --git a/data/hiera.yaml b/data/hiera.yaml
deleted file mode 100644
index c59473f..0000000
--- a/data/hiera.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-# ex: si ts=2 sw=2 et
-:hierarchy:
-  - osfamily/%{::osfamily}/%{::operatingsystem}/%{lsbdistrelease}
-  - osfamily/%{::osfamily}/%{::operatingsystem}
-  - osfamily/%{::osfamily}
-  - common
diff --git a/hiera.yaml b/hiera.yaml
new file mode 100644
index 0000000..6176f46
--- /dev/null
+++ b/hiera.yaml
@@ -0,0 +1,11 @@
+---
+version: 4
+datadir: data
+hierarchy:
+  - name: "Platform"
+    backend: yaml
+    paths:
+      - "osfamily/%{facts.os.family}/%{facts.os.name}/%{facts.os.distro.codename}"
+      - "osfamily/%{facts.os.family}/%{facts.os.name}"
+      - "osfamily/%{facts.os.family}"
+      - "common"
diff --git a/metadata.json b/metadata.json
new file mode 100644
index 0000000..21865d0
--- /dev/null
+++ b/metadata.json
@@ -0,0 +1,25 @@
+{
+  "name": "inkblot/tor",
+  "version": "3.0.0",
+  "author": "inkblot",
+  "license": "Apache-2.0",
+  "summary": "Tor onion router",
+  "source": "git://github.com/inkblot/puppet-tor.git",
+  "project_page": "https://github.com/inkblot/puppet-tor",
+  "issues_url": "https://github.com/inkblot/puppet-tor/issues",
+  "tags": [ "tor", "ubuntu", "debian" ],
+  "operatingsystem_support": [
+    {
+      "operatingsystem": "Debian",
+      "operatingsystemrelease": [ "7.7" ]
+    },
+    {
+      "operatingsystem": "Ubuntu",
+      "operatingsystemrelease": [ "12.04", "14.04", "16.04" ]
+    }
+  ],
+  "dependencies": [
+    { "name": "puppetlabs/concat", "version_requirement": ">=1.0.0 <2.0.0" }
+  ],
+  "data_provider": "hiera"
+}