Commit Graph

202 Commits

Author SHA1 Message Date
Ben Ford
c6892b263d
Update README.md
Co-authored-by: Reid Vandewiele <reid@puppet.com>
2021-05-05 15:15:06 -07:00
Ben Ford
a95701bce5
Add template instructions 2021-05-05 15:07:16 -07:00
Reid Vandewiele
fd89d9a7db
Merge pull request #97 from mcka1n/patch-1
update the version of the example modules
2021-05-04 07:13:47 -07:00
Edwin Maldonado
33ee3da468
update the version of the example modules 2021-05-04 15:11:43 +02:00
Reid Vandewiele
5fd7099181
Merge pull request #91 from vulongtran/patch-1
Update README.md
2020-10-21 05:00:27 -10:00
Vu Long Tran
b7044e4888
Update README.md
Sounds good

Co-authored-by: Reid Vandewiele <reid@puppet.com>
2020-10-21 19:37:17 +08:00
Vu Long Tran
36c1c0594d
Update README.md
Updating Code Manager link to the latest - https://puppet.com/docs/pe/2019.8/code_mgr.html. As old link has been updated.
2020-10-19 12:19:36 +08:00
Reid Vandewiele
eaa032205d
Merge pull request #87 from mwaggett/codeowners
(maint) Fix CODEOWNERS
2020-09-10 08:33:02 -10:00
Molly Waggett
197fd56edf (maint) Fix CODEOWNERS 2020-09-10 11:11:37 -07:00
Iristyle
882089207c Revert "add db2 module"
This reverts commit bfb2d7a182.
2019-12-03 13:35:22 -06:00
Iristyle
c52c39d245 Revert "add db2_server role and profile"
This reverts commit 58103e4ef4.
2019-12-03 13:35:22 -06:00
Iristyle
f992c8c96d Revert "include db2 class"
This reverts commit 1041362ee1.
2019-12-03 13:35:22 -06:00
Jesse Reynolds
1041362ee1 include db2 class 2019-11-30 09:23:25 +10:30
Jesse Reynolds
58103e4ef4 add db2_server role and profile 2019-11-30 09:19:21 +10:30
Jesse Reynolds
bfb2d7a182 add db2 module 2019-11-30 08:52:07 +10:30
Reid Vandewiele
458877f386
Merge pull request #65 from smortex/portability-fixes
Improve portability
2019-10-18 15:22:36 -07:00
Reid Vandewiele
e46d209f19 Don't assume git is in /usr/bin; expect it on PATH 2019-10-16 10:05:33 -10:00
Reid Vandewiele
ada94157a4 Restore and clarify config_version functionality
This branch is intended as a portability fix. Some functionailty had
been inadvertently removed as unused, but testing revealed that it had a
purpose. Because the purpose was unclear, this commit restores the
functionality AND clarifies it in the script names and comments in
config_version.sh.
2019-10-16 10:26:21 -07:00
Ben Ford
bee4fc2740
Create CODEOWNERS 2019-08-21 13:58:51 -07:00
Reid Vandewiele
dddbd8d15c (maint) Update Puppetfile versions, update style
This commit updates the Puppetfile example module versions to list the
latest releases for the example modules as of 2019-07-10, and also
updates several files for style.

Standardizing on double-quotes in YAML due to:

1. Functional irrelevance between single vs. double quotes in our YAML
2. Prevalent use of double-quotes in Puppet documentation
3. Similar look-and-feel to other data serialization formats like JSON
2019-07-11 09:33:14 -07:00
adam buxton
535d94437b
Merge pull request #73 from natemccurdy/site_pp_updates
Update outdated info and links in site.pp comments
2019-05-14 20:47:31 +01:00
Nate McCurdy
a8c6d51264
Update outdated info and links in site.pp comments
This commit attempts to cleanup and modernize the comments in site.pp a
bit.

For one thing, I've updated the docs links to point to working URL's.
For another, I tried to reorganize, clarify, and deduplicate the comments.
2019-05-06 17:36:50 -05:00
Reid Vandewiele
306107b98b
Merge pull request #71 from npwalker/rename_site_to_site-modules
Rename site directory to site-modules
2019-02-26 15:26:47 -08:00
Reid Vandewiele
c74c84d243 Update README to reflect site -> site-modules 2019-02-26 09:14:15 -08:00
Reid Vandewiele
baa4b92a88 Remove symlink site -> site-modules
The symlink served for a good discussion point around change impact, but
in the end having it makes for a more confusing experience overall both
to new users cloning the control-repo to get started and also to anyone
accustomed to "site". A new user won't miss "site". A symlink will muddy
the waters over the change for long-time users. Better for clarity to be
all-in and not include a symlink.
2019-02-26 09:14:15 -08:00
Nick Walker
80494c198b Add symlink from site to site-modules for compatibility 2019-02-04 13:04:11 -08:00
Nick Walker
ead7f3c706 Rename site directory to site-modules
Prior to this commit, we placed modules local to a users installation
in the `site` directory.  This was just a convention and the name
`site` doesn't clearly convey what it is for.

After this commit, we place modules local to a users installation in
the `site-modules` directory.  This makes it more clear to users
that this is a directory that modules go i.  When users start
with bolt they won't even know what a control-repo is and
renaming site to site-modules gives them a better idea of why
they should put their modules with tasks in them.  Also see:

