Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

come current with upstream/master so we can bump stdlib #8

Merged
merged 376 commits into from
Oct 5, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
376 commits
Select commit Hold shift + click to select a range
10b21da
require at least puppetlabs/stdlib 4.16.0
bastelfreak Feb 3, 2018
3c82ae4
add missing pre_condition for repo unit tests
bastelfreak Feb 3, 2018
f3c6e4a
Merge pull request #293 from fstr/deb-php71
bastelfreak Feb 3, 2018
a86b47d
Merge pull request #408 from joekohlsdorf/autoupdate_idempotency
bastelfreak Feb 3, 2018
ff0e469
modulesync 1.7.0
bastelfreak Feb 3, 2018
0ad7566
add ubuntu 16.04 support
bastelfreak Feb 3, 2018
756e3e2
Merge pull request #412 from bastelfreak/patches
oranenj Feb 3, 2018
fe4de85
Merge pull request #413 from voxpupuli/modulesync
oranenj Feb 3, 2018
a07679b
use correct require arguments
bastelfreak Feb 13, 2018
d36d320
Merge pull request #415 from bastelfreak/fix
bastelfreak Feb 14, 2018
5410a00
modulesync 1.8.0
bastelfreak Feb 14, 2018
1e014ad
Merge pull request #416 from voxpupuli/modulesync
bastelfreak Feb 14, 2018
47e2188
release 5.2.0
bastelfreak Feb 14, 2018
8ada7a3
Merge pull request #417 from bastelfreak/rel520
bastelfreak Feb 14, 2018
4e9313f
[blacksmith] Bump version to 5.2.1-rc0
bastelfreak Feb 14, 2018
a3efdfe
add acceptance tests on ubuntu16.04
bastelfreak Feb 3, 2018
e1ab866
add basic acceptance tests
bastelfreak Feb 3, 2018
26bb2aa
add ubuntu14.04 to acceptance tests matrix
bastelfreak Feb 3, 2018
14740c3
add acceptance tests on centos7
bastelfreak Feb 3, 2018
ca9fd22
add acceptance tests on debian 8
bastelfreak Feb 17, 2018
15474f7
Merge pull request #414 from bastelfreak/acceptance
bastelfreak Feb 17, 2018
7f5623d
manage software-properties-common on ubuntu
bastelfreak Feb 17, 2018
fdf921e
Merge pull request #419 from bastelfreak/blub
bastelfreak Feb 17, 2018
0590ab8
Fix wrongly named parameters for apt::source/key
Feb 23, 2018
d2fec67
Add sury flag to Debian repo class
Feb 27, 2018
072e326
there are no common packages on arch
bastelfreak Mar 2, 2018
ab254b1
set correct fpm error logging on arch
bastelfreak Mar 2, 2018
2c2ca91
add examples for php-fpm/nginx
bastelfreak Mar 3, 2018
42baf6b
Merge pull request #424 from bastelfreak/docs
bastelfreak Mar 3, 2018
359e60e
Merge pull request #423 from bastelfreak/patches
bastelfreak Mar 3, 2018
89a2c1a
Merge pull request #420 from bitcrush/fix_apt_resource_params
bastelfreak Mar 3, 2018
6ca17a4
add tests for php5.6
bastelfreak Feb 3, 2018
d3045fb
fix the ubuntu16.04 nodeset
bastelfreak Feb 17, 2018
c0cb2d0
run acceptance tests on each spec file
bastelfreak Feb 17, 2018
3412e96
add acceptance tests to modulesync config
bastelfreak Feb 22, 2018
eb6fcdb
use modulesync to generate acceptance tests
bastelfreak Feb 27, 2018
8ea890c
using the new facts hash instead of the global var in repo/debian.pp
c33s Mar 5, 2018
a2c13fb
removed :: from $facts variable
c33s Mar 6, 2018
4544b3b
restructure php56 acceptance tests
bastelfreak Feb 27, 2018
2b970d7
cleanup php7 acceptance test
bastelfreak Mar 6, 2018
b98a6a5
Merge pull request #418 from bastelfreak/acceptancephp56
bastelfreak Mar 6, 2018
ba0dacf
Merge pull request #425 from c33s/fix/remove-legacy-fact-from-repo-de…
bastelfreak Mar 6, 2018
6da7a3c
release 5.3.0
bastelfreak Mar 6, 2018
4d99a12
Merge pull request #426 from bastelfreak/rel530
bastelfreak Mar 6, 2018
6389761
[blacksmith] Bump version to 5.3.1-rc0
bastelfreak Mar 6, 2018
eb5bb34
Update dependency
marknl Apr 19, 2018
48f3386
Merge pull request #438 from marknl/patch-1
alexjfisher Apr 19, 2018
69aceb6
added condition to globals.pp to make module working on debian 9. Not…
SimonHoenscheid Apr 22, 2018
a764608
fix tests and make rubocop happy
SimonHoenscheid Apr 22, 2018
ff51992
cleaned up conditions in globals.pp and spec files to seperate Debian…
SimonHoenscheid May 4, 2018
3473a55
added acceptence tests for debian 9 and added travis job
SimonHoenscheid May 4, 2018
4761871
fix debian build in this PR too
SimonHoenscheid May 4, 2018
0f49c99
Merge pull request #440 from SimonHoenscheid/debian_9_support
bastelfreak May 5, 2018
16993c6
switch the dotdeb repo url to https
bastelfreak Mar 17, 2018
ff15ff1
Merge pull request #431 from bastelfreak/repourl
bastelfreak May 5, 2018
903d8ad
bump puppet to latest supported version 4.10.0
bastelfreak May 5, 2018
c3555e3
Merge pull request #443 from bastelfreak/puppet
bastelfreak May 5, 2018
3bd6909
migrate vars from topscope to relative scope
bastelfreak May 5, 2018
6013fd6
Added 18.04 to is list of the supported environments
jkroepke Mar 14, 2018
826ac8b
fix spec tests for ubuntu 18.04
bastelfreak May 5, 2018
0c57b4c
Merge pull request #444 from bastelfreak/scope
bastelfreak May 5, 2018
3aed175
Merge pull request #428 from jkroepke/patch-3
bastelfreak May 5, 2018
365a125
modulesync 1.9.1
bastelfreak May 5, 2018
6d7b898
Merge pull request #446 from voxpupuli/modulesync
bastelfreak May 5, 2018
a31906a
mark private classes with assert_private()
bastelfreak May 5, 2018
1bba491
Merge pull request #447 from bastelfreak/fail
bastelfreak May 5, 2018
8d3f102
Fix paths for phpunit on FreeBSD
Jan 8, 2017
d94c0fa
Use system-dependent value for group
Jan 8, 2017
0a69781
Merge pull request #291 from bitnexus/fix-path-for-phpunit-freebsd
bastelfreak May 7, 2018
b188888
fixed merge bug, added bc compat. layer
c33s Apr 4, 2018
b9f81d7
PR#292 Compatibility with Softwarecollections (SCL)
diLLec Mar 6, 2018
f4863c1
Merge pull request #451 from oranenj/scl
bastelfreak May 10, 2018
e39f5e6
Merge pull request #435 from c33s/bugfix/434-remove-manual-hiera-lookup
bastelfreak May 12, 2018
dcc5983
Rely on beaker-hostgenerator for docker nodesets
ekohl May 13, 2018
dcd2ea4
Merge pull request #452 from ekohl/msync-docker
bastelfreak May 13, 2018
e9ddb00
drop EOL OSs; fix puppet version range
bastelfreak May 21, 2018
3e00b52
Merge pull request #453 from bastelfreak/puppet
sandra-thieme May 21, 2018
0e0fa09
allow php 7.2
cbergmann Jun 11, 2018
da4731b
allow 5.6 from sury
cbergmann Jun 12, 2018
40fb21d
allow php5.6 from sury
cbergmann Jun 12, 2018
8b41289
modulesync 1.9.3
bastelfreak Jul 15, 2018
77d3449
Merge pull request #461 from voxpupuli/modulesync
bastelfreak Jul 15, 2018
da702c6
enable ubuntu 18.04 acceptance tests
bastelfreak Jul 15, 2018
33380f4
Merge pull request #462 from bastelfreak/ubuntu1804
bastelfreak Jul 15, 2018
c6e60ef
modulesync 1.9.4
bastelfreak Jul 22, 2018
5821463
Merge pull request #464 from voxpupuli/modulesync
LongLiveCHIEF Jul 23, 2018
755128b
modulesync 1.9.4
bastelfreak Jul 25, 2018
36c3bdc
Merge pull request #465 from voxpupuli/modulesync
bastelfreak Jul 25, 2018
5a13f3d
Update README.md with working RHSCL example
Jul 18, 2018
cbad253
Merge pull request #463 from Tamerz/rhscldocs
bastelfreak Jul 29, 2018
88f7285
release 6.0.0
bastelfreak Jul 29, 2018
3825f27
Merge pull request #466 from bastelfreak/rel600
bastelfreak Jul 29, 2018
23e010e
[blacksmith] Bump version to 6.0.1-rc0
bastelfreak Jul 29, 2018
7201e88
modulesync 1.9.5
bastelfreak Aug 11, 2018
4a23af6
update spec_helper_acceptance
bastelfreak Aug 11, 2018
54500e7
allow puppetlabs/apt 5.x
bastelfreak Aug 11, 2018
b113e7c
Merge pull request #469 from voxpupuli/modulesync
bastelfreak Aug 12, 2018
63abdd5
modulesync 1.9.6
bastelfreak Aug 13, 2018
665b90d
Merge pull request #470 from voxpupuli/modulesync
juniorsysadmin Aug 13, 2018
12baba0
allow puppetlabs/stdlib 5.x
bastelfreak Aug 26, 2018
54ef239
allow puppetlabs/apt 6.x
juniorsysadmin Aug 27, 2018
191f278
Merge pull request #472 from voxpupuli/stdlib
juniorsysadmin Aug 27, 2018
17ad35c
modulesync 2.0.0
bastelfreak Sep 5, 2018
a9b314b
add initial REFERENCE.md
bastelfreak Sep 5, 2018
2810f1d
drop debian 7 tests
bastelfreak Sep 5, 2018
9634ea1
Merge pull request #474 from voxpupuli/modulesync
bastelfreak Sep 5, 2018
aaeb555
Add acceptance tests for system php with extensions
bastelfreak Sep 15, 2018
6de085e
dont call downcase() on undef variable
bastelfreak Sep 15, 2018
781b427
Merge pull request #476 from bastelfreak/tests
sandra-thieme Sep 15, 2018
725f6cd
Fix enable extension when there is no module associated
amateo Sep 25, 2018
df44bdd
Add acceptance test
amateo Sep 26, 2018
8a567f4
Merge pull request #479 from amateo/fix_ena_module
bastelfreak Oct 1, 2018
5895a6e
Remove config when module is ensured to absent
amateo Sep 25, 2018
6e74026
Merge pull request #478 from amateo/fix_mod_ensure
bastelfreak Oct 6, 2018
3779cea
modulesync 2.1.0
bastelfreak Oct 6, 2018
096b9ba
allow puppet 6.x
bastelfreak Oct 6, 2018
5a58f36
Merge pull request #481 from voxpupuli/modulesync
bastelfreak Oct 6, 2018
5f44523
release 6.0.1
bastelfreak Oct 6, 2018
9f6264f
Merge pull request #482 from bastelfreak/rel601
dhollinger Oct 6, 2018
6e44833
[blacksmith] Bump version to 6.0.2-rc0
dhollinger Oct 6, 2018
6907fcb
Allow `clear_env` to be disabled
joshuaspence Oct 9, 2018
5b98176
Remove readable for others on pool config file
l-lotz Oct 10, 2018
e27d1d0
ensure could also be 'latest'
amateo Oct 11, 2018
51970ef
modulesync 2.2.0
bastelfreak Oct 13, 2018
d4ae703
delete unneeded coverage_spec.rb
bastelfreak Oct 13, 2018
4a251a7
Merge pull request #487 from voxpupuli/modulesync
bastelfreak Oct 13, 2018
d4ab67d
Merge pull request #485 from amateo/ensure_latest
bastelfreak Oct 14, 2018
6a13c79
Merge pull request #484 from l-lotz/patch-1
bastelfreak Oct 14, 2018
8686f31
release 6.0.2
bastelfreak Oct 14, 2018
77f6e4d
Merge pull request #488 from bastelfreak/rel602
bastelfreak Oct 14, 2018
2cf2e1a
[blacksmith] Bump version to 6.0.3-rc0
bastelfreak Oct 14, 2018
4ada984
Fix indentation and default value
joshuaspence Oct 16, 2018
ad9e836
Merge pull request #483 from joshuaspence/clearenv
bastelfreak Oct 20, 2018
97ae907
Added cli_settings parameter to ::php class.
sunnz Oct 21, 2018
d697848
Simplify ensure check
amateo Oct 31, 2018
4bd7ea2
Rely more on puppetlabs-apt
ekohl Oct 31, 2018
07003d6
Merge pull request #493 from amateo/fix_ensure_extension
bastelfreak Nov 2, 2018
f0fee63
Merge https://github.com/voxpupuli/puppet-php
cbergmann Nov 23, 2018
915e4b5
modulesync 2.3.1
bastelfreak Dec 15, 2018
5863a46
Merge pull request #499 from voxpupuli/modulesync
bastelfreak Dec 25, 2018
65af07f
modulesync 2.4.0
bastelfreak Dec 25, 2018
f14dd2a
Merge pull request #502 from voxpupuli/modulesync
bastelfreak Dec 26, 2018
9b06657
Merge pull request #455 from proventa/master
bastelfreak Jan 16, 2019
f4c8daf
Fix php::fpm eternal reload for mysqli a simplexml extension
miranovy Jan 21, 2019
7019a3f
Added the minimal string length
miranovy Jan 22, 2019
c27cf4c
Fixed repositories managed for all patch version of 7.x for Ubuntu.
Conzar Jan 22, 2019
fc6dee1
Merge pull request #505 from Conzar/master
bastelfreak Jan 22, 2019
b7940b5
modulesync 2.5.1
bastelfreak Feb 1, 2019
51e9cde
drop puppet 4
bastelfreak Feb 1, 2019
10c7908
purge trailing whitespace in README.md
bastelfreak Feb 1, 2019
d97dd6b
Merge pull request #507 from voxpupuli/modulesync
bastelfreak Feb 1, 2019
0726492
Added test
miranovy Feb 7, 2019
1117bb9
Update test
miranovy Feb 7, 2019
57bb273
added missing }
miranovy Feb 11, 2019
6391650
Added specific simplexml package names
miranovy Feb 11, 2019
c99ef39
correct set package_name as variable
miranovy Feb 11, 2019
8eebb36
Added missing comma
miranovy Feb 11, 2019
8b3d125
Removed packages duplicity on ubuntu
miranovy Feb 11, 2019
c6605c7
Removed packages duplicity on ubuntu
miranovy Feb 11, 2019
6304445
on ubuntu 14.04 is simplexml build in
miranovy Feb 12, 2019
86dfab0
on ubuntu 14.04 is simplexml build in
miranovy Feb 12, 2019
34ffabc
Merge pull request #503 from miranovy/php-fpm-reload
bastelfreak Feb 12, 2019
856a12b
Added unittest for cli_settings.
sunnz Mar 6, 2019
457591f
Removed comma after the last item of a hash according to the Ruby sty…
sunnz Mar 6, 2019
64bbc0b
Merge pull request #491 from sunnz/clisettings
bastelfreak Mar 6, 2019
801fba7
Bump dependency, because of new major release
dhoppe Apr 26, 2019
f20e20d
Merge pull request #518 from dhoppe/bump_dependency
alexjfisher Apr 30, 2019
26b5725
Do not manage mysql.ini when using Ubuntu repo
smortex May 27, 2019
fbb9706
Unbreak CI and remove Ubuntu 14.04 from the build
smortex May 28, 2019
4169e15
Remove Ubuntu 14.04 from supported OS list
smortex May 28, 2019
5fb6164
Merge pull request #519 from smortex/mysql-ubuntu-fix
Dan33l May 29, 2019
d88325c
Drop Ubuntu 14.04
bastelfreak May 29, 2019
8b875a1
Allow puppetlabs/stdlib 6.x and puppet/archive 4.x
alexjfisher May 29, 2019
7d028b6
Merge pull request #520 from bastelfreak/ubuntu14
bastelfreak May 29, 2019
9fb2fd5
Merge pull request #521 from voxpupuli/afisher_update_dependencies
bastelfreak May 29, 2019
b21dad9
Fix deprecated Hiera lookup warnings. Add YAML structure for default …
grant-veepshosting May 30, 2019
3c66d69
Merge pull request #522 from comport3/master
bastelfreak May 30, 2019
3a744a4
Simplify php (extension) removal
TuningYourCode Jul 13, 2019
1726187
Merge pull request #526 from TuningYourCode/simplify-removal
bastelfreak Jul 29, 2019
4168bc6
set default version for debian buster and add support for buster
lelutin Aug 14, 2019
ebd4361
remove case that will not match for debian
lelutin Aug 14, 2019
8b9d5a4
change tests so that they support debian buster
lelutin Aug 14, 2019
baec950
Merge pull request #530 from lelutin/default_version_debian_buster
dhollinger Aug 15, 2019
8f500c5
hotfix:: updating key id for debian repo sury
carlosherreradespegar Aug 20, 2019
26b3624
Merge pull request #532 from caherrera/master
bastelfreak Aug 27, 2019
f62921d
fix "cannot redefine $real_settings" error
crispygoth Sep 11, 2019
66f1c1a
Merge pull request #533 from crispygoth/fix_apache_config_error
natemccurdy Sep 11, 2019
58f3553
release 7.0.0
jkroepke Sep 12, 2019
4d9608c
Merge pull request #534 from jkroepke/release-7.0.0
Dan33l Sep 12, 2019
bb5755f
[blacksmith] Bump version to 7.0.1-rc0
Dan33l Sep 12, 2019
10adbe4
Clean up acceptance spec helper
ekohl Oct 19, 2019
ebaaf86
Merge pull request #551 from ekohl/spec-helper-acceptance
bastelfreak Oct 19, 2019
75c5e4e
Use automatic lookups for `fpm` class variables
sigv Oct 22, 2019
5d59134
Add a note about Hiera merging `lookup_options`
sigv Oct 25, 2019
f6b1322
Add an example of `lookup_options`
sigv Oct 27, 2019
debfa56
Set current `lookup_options` as `first`
sigv Oct 30, 2019
e58c16f
allow puppetlabs/inifile 4.x
bastelfreak Nov 14, 2019
7b760a8
Merge pull request #553 from bastelfreak/inifile
ekohl Nov 17, 2019
fd022ad
Merge pull request #550 from sigv/536
bastelfreak Nov 18, 2019
60d4f8c
Fix running apt update on Debian family
Dec 10, 2019
bd2a571
Merge pull request #554 from Hexta/fix_debian_apt_update
ghoneycutt Feb 13, 2020
69449e9
modulesync 2.7.0
bastelfreak Apr 7, 2019
b475565
puppet-lint: fix relative_classname_inclusion
bastelfreak Apr 7, 2019
a469ad6
modulesync 2.9.0
dhoppe Dec 6, 2019
ce6cf05
modulesync 2.10.0
bastelfreak Dec 22, 2019
6947c26
modulesync 2.12.0
bastelfreak Apr 4, 2020
b1bb343
puppet-lint: fix topscope vars
bastelfreak Apr 4, 2020
5be3832
puppet-lint: remove anchors
bastelfreak Apr 4, 2020
6295c99
Rewrite tests to use rspec-mocks
dhoppe Apr 8, 2020
87aad93
Remove code from no longer supported distributions
dhoppe Apr 8, 2020
06f2162
Merge pull request #513 from voxpupuli/modulesync
bastelfreak Apr 11, 2020
966bc20
add ability to define composer update channel
CyberLine Apr 9, 2020
ae61881
Merge pull request #571 from CyberLine/master
bastelfreak Apr 19, 2020
96f5676
delete legacy travis directory
bastelfreak Dec 16, 2019
d1c094f
Merge pull request #556 from bastelfreak/travis
ekohl Apr 19, 2020
8b99069
add pool_purge option to init.pp
bovy89 Dec 17, 2019
691df11
Merge pull request #557 from bovy89/master
bastelfreak Apr 19, 2020
a1a68fa
Fix enabling of zend extensions
coreyralph Apr 20, 2020
ab23f26
fix rubocop failure
coreyralph Apr 21, 2020
369cc38
Use the correct prefix for pear on FreeBSD
oxc Nov 4, 2019
3e011b9
Auto-determine FreeBSD package prefix from version
oxc Nov 4, 2019
80e9279
Merge pull request #552 from oxc/freebsd_prefix
bastelfreak Apr 21, 2020
0cfd6a5
Merge pull request #567 from coreyralph/zend-ext-enable
bastelfreak Apr 25, 2020
5d21b37
remove www pool from defaults
bovy89 Apr 27, 2020
d01d1c8
Release 7.1.0
dhoppe May 5, 2020
5d4aed8
[blacksmith] Bump version to 7.1.1-rc0
dhoppe May 5, 2020
7150193
Remove duplicate mysqlnd from example in README (#574)
saz May 18, 2020
eb304ad
Merge pull request #572 from bovy89/master
bastelfreak May 18, 2020
59b6d64
Cleanup fpm config class
paescuj Mar 29, 2020
df68a3a
Merge pull request #570 from paescuj/cleanup_fpm_config_class
bastelfreak Jul 5, 2020
d7055f2
modulesync 3.0.0
bastelfreak Jul 31, 2020
85b3e38
puppet-lint: autofix
bastelfreak Jul 31, 2020
a117c1c
rubocop: autofix
bastelfreak Jul 31, 2020
20f56e0
drop EOL FreeBSD 9/10 from metadata.json
bastelfreak Aug 1, 2020
d7bcc0a
Merge pull request #590 from voxpupuli/modulesync
bastelfreak Aug 1, 2020
8b1fd87
Drop EOL Debian 7/8 & Ubuntu 12/14
bastelfreak Aug 1, 2020
b0b4841
increase spec coverage
bastelfreak Aug 1, 2020
ec80be8
add puppetlabs/translate to fixtures
bastelfreak Aug 1, 2020
f4465f4
Merge pull request #592 from bastelfreak/debian
bastelfreak Aug 1, 2020
6cd23d2
(#596) drop 'reload' in favour of 'restart'
kengelhardt-godaddy Aug 27, 2020
5df630b
Merge pull request #597 from kBite/restart-instead-of-reload
bastelfreak Aug 27, 2020
54d170e
Add apparmor_hat support to php::fpm::pool
simondeziel Jul 2, 2019
283b9ae
fpm::pool: add data type for apparmor_hat param
simondeziel Aug 25, 2019
c91991b
fph::pool: add unit test
simondeziel Aug 31, 2020
4c20c7b
Update manifests/fpm/pool.pp
bastelfreak Sep 2, 2020
332e3bc
Merge pull request #524 from simondeziel/apparmor
bastelfreak Sep 2, 2020
ebb02ed
php-fpm: Make service reload/restart configurable
bastelfreak Aug 29, 2020
bced0bf
Merge pull request #598 from bastelfreak/fpm
bastelfreak Sep 2, 2020
359af63
Adding the option to set process.dumpable
mhagstrand Mar 18, 2019
4020640
Merge branch 'bigcommerce' into v7.1.1-rc0bc
Oct 5, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# editorconfig.org

# MANAGED BY MODULESYNC

root = true

[*]
charset = utf-8
end_of_line = lf
indent_size = 2
tab_width = 2
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true
16 changes: 9 additions & 7 deletions .fixtures.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
fixtures:
repositories:
stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib.git"
apt: "git://github.com/puppetlabs/puppetlabs-apt.git"
zypprepo: "git://github.com/deadpoint/puppet-zypprepo.git"
inifile: "git://github.com/puppetlabs/puppetlabs-inifile.git"
archive: "git://github.com/voxpupuli/puppet-archive.git"
symlinks:
php: "#{source_dir}"
stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
apt: "https://github.com/puppetlabs/puppetlabs-apt.git"
translate: "https://github.com/puppetlabs/puppetlabs-translate.git"
zypprepo: "https://github.com/deadpoint/puppet-zypprepo.git"
inifile: "https://github.com/puppetlabs/puppetlabs-inifile.git"
archive: "https://github.com/voxpupuli/puppet-archive.git"
yumrepo_core:
repo: https://github.com/puppetlabs/puppetlabs-yumrepo_core.git
puppet_version: ">= 6.0.0"
261 changes: 221 additions & 40 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,31 +1,114 @@
# Contribution guidelines

## Table of contents

* [Contributing](#contributing)
* [Writing proper commits - short version](#writing-proper-commits-short-version)
* [Writing proper commits - long version](#writing-proper-commits-long-version)
* [Dependencies](#dependencies)
* [Note for OS X users](#note-for-os-x-users)
* [The test matrix](#the-test-matrix)
* [Syntax and style](#syntax-and-style)
* [Running the unit tests](#running-the-unit-tests)
* [Unit tests in docker](#unit-tests-in-docker)
* [Integration tests](#integration-tests)

This module has grown over time based on a range of contributions from
people using it. If you follow these contributing guidelines your patch
will likely make it into a release a little quicker.
will likely make it into a release a little more quickly.

## Contributing

Please note that this project is released with a Contributor Code of Conduct.
By participating in this project you agree to abide by its terms.
[Contributor Code of Conduct](https://voxpupuli.org/coc/).

1. Fork the repo.

1. Create a separate branch for your change.

1. Run the tests. We only take pull requests with passing tests, and
documentation.

1. Add a test for your change. Only refactoring and documentation
changes require no new tests. If you are adding functionality
or fixing a bug, please add a test.

1. Squash your commits down into logical components. Make sure to rebase
against the current master.

1. Push the branch to your fork and submit a pull request.

Please be prepared to repeat some of these steps as our contributors review
your code.
* Fork the repo.
* Create a separate branch for your change.
* We only take pull requests with passing tests, and documentation. [travis-ci](http://travis-ci.org) runs the tests for us. You can also execute them locally. This is explained [in a later section](#the-test-matrix).
* Checkout [our docs](https://voxpupuli.org/docs/reviewing_pr/) we use to review a module and the [official styleguide](https://puppet.com/docs/puppet/6.0/style_guide.html). They provide some guidance for new code that might help you before you submit a pull request.
* Add a test for your change. Only refactoring and documentation changes require no new tests. If you are adding functionality or fixing a bug, please add a test.
* Squash your commits down into logical components. Make sure to rebase against our current master.
* Push the branch to your fork and submit a pull request.

Please be prepared to repeat some of these steps as our contributors review your code.

## Writing proper commits - short version

* Make commits of logical units.
* Check for unnecessary whitespace with "git diff --check" before committing.
* Commit using Unix line endings (check the settings around "crlf" in git-config(1)).
* Do not check in commented out code or unneeded files.
* The first line of the commit message should be a short description (50 characters is the soft limit, excluding ticket number(s)), and should skip the full stop.
* Associate the issue in the message. The first line should include the issue number in the form "(#XXXX) Rest of message".
* The body should provide a meaningful commit message, which:
*uses the imperative, present tense: `change`, not `changed` or `changes`.
* includes motivation for the change, and contrasts its implementation with the previous behavior.
* Make sure that you have tests for the bug you are fixing, or feature you are adding.
* Make sure the test suites passes after your commit:
* When introducing a new feature, make sure it is properly documented in the README.md

## Writing proper commits - long version

1. Make separate commits for logically separate changes.

Please break your commits down into logically consistent units
which include new or changed tests relevant to the rest of the
change. The goal of doing this is to make the diff easier to
read for whoever is reviewing your code. In general, the easier
your diff is to read, the more likely someone will be happy to
review it and get it into the code base.

If you are going to refactor a piece of code, please do so as a
separate commit from your feature or bug fix changes.

We also really appreciate changes that include tests to make
sure the bug is not re-introduced, and that the feature is not
accidentally broken.

Describe the technical detail of the change(s). If your
description starts to get too long, that is a good sign that you
probably need to split up your commit into more finely grained
pieces.

Commits which plainly describe the things which help
reviewers check the patch and future developers understand the
code are much more likely to be merged in with a minimum of
bike-shedding or requested changes. Ideally, the commit message
would include information, and be in a form suitable for
inclusion in the release notes for the version of Puppet that
includes them.

Please also check that you are not introducing any trailing
whitespace or other "whitespace errors". You can do this by
running "git diff --check" on your changes before you commit.

2. Sending your patches

To submit your changes via a GitHub pull request, we _highly_
recommend that you have them on a topic branch, instead of
directly on `master`.
It makes things much easier to keep track of, especially if
you decide to work on another thing before your first change
is merged in.

GitHub has some pretty good
[general documentation](http://help.github.com/) on using
their site. They also have documentation on
[creating pull requests](http://help.github.com/send-pull-requests/).

In general, after pushing your topic branch up to your
repository on GitHub, you can switch to the branch in the
GitHub UI and click "Pull Request" towards the top of the page
in order to open a pull request.


3. Update the related GitHub issue.

If there is a GitHub issue associated with the change you
submitted, then you should update the ticket to include the
location of your branch, along with any other commentary you
may wish to make.

## Dependencies

Expand All @@ -38,46 +121,105 @@ By default the tests use a baseline version of Puppet.
If you have Ruby 2.x or want a specific version of Puppet,
you must set an environment variable such as:

export PUPPET_VERSION="~> 4.2.0"
```sh
export PUPPET_VERSION="~> 5.5.6"
```

You can install all needed gems for spec tests into the modules directory by
running:

```sh
bundle install --path .vendor/ --without development system_tests release --jobs "$(nproc)"
```

If you also want to run acceptance tests:

```sh
bundle install --path .vendor/ --with system_tests --without development release --jobs "$(nproc)"
```

Our all in one solution if you don't know if you need to install or update gems:

```sh
bundle install --path .vendor/ --with system_tests --without development release --jobs "$(nproc)"; bundle update; bundle clean
```

As an alternative to the `--jobs "$(nproc)` parameter, you can set an
environment variable:

```sh
BUNDLE_JOBS="$(nproc)"
```

Install the dependencies like so...
### Note for OS X users

bundle install
`nproc` isn't a valid command under OS x. As an alternative, you can do:

## Syntax and style
```sh
--jobs "$(sysctl -n hw.ncpu)"
```

## The test matrix

### Syntax and style

The test suite will run [Puppet Lint](http://puppet-lint.com/) and
[Puppet Syntax](https://github.com/gds-operations/puppet-syntax) to
check various syntax and style things. You can run these locally with:

bundle exec rake lint
bundle exec rake validate
```sh
bundle exec rake lint
bundle exec rake validate
```

It will also run some [Rubocop](http://batsov.com/rubocop/) tests
against it. You can run those locally ahead of time with:

bundle exec rake rubocop
```sh
bundle exec rake rubocop
```

## Running the unit tests
### Running the unit tests

The unit test suite covers most of the code, as mentioned above please
add tests if you're adding new functionality. If you've not used
[rspec-puppet](http://rspec-puppet.com/) before then feel free to ask
about how best to test your new feature.

To run the linter, the syntax checker and the unit tests:

```sh
bundle exec rake test
```

To run your all the unit tests

bundle exec rake spec SPEC_OPTS='--format documentation'
```sh
bundle exec rake spec
```

To run a specific spec test set the `SPEC` variable:

bundle exec rake spec SPEC=spec/foo_spec.rb
```sh
bundle exec rake spec SPEC=spec/foo_spec.rb
```

To run the linter, the syntax checker and the unit tests:
#### Unit tests in docker

Some people don't want to run the dependencies locally or don't want to install
ruby. We ship a Dockerfile that enables you to run all unit tests and linting.
You only need to run:

bundle exec rake test
```sh
docker build .
```

## Integration tests
Please ensure that a docker daemon is running and that your user has the
permission to talk to it. You can specify a remote docker host by setting the
`DOCKER_HOST` environment variable. it will copy the content of the module into
the docker image. So it will not work if a Gemfile.lock exists.

### Integration tests

The unit tests just check the code runs, not that it does exactly what
we want on a real machine. For that we're using
Expand All @@ -87,14 +229,53 @@ This fires up a new virtual machine (using vagrant) and runs a series of
simple tests against it after applying the module. You can run this
with:

bundle exec rake acceptance
```sh
bundle exec rake acceptance
```

This will run the tests on the module's default nodeset. You can override the
nodeset used, e.g.,

```sh
BEAKER_set=centos-7-x64 bundle exec rake acceptance
```

There are default rake tasks for the various acceptance test modules, e.g.,

```sh
bundle exec rake beaker:centos-7-x64
bundle exec rake beaker:ssh:centos-7-x64
```

If you don't want to have to recreate the virtual machine every time you can
use `BEAKER_destroy=no` and `BEAKER_provision=no`. On the first run you will at
least need `BEAKER_provision` set to yes (the default). The Vagrantfile for the
created virtual machines will be in `.vagrant/beaker_vagrant_files`.

Beaker also supports docker containers. We also use that in our automated CI
pipeline at [travis-ci](http://travis-ci.org). To use that instead of Vagrant:

```sh
PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=debian10-64{hypervisor=docker} BEAKER_destroy=yes bundle exec rake beaker
```

You can replace the string `debian10` with any common operating system.
The following strings are known to work:

* ubuntu1604
* ubuntu1804
* debian8
* debian9
* debian10
* centos6
* centos7
* centos8

This will run the tests on an Ubuntu 12.04 virtual machine. You can also
run the integration tests against Centos 6.6 with.
The easiest way to debug in a docker container is to open a shell:

BEAKER_set=centos-66-x64 bundle exec rake acceptances
```sh
docker exec -it -u root ${container_id_or_name} bash
```

If you don't want to have to recreate the virtual machine every time you
can use `BEAKER_DESTROY=no` and `BEAKER_PROVISION=no`. On the first run you will
at least need `BEAKER_PROVISION` set to yes (the default). The Vagrantfile
for the created virtual machines will be in `.vagrant/beaker_vagrant_fies`.
The source of this file is in our [modulesync_config](https://github.com/voxpupuli/modulesync_config/blob/master/moduleroot/.github/CONTRIBUTING.md.erb)
repository.
12 changes: 12 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,15 @@ Thank you for contributing to this project!
- Our vulnerabilities reporting process is at https://voxpupuli.org/security/

-->
#### Pull Request (PR) description
<!--
Replace this comment with a description of your pull request.
-->

#### This Pull Request (PR) fixes the following issues
<!--
Replace this comment with the list of issues or n/a.
Use format:
Fixes #123
Fixes #124
-->
3 changes: 3 additions & 0 deletions .github/SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Vox Pupuli Security Policy

Our vulnerabilities reporting process is at https://voxpupuli.org/security/
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,14 @@ spec/fixtures/manifests/
spec/fixtures/modules/
.vagrant/
.bundle/
.ruby-version
coverage/
log/
.idea/
.dependencies/
.librarian/
Puppetfile.lock
*.iml
.*.sw?
.yardoc/
Guardfile
2 changes: 1 addition & 1 deletion .msync.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
modulesync_config_version: '0.16.11'
modulesync_config_version: '3.0.0'
Loading