Skip to content
This repository has been archived by the owner on Sep 24, 2019. It is now read-only.

Commit

Permalink
(MODULES-4098) Sync the rest of the files
Browse files Browse the repository at this point in the history
  • Loading branch information
hunner committed Jan 19, 2017
1 parent 3877c5b commit 55f5ab1
Show file tree
Hide file tree
Showing 12 changed files with 212 additions and 7 deletions.
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,10 @@
/modulesync.yml
/.bundle/
/Gemfile.lock
/Gemfile.local
/.bundle/
/.idea/
/.metadata
*.iml
.*.sw[op]
.DS_Store
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ sudo: false
language: ruby
rvm: 2.3.1
cache: bundler
script: 'bundle exec msync update --noop --git-base=https://github.com/ -x "vsphere"'
# Run msync but in noop (Test Command). Also, do not update the sqlserver/vsphere modules (regex escaped for yaml)
script: 'bundle exec msync update --noop --git-base=https://github.com/ -x "\(sqlserver\|vsphere\)"'
notifications:
email: false
38 changes: 36 additions & 2 deletions config_defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@ Gemfile:
condition: "Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')"
- gem: fast_gettext
condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')"
# We don't want native extensions from rainbow
- gem: rainbow
version: '< 2.2.0'
':system_tests':
- gem: beaker
version: '>= 3'
Expand All @@ -123,11 +126,42 @@ Gemfile:
- gem: beaker-abs
from_env: 'BEAKER_ABS_VERSION'
version: '~> 0.1'
appveyor.yml:
appveyor_bundle_install: "bundle install --jobs 4 --retry 2 --without system_tests"
matrix:
- PUPPET_GEM_VERSION: '~> 4.0'
RUBY_VER: 21
- PUPPET_GEM_VERSION: '~> 4.0'
RUBY_VER: 21-x64
- PUPPET_GEM_VERSION: '~> 4.0'
RUBY_VER: 23
- PUPPET_GEM_VERSION: '~> 4.0'
RUBY_VER: 23-x64
# Oldest supported version
- PUPPET_GEM_VERSION: '4.2.3'
RUBY_VER: 21-x64
test_script:
- "bundle exec rake spec SPEC_OPTS='--format documentation'"

LICENSE:
license_type: 'apache2' # Available options 'puppetpe' and 'apache2' (default is apache2)

MAINTAINERS.md:
maintainers:
- "Puppet Forge Modules Team `forge-modules |at| puppet |dot| com`"

# Apache 2 NOTICE file generation. Please mark unmanaged:true if using puppetpe license type
NOTICE:
copyright_holders:
- name: 'Puppet, Inc.'
begin: 'latest'
# - name: '<name of holder>' (required)
# begin: <year or 'latest'> (optional) (latest is the year when modsync is run)
# end: <year or 'latest'> (optional) (latest is the year when modsync is run)

Rakefile:
default_disabled_lint_checks:
- 'relative'
- 'disable_documentation'
- 'disable_single_quote_string_with_variables'

spec/spec.opts:
delete: true
10 changes: 10 additions & 0 deletions managed_modules.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
---
- puppetlabs-accounts
- puppetlabs-acl
- puppetlabs-apache
- puppetlabs-apt
- puppetlabs-chocolatey
- puppetlabs-concat
- puppetlabs-dism
- puppetlabs-dsc
- puppetlabs-firewall
- puppetlabs-haproxy
- puppetlabs-hocon
- puppetlabs-ibm_installation_manager
- puppetlabs-iis
- puppetlabs-inifile
- puppetlabs-java
- puppetlabs-java_ks
Expand All @@ -15,11 +20,16 @@
- puppetlabs-mysql
- puppetlabs-ntp
- puppetlabs-postgresql
- puppetlabs-powershell
- puppetlabs-rabbitmq
- puppetlabs-reboot
- puppetlabs-registry
- puppetlabs-sqlserver
- puppetlabs-stdlib
- puppetlabs-tagmail
- puppetlabs-tftp
- puppetlabs-tomcat
- puppetlabs-vcsrepo
- puppetlabs-vsphere
- puppetlabs-wsus_client
- puppetlabs-xinetd
9 changes: 9 additions & 0 deletions moduleroot/.gitignore
Original file line number Diff line number Diff line change
@@ -1,18 +1,27 @@
#This file is generated by ModuleSync, do not edit.
pkg/
Gemfile.lock
Gemfile.local
vendor/
spec/fixtures/manifests/
spec/fixtures/modules/
log/
junit/
.vagrant/
.bundle/
coverage/
log/
.idea/
.metadata
*.iml
.*.sw[op]
.yardoc
.yardwarns
.DS_Store
tmp/
vendor/
doc/

<% if ! @configs['paths'].nil? -%>
<% @configs['paths'].each do |path| -%>
<%= path %>
Expand Down
23 changes: 23 additions & 0 deletions moduleroot/.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name><%= @configs[:puppet_module] %></name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>com.puppetlabs.geppetto.pp.dsl.ui.modulefileBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>com.puppetlabs.geppetto.pp.dsl.ui.puppetNature</nature>
<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
</natures>
</projectDescription>
3 changes: 1 addition & 2 deletions moduleroot/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Checklist (and a short version for the impatient)

