git.lirion.de

Of git, get, and gud

summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add a tree view with descriptions of important filesNate McCurdy 2018-02-061-0/+23
|
* Reorganize the README and improve the documentationNate McCurdy 2018-02-061-23/+27
| | | | | | | | | | | | 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.
* Fix markdown list syntaxNate McCurdy 2018-02-061-75/+50
|
* Merge pull request #59 from petems/add_bitbucket_instructionsNate McCurdy 2018-02-011-4/+28
|\ | | | | Add Bitbucket/Stash instructions
| * Add Bitbucket/Stash instructionsPeter Souter 2018-02-011-4/+28
|/
* Merge pull request #56 from natemccurdy/gitignoreFederico Voges 2017-11-281-1/+1
|\ | | | | Ignore modules pulled from r10k
| * Ignore modules pulled from r10k into modules/Nate McCurdy 2017-11-271-1/+1
|/ | | | | | | | | 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.
* Merge pull request #55 from igalic/patch-1Nate McCurdy 2017-11-271-1/+1
|\ | | | | point "forge" to new canonical URL, with https
| * point "forge" to new canonical URL, with httpsIgor Galić 2017-11-271-1/+1
|/
* Merge pull request #53 from reidmv/hiera5Nate McCurdy 2017-11-163-0/+12
|\ | | | | Enable Hiera 5
| * Enable Hiera 5Reid Vandewiele 2017-11-153-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit enables the control repo to use Hiera 5 environment-level hiera hierarchy. This means adding a hiera.yaml to the repo, and moving hieradata/ => data/. We should do this to the control-repo template new customers base off of because in a Hiera 5 world, the global hiera.yaml should be very minimal (possibly even ONLY having the console level), and everything else (nodes, common) belongs in the environment hiera.yaml. This control-repo template is how people start using Puppet. It should reflect using our most modern technologies.
* | Merge pull request #54 from jdesroch/patch-1Nate McCurdy 2017-11-151-1/+1
|\ \ | |/ |/| Typo fix in README.md
| * Update README.mdJody Des Roches 2017-11-151-1/+1
|/ | | Small typo fix
* Merge pull request #51 from puppetlabs/whitespace_errorNate McCurdy 2017-09-061-2/+0
|\ | | | | Reverting whitespace commit
| * Reverting whitespace commitShobhna Shastri 2017-09-061-2/+0
|/ | | There was an accidental commit made on the production branch (https://github.com/puppetlabs/control-repo/commit/d877ba22b624bbd949b0258751f3da1ee7347141). This commit is to correct and revert the change.
* Testing somethingShobhna Shastri 2017-08-251-0/+2
|
* Merge pull request #50 from natemccurdy/show_masterGabriel M. Schuyler 2017-07-053-16/+24
|\ | | | | config_version: Show the compiling master's name
| * config_version: Show the compiling master's nameNate McCurdy 2017-07-053-16/+24
|/ | | | | | | | | | | | Prior to this, the config_version script just showed the commit ID of the version of code being compiled. This commit includes the compiling Puppet master's hostname and environment name in the config_version. This is very useful for debugging when a Puppet master is failing and you have multiple masters behind a load balancer. The output of config_version now looks like this: pupmaster01-production-ac9785273a10
* Merge pull request #44 from aharden/patch-2Nate McCurdy 2017-06-021-1/+1
|\ | | | | Put local site modules first in modulepath
| * Put local site modules first in modulepathAlex Harden 2016-11-081-1/+1
| | | | | | Saw this issue referenced in @glarizza's PuppetConf 2016 talk (raised by @alvagante). Our (TE Connectivity) implementation reflects this.
* | Add ruby shebang to config_version scriptsNick Walker 2016-11-222-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this commit, if you used windows bash git when you clone down the repo these files would get incorrect permissions which make them unexecutable. After this commit, due to some windows bash git magic I don't understand it appears that adding the shebang to the beginning of the file causes windows bash git to change the permissions to so the file is executable. This resolves https://github.com/puppetlabs/control-repo/issues/40
* | Merge pull request #46 from aharden/patch-1Nate McCurdy 2016-11-081-3/+23
|\ \ | |/ |/| Add GitHub instructions
| * Add GitHub instructionsAlex Harden 2016-11-081-3/+23
|/ | | Per Issue https://github.com/puppetlabs/control-repo/issues/26
* Provide permalink for filebucket deprecation (#43)Alex Harden 2016-10-261-1/+1
| | | "Latest" stopped resolving several PE releases ago.
* Remove max_requests_per_instance since hiera-eyaml is fixedNick Walker 2016-08-041-3/+0
| | | | | | | | | Prior to this commit, we mitigated issues with hiera-eyaml causing a memory leak by setting max_requets_per_instance to 0 After this commit, we go back to the default for max_requests_per_instance because the hiera-eyaml memory leak has been resolved for months if you use the newest version
* Merge pull request #38 from reidmv/fix_cm_permsNick Walker 2016-06-291-0/+0
|\ | | | | Set the execute bit for CM config version script
| * Set the execute bit for CM config version scriptReid Vandewiele 2016-06-291-0/+0
|/ | | | | | | The execute bit needs to be set or CM will fail. I think this was probably just missed when the code_manager_config_version.rb file was added.
* Merge pull request #37 from dylanratcliffe/remove-roleNick Walker 2016-06-151-5/+0
|\ | | | | Remove old role all_in_one_pe
| * Removed old roleDylan Ratcliffe 2016-06-141-5/+0
|/
* Update README with new Ramp Up Program URLNick Walker 2016-05-271-1/+1
|
* Merge pull request #32 from jbondpdx/productionGary Larizza 2016-05-111-37/+26
|\ | | | | light editing, mostly for style
| * light editing, mostly for stylejbondpdx 2016-05-111-37/+26
|/
* Merge pull request #27 from npwalker/reduce_scope_of_control_repoGary Larizza 2016-03-298-295/+59
|\ | | | | Reduce the scope of the control-repo to mostly an example
| * Reduce the scope of the control-repo to mostly an exampleNick Walker 2016-03-298-295/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this commit, the control-repo was an example of the structure of a control repo but it also included puppet code to help setup code manager and instructions to get that all setup in a very specific way. This was great for users that wanted to follow those instructions exactly but wasn't great for people just looking for an example to start from. After this commit, the control-repo will be just an example once again and a new repo somehwere else will pop up to provide the explicit instructions on how to use the example with code manager. There are links added to puppetlabs/control-repo to a new repo that will have a version of the code that once lived in puppetlabs/control-repo
* | Merge pull request #28 from npwalker/move_profiles_out_into_their_own_modulesGary Larizza 2016-03-297-121/+13
|\| | | | | Move profiles out into their own modules
| * Move stash profile out to its own 'profile' moduleNick Walker 2016-03-242-28/+4
| | | | | | | | | | | | | | | | | | Prior to this commit, there was a stash profile in the site dir of this control-repo. After this commit, the profile has been moved to it's own repo where it can be used more generally and not tightly coupled to this repository.
| * Move gitlab profile out to its own 'profile' moduleNick Walker 2016-03-243-29/+4
| | | | | | | | | | | | | | | | | | | | | | | | Prior to this commit, there was a gitlab profile in the site dir of this control-repo. After this commit, the profile has been moved to it's own repo where it can be used more generally and not tightly coupled to this repository. As a result, the gitlab role has been removed from this repository as well.
| * Move puppetmaster profile to rampup_profile_puppetmaster moduleNick Walker 2016-03-234-64/+5
|/ | | | | | | | Prior to this commit, the puppetmaster profile was embedded in this control-repo. After this commit, the puppetmaster profile is moved out into its own module.
* Update npwalker/pe_code_manager_webhook to 1.0.3Nick Walker 2016-03-231-1/+1
|
* Clean up some stale filesNick Walker 2016-03-232-19/+0
| | | | | | | | | | Prior to this commit, these two files were laying around but not used. The code manager template was missed when the code was moved into a module and the function was added a while ago but then never put to use. After this commit, the codebase is a little lighter without these stale files.
* Merge pull request #22 from npwalker/breakout_git_webhook_into_a_moduleGary Larizza 2016-03-179-287/+11
|\ | | | | Move profile::git_webhook into seperate module pe_code_manager_webhook
| * Update to pe_code_manager_webhook v1.0.2Nick Walker 2016-03-171-1/+1
| |
| * Update to pe_code_manager_wehbook v1.0.1Nick Walker 2016-03-171-1/+1
| |
| * Update to pe_code_manager_webhook v1.0.0Nick Walker 2016-03-171-8/+9
| | | | | | | | | | | | | | | | | | | | Prior to this commit, we were using a pre-release version of the pe_code_manager_webhook module in order to test that simply re-namespacing the module form a profile to a module worked as expected. After this commit, we use the official 1.0.0 relase of the module that includes a few changes that make it more versatile.
| * Move profile::git_webhook into seperate module pe_code_manager_webhookNick Walker 2016-03-179-282/+5
|/ | | | | | | | | | | | | | | | | | | | | Prior to this commit the functionality to setup the either code manager or zack/r10k was tightly coupled to this control-repo. In an effort to make that functionality useful to more people we're splitting it into a dedicated module. After this commit, the pe_code_manager_webhook module will contain all logic around setting up the webhook while this control-repo will still gloss over the details needed to get everything in PE setup correctly to use that module. This commit removes the files associated with the profile including some custom functions that were only there to make it work. This commit removes the all_in_one_pe_2015_2 role as it was exactly the same as the all_in_one_pe role. This commit modifies all_in_one_pe to use the pe_code_manager_webhook module instead of the profile.
* Merge pull request #18 from stjeanp/productionNate McCurdy 2016-03-152-13/+1
|\ | | | | Fixed code so hunner/hiera can be pulled from forge
| * Changed :latest to 2.0.1 for hunner/hieraPatrick St. Jean 2016-02-041-1/+1
| |
| * Fixed code so hunner/hiera can be pulled from forgePatrick St. Jean 2016-02-042-13/+1
| |
* | Merge pull request #20 from npwalker/disable_max_requests_per_instance_settingGary Larizza 2016-02-251-1/+1
|\ \ | | | | | | Disable max-requests-per-instance to mitigate hiera-eyaml mem leak
| * | Disable max-requests-per-instance to mitigate hiera-eyaml mem leakNick Walker 2016-02-241-1/+1
| |/ | | | | | | | | | | | | | | | | Hiera-eyaml currently causes a memory leak in puppetsever when max-requests-per-instnace is enabled. So, defaulting to disabling max-requests-per-instance. https://tickets.puppetlabs.com/browse/SERVER-1154 https://github.com/TomPoulton/hiera-eyaml/issues/163