https://tickets.puppetlabs.com/browse/BOLT-1108
2019-01-31 16:58:13 -08:00
Craig Sprout
18aa0779ae Fixed typos for 'moduelpath' and 'batteries includes' to 'modulepath' and 'batteries included' 2018-12-07 14:08:09 -08:00
Romain Tartière
415a71dd59 Remove code dead for more than 2 years
r10k generates a .r10k-deploy.json file since version 2.1.0 which was
released on October 28, 2015.  New users of the control-repo are not
likely to have a so old version of r10k, so remove this dead code.
2018-05-11 22:28:40 +02:00
Romain Tartière
211ecc58b5 Do sanity checking early
Fail before doing anything when passed parameters are invalid.
2018-05-11 22:26:49 +02:00
Romain Tartière
61d0147e49 Remove execute permission and shebangs
The appropriate ruby interpreter is determined by the config_version.sh
shell script which explicitely use it to start these ruby scripts.
Removing the execute bit ensure users will not run these script with the
wrong Ruby version.
2018-05-11 22:26:49 +02:00
Romain Tartière
ffc1769d2e Improve portability
- Fix shebang: `bash` is not always in `/bin/`, and since the script
  does not have bashism, rely on `sh` which is always in `/bin/`;
- Use `/opt/puppetlabs/puppet/bin/ruby` if this file exist and is
  executable, otherwise use `ruby` from $PATH;
- Use `code_manager_config_version.rb` if `.r10k-deploy.json` is found,
  and `config_version.rb` in all other cases.
2018-05-11 22:25:27 +02:00
Nate McCurdy
f69ffd8ce1 Update module examples to latest versions 2018-05-08 10:46:30 -07:00
Nate McCurdy
36a2784275 Resolve Rubocop warnings
* Removed the useless assignment in the config_version.rb error catching
* Single quote vs. double quote in Puppetfile
2018-05-08 10:46:30 -07:00
Nate McCurdy
aaa85a0e03
Merge pull request #57 from natemccurdy/config_version
Config Version Improvements
2018-05-08 10:43:35 -07:00
Nate McCurdy
78662f908d
Merge pull request #61 from natemccurdy/readme_markdown
Improve the README
2018-03-13 18:43:43 -07:00
Nate McCurdy
bab3453bb5 Simplify the info about the RampUp Program 2018-03-13 13:47:19 -07:00
Nate McCurdy
fda0396e06 Add a tree view with descriptions of important files 2018-02-06 17:35:34 -08:00
Nate McCurdy
c69edaddda Reorganize the README and improve the documentation
This commit moves the "where did all the previous code go" section to
the bottom as it's been a while since that change was made. Nowadays,
people new to Control Repositories will find this and won't understand
the reference as they never knew about previous versions.

Now the README starts right away with information on what this project
is and how to use it.

Also cleaned up some of the Markdown syntax to make it easier to read.
2018-02-06 17:35:34 -08:00
Nate McCurdy
9b2a0d9029 Fix markdown list syntax 2018-02-06 15:59:51 -08:00
Nate McCurdy
cbeb86670a
Merge pull request #59 from petems/add_bitbucket_instructions
Add Bitbucket/Stash instructions
2018-02-01 11:11:55 -08:00
Peter Souter
096719d759 Add Bitbucket/Stash instructions 2018-02-01 19:10:43 +00:00
Nate McCurdy
e5189b5515 Show the short hostname, not the FQDN in config_version
This is mainly a style and readability change.

Prior to this, on masters whose hostname is actually their FQDN, the
config_version script would show the entire FQDN. On nodes with really
longs FQDN's, it was not very nice to look at.

This takes the hostname of the master, splits it on dots (.) and takes
the first segment.

Now this: compile-master-02.int.lab.dmz.company-name.net-production-48fd18ab
Is this:  compile-master-02-production-48fd18ab
2017-12-15 12:52:14 -06:00
Nate McCurdy
09df4b4961 Use the puppet-agent ruby in config_version.rb
Prior to this, the config_version.rb script (used for r10k) attempted to
use the system ruby to parse the script. This caused problems on Puppet
masters that don't have `ruby` in PATH.

This fixes that by hardcoding the puppet-agent's ruby in the shebang.
2017-12-15 12:48:47 -06:00
Federico Voges
c221d72929
Merge pull request #56 from natemccurdy/gitignore
Ignore modules pulled from r10k
2017-11-28 00:15:38 +00:00
Nate McCurdy
0069299d6f Ignore modules pulled from r10k into modules/
Prior to this, modules that were deployed with r10k into the ./modules
directory weren't being ignored by git.

When doing local development or testing, it's nice to be able to run
'r10k puppetfile install' to pull down modules from the Puppetfile.
After this commit, those modules won't be tracked by git.
2017-11-27 19:08:54 -05:00
Nate McCurdy
c89b8d7ef8
Merge pull request #55 from igalic/patch-1
point "forge" to new canonical URL, with https
2017-11-27 19:06:06 -05:00
Igor Galić
9a13af11c6
point "forge" to new canonical URL, with https 2017-11-27 21:41:11 +01:00
Nate McCurdy
4aa1446323
Merge pull request #53 from reidmv/hiera5
Enable Hiera 5
2017-11-16 15:58:30 -08:00
Nate McCurdy
53d4c56136
Merge pull request #54 from jdesroch/patch-1
Typo fix in README.md
2017-11-15 10:31:59 -08:00