aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormihaibuzgau <mihai.buzgau@puppet.com>2019-10-31 14:27:14 +0200
committermihaibuzgau <mihai.buzgau@puppet.com>2019-10-31 18:01:09 +0200
commit7a17d41aa6b91d5c46434a7e4130f68dd2d75861 (patch)
tree36077f54ed9252bf77582308f5aa5f594263f9e2
parent1c5c00618a998d1c23fc7e138e8862e89fc51819 (diff)
downloadpuppet-sshkeys_core-7a17d41aa6b91d5c46434a7e4130f68dd2d75861.tar.gz
puppet-sshkeys_core-7a17d41aa6b91d5c46434a7e4130f68dd2d75861.tar.bz2
Prep for release
-rw-r--r--.sync.yml1
-rw-r--r--CHANGELOG.md64
-rw-r--r--Rakefile2
-rw-r--r--data/common.yaml1
-rw-r--r--hiera.yaml21
-rw-r--r--metadata.json6
6 files changed, 68 insertions, 27 deletions
diff --git a/.sync.yml b/.sync.yml
index 6c7d513..7d5b1a6 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -30,6 +30,7 @@ Gemfile:
- gem: puppet-strings
Rakefile:
+ changelog_version_tag_pattern: '%s'
requires:
- puppet-lint/tasks/puppet-lint
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3de3ec6..16e6893 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,29 +1,47 @@
-# Changelog
+# Change log
-All notable changes to this project will be documented in this file.
+All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
-The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
+## [1.0.3](https://github.com/puppetlabs/puppetlabs-sshkeys_core/tree/1.0.3) (2019-10-31)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-sshkeys_core/compare/1.0.2...1.0.3)
+
+### Added
+
+- \(MODULES-9578\) Create ssh\_authorized\_key in root path [\#20](https://github.com/puppetlabs/puppetlabs-sshkeys_core/pull/20) ([GabrielNagy](https://github.com/GabrielNagy))
+
+## [1.0.2](https://github.com/puppetlabs/puppetlabs-sshkeys_core/tree/1.0.2) (2019-01-11)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-sshkeys_core/compare/1.0.1...1.0.2)
+
+### Added
+
+- \(maint\) add LICENSE file [\#16](https://github.com/puppetlabs/puppetlabs-sshkeys_core/pull/16) ([melissa](https://github.com/melissa))
+- \(L10n\) Update Japanese translations [\#13](https://github.com/puppetlabs/puppetlabs-sshkeys_core/pull/13) ([melissa](https://github.com/melissa))
+
+### Fixed
+
+- ssh\_authorized\_key: Fix invalid 'options' error [\#10](https://github.com/puppetlabs/puppetlabs-sshkeys_core/pull/10) ([natemccurdy](https://github.com/natemccurdy))
+
+## [1.0.1](https://github.com/puppetlabs/puppetlabs-sshkeys_core/tree/1.0.1) (2018-08-17)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-sshkeys_core/compare/1.0.0...1.0.1)
-## [1.0.2] - 2019-01-11
### Added
-- Added LICENSE file
-- Added Japanese translations
-## Changed
-- Fixed invalid 'options' error
-## [1.0.1] - 2018-08-17
+- \(PUP-9053\) Enable localization and bump puppet version to at least 6 [\#7](https://github.com/puppetlabs/puppetlabs-sshkeys_core/pull/7) ([melissa](https://github.com/melissa))
+- \(maint\) Import missed User type integration test from puppet repo [\#6](https://github.com/puppetlabs/puppetlabs-sshkeys_core/pull/6) ([jhelwig](https://github.com/jhelwig))
+- \(maint\) Import the User type unit tests specific to ssh\_authorized\_keys [\#5](https://github.com/puppetlabs/puppetlabs-sshkeys_core/pull/5) ([jhelwig](https://github.com/jhelwig))
+- Install module on all hosts, not just those with default role [\#4](https://github.com/puppetlabs/puppetlabs-sshkeys_core/pull/4) ([joshcooper](https://github.com/joshcooper))
+
+## [1.0.0](https://github.com/puppetlabs/puppetlabs-sshkeys_core/tree/1.0.0) (2018-07-17)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-sshkeys_core/compare/d1719de1d77b9c139b1b5f5832330807c0fe11fe...1.0.0)
+
### Added
-- (PUP-9053) Enable localization
-- (maint) Import missed User type integration test from puppet repo
-- (maint) Import the User type unit tests specific to ssh_authorized_keys
-### Changed
-- (PUP-9052) Bump puppet req to at least puppet 6
-- Install module on all hosts, not just those with default role
-
-## [1.0.0] - 2018-07-17
-### Summary
-This is the initial release of the extracted sshkeys module.
-
-[1.0.2]: https://github.com/puppetlabs/puppetlabs-sshkeys_core/compare/1.0.1...1.0.2
-[1.0.1]: https://github.com/puppetlabs/puppetlabs-sshkeys_core/compare/1.0.0...1.0.1
-[1.0.0]: https://github.com/puppetlabs/puppetlabs-sshkeys_core/releases/tag/1.0.0
+
+- Initial release of the extracted sshkeys module [\#1](https://github.com/puppetlabs/puppetlabs-sshkeys_core/pull/1) ([jhelwig](https://github.com/jhelwig))
+
+
+
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
diff --git a/Rakefile b/Rakefile
index 0aab55f..d9753ca 100644
--- a/Rakefile
+++ b/Rakefile
@@ -33,7 +33,7 @@ end
def changelog_future_release
return unless Rake.application.top_level_tasks.include? "changelog"
- returnVal = "v%s" % JSON.load(File.read('metadata.json'))['version']
+ returnVal = "%s" % JSON.load(File.read('metadata.json'))['version']
raise "unable to find the future_release (version) in metadata.json" if returnVal.nil?
puts "GitHubChangelogGenerator future_release:#{returnVal}"
returnVal
diff --git a/data/common.yaml b/data/common.yaml
new file mode 100644
index 0000000..ed97d53
--- /dev/null
+++ b/data/common.yaml
@@ -0,0 +1 @@
+---
diff --git a/hiera.yaml b/hiera.yaml
new file mode 100644
index 0000000..2251c23
--- /dev/null
+++ b/hiera.yaml
@@ -0,0 +1,21 @@
+---
+version: 5
+
+defaults: # Used for any hierarchy level that omits these keys.
+ datadir: data # This path is relative to hiera.yaml's directory.
+ data_hash: yaml_data # Use the built-in YAML backend.
+
+hierarchy:
+ - name: "osfamily/major release"
+ paths:
+ - "os/%{facts.os.family}/%{facts.os.release.major}.yaml"
+ # Used for Solaris
+ - "os/%{facts.os.family}/%{facts.kernelrelease}.yaml"
+ # Used to distinguish between Debian and Ubuntu
+ - "os/%{facts.os.name}/%{facts.os.release.major}.yaml"
+ - name: "osfamily"
+ paths:
+ - "os/%{facts.os.family}.yaml"
+ - "os/%{facts.os.name}.yaml"
+ - name: 'common'
+ path: 'common.yaml'
diff --git a/metadata.json b/metadata.json
index 68f3c79..6a656ed 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
{
"name": "puppetlabs-sshkeys_core",
- "version": "1.0.2",
+ "version": "1.0.3",
"author": "puppetlabs",
"summary": "Manage SSH authorized keys, and known hosts.",
"license": "Apache-2.0",
@@ -87,6 +87,6 @@
}
],
"pdk-version": "1.14.0",
- "template-url": "https://github.com/puppetlabs/pdk-templates.git#master",
- "template-ref": "heads/master-0-g6b5ed92"
+ "template-url": "https://github.com/puppetlabs/pdk-templates#1.14.0",
+ "template-ref": "1.14.0-0-g1bf3a4e"
}