Skip to content

Commit

Permalink
Merge pull request #79 from voxpupuli/modulesync
Browse files Browse the repository at this point in the history
modulesync 5.5.0
  • Loading branch information
bastelfreak committed Apr 17, 2023
2 parents 55ec0fc + fcb3e3c commit e1bab5a
Show file tree
Hide file tree
Showing 7 changed files with 76 additions and 108 deletions.
3 changes: 0 additions & 3 deletions .github/SECURITY.md

This file was deleted.

36 changes: 18 additions & 18 deletions .gitignore
@@ -1,23 +1,23 @@
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

pkg/
Gemfile.lock
Gemfile.local
vendor/
.vendor/
spec/fixtures/manifests/
spec/fixtures/modules/
.vagrant/
.bundle/
.ruby-version
coverage/
log/
.idea/
.dependencies/
.librarian/
Puppetfile.lock
/pkg/
/Gemfile.lock
/Gemfile.local
/vendor/
/.vendor/
/spec/fixtures/manifests/
/spec/fixtures/modules/
/.vagrant/
/.bundle/
/.ruby-version
/coverage/
/log/
/.idea/
/.dependencies/
/.librarian/
/Puppetfile.lock
*.iml
.*.sw?
.yardoc/
Guardfile
/.yardoc/
/Guardfile
2 changes: 1 addition & 1 deletion .msync.yml
Expand Up @@ -2,4 +2,4 @@
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

modulesync_config_version: '5.4.0'
modulesync_config_version: '5.5.0'
64 changes: 32 additions & 32 deletions .pmtignore
@@ -1,37 +1,37 @@
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

docs/
pkg/
Gemfile
Gemfile.lock
Gemfile.local
vendor/
.vendor/
spec/
Rakefile
.vagrant/
.bundle/
.ruby-version
coverage/
log/
.idea/
.dependencies/
.github/
.librarian/
Puppetfile.lock
/docs/
/pkg/
/Gemfile
/Gemfile.lock
/Gemfile.local
/vendor/
/.vendor/
/spec/
/Rakefile
/.vagrant/
/.bundle/
/.ruby-version
/coverage/
/log/
/.idea/
/.dependencies/
/.github/
/.librarian/
/Puppetfile.lock
*.iml
.editorconfig
.fixtures.yml
.gitignore
.msync.yml
.overcommit.yml
.pmtignore
.rspec
.rspec_parallel
.rubocop.yml
.sync.yml
/.editorconfig
/.fixtures.yml
/.gitignore
/.msync.yml
/.overcommit.yml
/.pmtignore
/.rspec
/.rspec_parallel
/.rubocop.yml
/.sync.yml
.*.sw?
.yardoc/
.yardopts
Dockerfile
/.yardoc/
/.yardopts
/Dockerfile
3 changes: 1 addition & 2 deletions Gemfile
Expand Up @@ -21,8 +21,7 @@ end

group :release do
gem 'github_changelog_generator', '>= 1.16.1', :require => false if RUBY_VERSION >= '2.5'
gem 'voxpupuli-release', '>= 1.2.0', :require => false
gem 'puppet-strings', '>= 2.2', :require => false
gem 'voxpupuli-release', '~> 2.0', :require => false
end

gem 'rake', :require => false
Expand Down
40 changes: 20 additions & 20 deletions REFERENCE.md
Expand Up @@ -44,67 +44,67 @@ ssh_keygen { 'root':

The following parameters are available in the `ssh_keygen` defined type:

* [`user`](#user)
* [`type`](#type)
* [`bits`](#bits)
* [`home`](#home)
* [`filename`](#filename)
* [`comment`](#comment)
* [`options`](#options)
* [`user`](#-ssh_keygen--user)
* [`type`](#-ssh_keygen--type)
* [`bits`](#-ssh_keygen--bits)
* [`home`](#-ssh_keygen--home)
* [`filename`](#-ssh_keygen--filename)
* [`comment`](#-ssh_keygen--comment)
* [`options`](#-ssh_keygen--options)

##### <a name="user"></a>`user`
##### <a name="-ssh_keygen--user"></a>`user`

Data type: `Optional[String]`

Username to create key for

Default value: ``undef``
Default value: `undef`

##### <a name="type"></a>`type`
##### <a name="-ssh_keygen--type"></a>`type`

Data type: `Enum['rsa', 'dsa', 'ecdsa', 'ed25519', 'rsa1']`

Type of key to create

Default value: `'rsa'`

##### <a name="bits"></a>`bits`
##### <a name="-ssh_keygen--bits"></a>`bits`

Data type: `Optional[Integer]`

Number of bits in key

Default value: ``undef``
Default value: `undef`

##### <a name="home"></a>`home`
##### <a name="-ssh_keygen--home"></a>`home`

Data type: `Optional[Stdlib::Absolutepath]`

Home directory for user

Default value: ``undef``
Default value: `undef`

##### <a name="filename"></a>`filename`
##### <a name="-ssh_keygen--filename"></a>`filename`

Data type: `Optional[Stdlib::Absolutepath]`

Key filename

Default value: ``undef``
Default value: `undef`

##### <a name="comment"></a>`comment`
##### <a name="-ssh_keygen--comment"></a>`comment`

Data type: `Optional[String]`

Key comment

Default value: ``undef``
Default value: `undef`

##### <a name="options"></a>`options`
##### <a name="-ssh_keygen--options"></a>`options`

Data type: `Optional[Array[String]]`

Additional options to pass on to ssh-keygen

Default value: ``undef``
Default value: `undef`

36 changes: 4 additions & 32 deletions Rakefile
Expand Up @@ -24,6 +24,10 @@ end
begin
require 'voxpupuli/release/rake_tasks'
rescue LoadError
# voxpupuli-release not present
else
GCGConfig.user = 'voxpupuli'
GCGConfig.project = 'puppet-ssh_keygen'
end

desc "Run main 'test' task and report merged results to coveralls"
Expand All @@ -37,36 +41,4 @@ task test_with_coveralls: [:test] do
end
end

desc 'Generate REFERENCE.md'
task :reference, [:debug, :backtrace] do |t, args|
patterns = ''
Rake::Task['strings:generate:reference'].invoke(patterns, args[:debug], args[:backtrace])
end

begin
require 'github_changelog_generator/task'
require 'puppet_blacksmith'
GitHubChangelogGenerator::RakeTask.new :changelog do |config|
metadata = Blacksmith::Modulefile.new
config.future_release = "v#{metadata.version}" if metadata.version =~ /^\d+\.\d+.\d+$/
config.header = "# Changelog\n\nAll notable changes to this project will be documented in this file.\nEach new release typically also includes the latest modulesync defaults.\nThese should not affect the functionality of the module."
config.exclude_labels = %w{duplicate question invalid wontfix wont-fix modulesync skip-changelog}
config.user = 'voxpupuli'
config.project = 'puppet-ssh_keygen'
end

# Workaround for https://github.com/github-changelog-generator/github-changelog-generator/issues/715
require 'rbconfig'
if RbConfig::CONFIG['host_os'] =~ /linux/
task :changelog do
puts 'Fixing line endings...'
changelog_file = File.join(__dir__, 'CHANGELOG.md')
changelog_txt = File.read(changelog_file)
new_contents = changelog_txt.gsub(%r{\r\n}, "\n")
File.open(changelog_file, "w") {|file| file.puts new_contents }
end
end

rescue LoadError
end
# vim: syntax=ruby

0 comments on commit e1bab5a

Please sign in to comment.