- Make sure you have a [GitHub account](https://github.com/join)

- [Create a ticket](https://tickets.puppetlabs.com/secure/CreateIssue!default.jspa), or [watch the ticket](https://tickets.puppetlabs.com/browse/) you are patching for.
- [Create a ticket](https://tickets.puppet.com/secure/CreateIssue!default.jspa), or [watch the ticket](https://tickets.puppet.com/browse/) you are patching for.

* Preferred method:

Expand Down Expand Up @@ -215,4 +215,3 @@ Additional Resources
* [General GitHub documentation](http://help.github.com/)

* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)

25 changes: 25 additions & 0 deletions moduleroot/LICENSE
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
<%
# Determine the license types
lictype = 'apache2'
if @configs['license_type']
case @configs['license_type']
when 'puppetpe'
lictype = 'puppetpe'
end
end

# Default Apache 2 License
if lictype == 'apache2' -%>

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -200,3 +212,16 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
<%-
end

# Puppet PE Only License
if lictype == 'puppetpe' -%>
This Module is only available for users of Puppet Enterprise with a valid Software License Agreement
for Puppet Enterprise. This Module is not available for users of Puppet software under an open source license.

By downloading this Module, you agree that you have a valid Software License Agreement with Puppet for
Puppet Enterprise and you further agree that your use of this Module is governed by the terms of that
Software License Agreement.
<%
end -%>
10 changes: 10 additions & 0 deletions moduleroot/MAINTAINERS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
## Maintenance

<% if @configs['maintainers'] -%>
Maintainers:
<% @configs['maintainers'].each do |name| -%>
- <%= name %>
<% end -%>
<% end -%>

Tickets: https://tickets.puppet.com/browse/MODULES. Make sure to set component to `<%= @configs[:puppet_module].gsub('puppetlabs-','') -%>`.
28 changes: 28 additions & 0 deletions moduleroot/NOTICE
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
Puppet Module - <%= @configs[:puppet_module] %>

<% latest = Date.today.year -%>
<% @configs['copyright_holders'].each do |holder| -%>
<% begindate = ''
if holder['begin']
begindate = (holder['begin'] == 'latest' ? latest : holder['begin']).to_s
end
enddate = ''
if holder['end']
enddate = (holder['end'] == 'latest' ? latest : holder['end']).to_s
enddate = ' - ' + enddate unless begindate == ''
end
-%>
Copyright <%= begindate %><%= enddate %> <%= holder['name'] %>
<% end -%>

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
5 changes: 3 additions & 2 deletions moduleroot/Rakefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
require 'puppet_blacksmith/rake_tasks'
require 'puppet-lint/tasks/puppet-lint'
require 'puppetlabs_spec_helper/rake_tasks'
require 'puppet-lint/tasks/puppet-lint'
require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any?

PuppetLint.configuration.fail_on_warnings = true
<% checks = @configs['default_disabled_lint_checks'] + ( @configs['extra_disabled_lint_checks'] || [] ) -%>
<% checks.each do |check| -%>
PuppetLint.configuration.send('<%= check %>')
Expand Down
58 changes: 58 additions & 0 deletions moduleroot/appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<%
# Workaround to support boolean supports_windows and hash+array supported_oss
# settings until one form is no longer used
supports_windows = (
@configs['supports_windows'] == true \
|| (
@configs['supported_oss'].is_a?(Hash) \
&& @configs['supported_oss'][@configs[:puppet_module]].is_a?(Array) \
&& @configs['supported_oss'][@configs[:puppet_module]].include?('windows')
)
)
if supports_windows -%>
version: 1.1.x.{build}
skip_commits:
message: /^\(?doc\)?.*/
clone_depth: 10
init:
- SET
- 'mkdir C:\ProgramData\PuppetLabs\code && exit 0'
- 'mkdir C:\ProgramData\PuppetLabs\facter && exit 0'
- 'mkdir C:\ProgramData\PuppetLabs\hiera && exit 0'
- 'mkdir C:\ProgramData\PuppetLabs\puppet\var && exit 0'
environment:
matrix:
<% @configs['matrix'].each do |matrix| -%>
- PUPPET_GEM_VERSION: <%= matrix['PUPPET_GEM_VERSION'] %>
RUBY_VER: <%= matrix['RUBY_VER'] %>
<% end -%>
<% if @configs['matrix_extras'] -%>
<% @configs['matrix_extras'].each do |extra| -%>
- PUPPET_GEM_VERSION: <%= extra['PUPPET_GEM_VERSION'] %>
RUBY_VER: <%= extra['RUBY_VER'] %>
<% end -%>
<% end -%>
matrix:
fast_finish: true
install:
- SET PATH=C:\Ruby%RUBY_VER%\bin;%PATH%
- <%= @configs['appveyor_bundle_install'] %>
- type Gemfile.lock
build: off
test_script:
- bundle exec puppet -V
- ruby -v
<% @configs['test_script'].each do |script| -%>
- <%= script %>
<% end -%>
notifications:
- provider: Email
to:
- nobody@nowhere.com
on_build_success: false
on_build_failure: false
on_build_status_changed: false
<% else -%>
# Appveyor is only enabled on modules that support windows
<% end -%>

0 comments on commit 55f5ab1

Please sign in to comment.