From bae6c8ec6721d84fe55191690e0388e0378b8837 Mon Sep 17 00:00:00 2001 From: Aaron Hicks Date: Mon, 22 Jul 2013 16:20:02 +1200 Subject: [PATCH 01/36] trying using the shell provider... --- manifests/repo.pp | 44 ++++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/manifests/repo.pp b/manifests/repo.pp index 2c91f96..5dc91aa 100644 --- a/manifests/repo.pp +++ b/manifests/repo.pp @@ -63,38 +63,42 @@ } exec {"git_repo_${name}": - command => $init_cmd, - user => $owner, - creates => $creates, - require => Package[$git::params::package], - timeout => 600, + command => $init_cmd, + user => $owner, + provider => shell, + creates => $creates, + require => Package[$git::params::package], + timeout => 600, } # I think tagging works, but it's possible setting a tag and a branch will just fight. # It should change branches too... if $git_tag { exec {"git_${name}_co_tag": - user => $owner, - cwd => $path, - command => "${git::params::bin} checkout ${git_tag}", - unless => "${git::params::bin} describe --tag|${git::params::grep_cmd} -P '${git_tag}'", - require => Exec["git_repo_${name}"], + user => $owner, + cwd => $path, + provider => shell, + command => "${git::params::bin} checkout ${git_tag}", + unless => "${git::params::bin} describe --tag|${git::params::grep_cmd} -P '${git_tag}'", + require => Exec["git_repo_${name}"], } } elsif ! $bare { exec {"git_${name}_co_branch": - user => $owner, - cwd => $path, - command => "${git::params::bin} checkout ${branch}", - unless => "${git::params::bin} branch|${git::params::grep_cmd} -P '\\* ${branch}'", - require => Exec["git_repo_${name}"], + user => $owner, + cwd => $path, + provider => shell, + command => "${git::params::bin} checkout ${branch}", + unless => "${git::params::bin} branch|${git::params::grep_cmd} -P '\\* ${branch}'", + require => Exec["git_repo_${name}"], } if $update { exec {"git_${name}_pull": - user => $owner, - cwd => $path, - command => "${git::params::bin} reset --hard origin/${branch}", - unless => "${git::params::bin} fetch && ${git::params::bin} diff origin/${branch} --no-color --exit-code", - require => Exec["git_repo_${name}"], + user => $owner, + cwd => $path, + provider => shell, + command => "${git::params::bin} reset --hard origin/${branch}", + unless => "${git::params::bin} fetch && ${git::params::bin} diff origin/${branch} --no-color --exit-code", + require => Exec["git_repo_${name}"], } } } From d4694c94340b45517cc5937838e63d940cd15d4e Mon Sep 17 00:00:00 2001 From: Aaron Hicks Date: Tue, 23 Jul 2013 10:43:08 +1200 Subject: [PATCH 02/36] Reverting to using su as Exec strips environment variables required to run git as a user other than root. --- manifests/params.pp | 1 + manifests/repo.pp | 29 +++++++++++++++++------------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index 7ee199c..d0afd63 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -9,6 +9,7 @@ $svn_package = 'git-svn' $gui_package = 'git-gui' $bin = '/usr/bin/git' + $su_cmd = '/bin/su' if $::operatingsystem =~ /^(Debian|Ubuntu)$/ and versioncmp($::operatingsystemrelease, "12") < 0 { $package = 'git-core' }else{ diff --git a/manifests/repo.pp b/manifests/repo.pp index 5dc91aa..2d12c2c 100644 --- a/manifests/repo.pp +++ b/manifests/repo.pp @@ -32,6 +32,14 @@ validate_bool($bare, $update) + if $owner != 'root' { + $su_do = "${git::params::su_cmd} - ${owner} -c \"" + $su_end = "\"" + } else { + $su_do = '' + $su_end = '' + } + if $branch { $real_branch = $branch } else { @@ -39,12 +47,12 @@ } if $source { - $init_cmd = "${git::params::bin} clone -b ${real_branch} ${source} ${path} --recursive" + $init_cmd = "${su_do}${git::params::bin} clone -b ${real_branch} ${source} ${path} --recursive${su_end}" } else { if $bare { - $init_cmd = "${git::params::bin} init --bare ${path}" + $init_cmd = "${su_do}${git::params::bin} init --bare ${path}${su_end}" } else { - $init_cmd = "${git::params::bin} init ${path}" + $init_cmd = "${su_do}${git::params::bin} init ${path}${su_end}" } } @@ -75,29 +83,26 @@ # It should change branches too... if $git_tag { exec {"git_${name}_co_tag": - user => $owner, cwd => $path, provider => shell, - command => "${git::params::bin} checkout ${git_tag}", - unless => "${git::params::bin} describe --tag|${git::params::grep_cmd} -P '${git_tag}'", + command => "${su_do}${git::params::bin} checkout ${git_tag}${su_end}", + unless => "${su_do}${git::params::bin} describe --tag|${git::params::grep_cmd} -P '${git_tag}'${su_end}", require => Exec["git_repo_${name}"], } } elsif ! $bare { exec {"git_${name}_co_branch": - user => $owner, cwd => $path, provider => shell, - command => "${git::params::bin} checkout ${branch}", - unless => "${git::params::bin} branch|${git::params::grep_cmd} -P '\\* ${branch}'", + command => "${su_do}${git::params::bin} checkout ${branch}${su_end}", + unless => "${su_do}${git::params::bin} branch|${git::params::grep_cmd} -P '\\* ${branch}'${su_end}", require => Exec["git_repo_${name}"], } if $update { exec {"git_${name}_pull": - user => $owner, cwd => $path, provider => shell, - command => "${git::params::bin} reset --hard origin/${branch}", - unless => "${git::params::bin} fetch && ${git::params::bin} diff origin/${branch} --no-color --exit-code", + command => "${su_do}${git::params::bin} reset --hard origin/${branch}${su_end}", + unless => "${su_do}${git::params::bin} fetch && ${git::params::bin} diff origin/${branch} --no-color --exit-code${su_end}", require => Exec["git_repo_${name}"], } } From 608f92d61af40d7ea7b2a5737e8847f6687f1f42 Mon Sep 17 00:00:00 2001 From: Aaron Hicks Date: Tue, 23 Jul 2013 11:08:45 +1200 Subject: [PATCH 03/36] -l works? --- manifests/repo.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/repo.pp b/manifests/repo.pp index 2d12c2c..c0a6d34 100644 --- a/manifests/repo.pp +++ b/manifests/repo.pp @@ -33,7 +33,7 @@ validate_bool($bare, $update) if $owner != 'root' { - $su_do = "${git::params::su_cmd} - ${owner} -c \"" + $su_do = "${git::params::su_cmd} -l ${owner} -c \"" $su_end = "\"" } else { $su_do = '' From 9d7b47b44fab8e3420e5320f67db5207191eac7c Mon Sep 17 00:00:00 2001 From: Aaron Hicks Date: Tue, 23 Jul 2013 12:20:13 +1200 Subject: [PATCH 04/36] update README noting EOL of this module! --- README.markdown | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.markdown b/README.markdown index b04574e..93e8f35 100644 --- a/README.markdown +++ b/README.markdown @@ -1,6 +1,8 @@ # puppet-git ============ +**WARNING** Depreciated, changes to how Puppet sets up the environment variables with `exec` resources means this module no longer works as intended when creating repositories as any user other than root. It is recommended that the Puppetlabs vcsrepo module is used instead: https://github.com/puppetlabs/puppetlabs-vcsrepo + A puppet module for managing git resources # To install into puppet From 8a94bb936aef1830fff5584b2e0368be97c9d8d9 Mon Sep 17 00:00:00 2001 From: Aaron Hicks Date: Mon, 27 Aug 2012 16:30:40 +1200 Subject: [PATCH 05/36] Update README, created Windows Powershell script to create a Modulefile with a new author name --- Modulefile => Modulefile.orig | 0 README | 3 - README.markdown | 17 +++++ README1st.markdown | 124 ++++++++++++++++++++++++++++++++++ setauthor.ps1 | 8 +++ 5 files changed, 149 insertions(+), 3 deletions(-) rename Modulefile => Modulefile.orig (100%) delete mode 100644 README create mode 100644 README.markdown create mode 100644 README1st.markdown create mode 100644 setauthor.ps1 diff --git a/Modulefile b/Modulefile.orig similarity index 100% rename from Modulefile rename to Modulefile.orig diff --git a/README b/README deleted file mode 100644 index b1d08df..0000000 --- a/README +++ /dev/null @@ -1,3 +0,0 @@ -blank - -This is the blank module. diff --git a/README.markdown b/README.markdown new file mode 100644 index 0000000..51deb40 --- /dev/null +++ b/README.markdown @@ -0,0 +1,17 @@ +# blank + +This is a blank puppet module. + +*NOTE:* Check README1st.markdown for usage of the blank puppet module template. + +# Licensing + +Update your license details here. + +# Attribution + +This module is derived from the puppet-blank module by Aaron Hicks (aethylred@gmail.com) + +* https://github.com/Aethylred/puppet-blank + +Creative Commons Licence
This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License \ No newline at end of file diff --git a/README1st.markdown b/README1st.markdown new file mode 100644 index 0000000..704b089 --- /dev/null +++ b/README1st.markdown @@ -0,0 +1,124 @@ +# blank + +This is a blank puppet module. + +# Usage + +Use this module to start a new blank puppet module with all the required components ready for submitting to Puppet Forge. + +## Create a new blank module + +1. Clone this repository: + +``` +git clone -o puppet-blank -b master git://github.com/Aethylred/puppet-blank.git /path/to/new/repository +``` +2. Use the `unblank.ps1` script to customise the blank template +3. Delete the `.orig` templates +4. Add a new `origin` remote + +``` +git remote add origin git@a.git.repo:reponame.git +``` + +## Windows scripts + +Provided are some Powershell scripts that can be used to manage the blank puppet module template. + +## Enable execution of unsigned scripts + +Powershell will not run unsigned scripts by default, this can be enabled by executing the following command in an Administrator Powershell. This is required before any of the other powershell scripts will run. + +1. Click *Start* menu +2. Type "powershell" in the *Search programs and files* box, do not press enter. +3. When *Powershell* shows up in the search results, right click and select *Run as administrator* +4. Windows UAC may ask for permission to run as an administrator, click *Yes* +5. Run the following command in the administrator Powershell: + +``` +set-executionpolicy remotesigned +``` +6. Press *Enter* again to confirm the policy change + +## Change author and module + +This updates the author and module name using the `.orig` templates. This script can be re-run, creating new templates. This may not be advisable in later stages of module development. + +1. Start Powershell in the blank module directory +2. Run the `unblank.ps1` script: + +``` +.\unblank.ps1 newauthor newmodule +``` +3. Add the newly created files to the git version control: +``` +git add Modulefile manifests\init.pp tests\init.pp +``` +4. Commit these changes to git: +``` +git commit -am "Unblanked module with newauthor and newmodule" +``` +5. Add new remote repository: +``` +git remote add origin git@git.repo.server:repository.git +``` +6. Push changes to origin: +``` +git push origin master +``` +7. The new module is ready for further development + +## There's been an update to puppet-blank + +Just merge from the puppet-blank remote, though conflicts will be expected: +``` +git pull puppet-blank master +``` + +## Cleaning up the puppet-blank files +1. Start Powershell in the blank module directory +2. Run the cleanup script: +`.\cleanup.ps1` +3. Commit the changes to git: +``` +git commit -am "Cleaned up with the puppet-blank cleanup script" +``` +4. Push changes to remote: +``` +git push origin master +``` +**NOTE:** The cleanup script is *destructive* and will delete several files, including itself. +**NOTE:** The puppet-blank remote is read-only, it should not be possible to push to it. + +## Prepare a module for submission to Puppet Forge + +1. To perform this step, the module will need to be cloned to a Linux server where puppet has been installed, and that the `UNKNOWN` entries in the `Modulefile` have been corrected. +2. in the parent directory to the module, build the module metadata where the module is in the directory `puppet-module`: +``` +puppet module build puppet-module +``` +3. Submit the resulting tarball to Puppet Forge as per: +http://docs.puppetlabs.com/puppet/2.7/reference/modules_publishing.html + +# Frequently Asked Questions + +More like questions that should be asked. + +## Why not use the puppet module generator? + +This module started with the standard module generation using + +``` +puppet module generate author blank +``` +...so why not continue to use it? + +This module is intended for: + +1. Writing a module in an environment where puppet is not or can not be installed + +2. Use as a starting point for a collection of modules and prepopulated with things like licensing, boiler plate, pictures of cats, etc. etc. + +## Why Windows powershell scripts? + +My $work environment is restricted to using Windows 7, so I required scripts that run under Windows 7. I used Powershell because it has regular expressions, which made this much easier than `.bat` batch files. \ No newline at end of file diff --git a/setauthor.ps1 b/setauthor.ps1 new file mode 100644 index 0000000..1dc41a1 --- /dev/null +++ b/setauthor.ps1 @@ -0,0 +1,8 @@ +Param($author) +if ($author -match "^\w+$") { + echo "Replacing author with $author..." + Get-Content Modulefile.orig | Foreach-Object {$_ -replace "aethylred", $author} | Set-Content Modulefile + echo "New Modulefile created" +} else { + echo "Bad author '$author', must be a single word made up of word caracters [a-zA-Z_0-9]" +} \ No newline at end of file From fc40538a9ccc7e745687a0cee8acba2c968acf6f Mon Sep 17 00:00:00 2001 From: Aaron Hicks Date: Tue, 28 Aug 2012 11:29:48 +1200 Subject: [PATCH 06/36] Rework powershell script to update all the files from templates with .orig suffix. --- manifests/{init.pp => init.pp.orig} | 0 setauthor.ps1 | 8 -------- tests/{init.pp => init.pp.orig} | 0 unblank.ps1 | 28 ++++++++++++++++++++++++++++ 4 files changed, 28 insertions(+), 8 deletions(-) rename manifests/{init.pp => init.pp.orig} (100%) delete mode 100644 setauthor.ps1 rename tests/{init.pp => init.pp.orig} (100%) create mode 100644 unblank.ps1 diff --git a/manifests/init.pp b/manifests/init.pp.orig similarity index 100% rename from manifests/init.pp rename to manifests/init.pp.orig diff --git a/setauthor.ps1 b/setauthor.ps1 deleted file mode 100644 index 1dc41a1..0000000 --- a/setauthor.ps1 +++ /dev/null @@ -1,8 +0,0 @@ -Param($author) -if ($author -match "^\w+$") { - echo "Replacing author with $author..." - Get-Content Modulefile.orig | Foreach-Object {$_ -replace "aethylred", $author} | Set-Content Modulefile - echo "New Modulefile created" -} else { - echo "Bad author '$author', must be a single word made up of word caracters [a-zA-Z_0-9]" -} \ No newline at end of file diff --git a/tests/init.pp b/tests/init.pp.orig similarity index 100% rename from tests/init.pp rename to tests/init.pp.orig diff --git a/unblank.ps1 b/unblank.ps1 new file mode 100644 index 0000000..14fb6d6 --- /dev/null +++ b/unblank.ps1 @@ -0,0 +1,28 @@ +Param($author,$module) +if ($author -match "^\w+$") { + if ($module -match "^\w+$") { + echo "Update Modulefile..." + $modulefile = Get-Content Modulefile.orig + $modulefile = Foreach-Object {$modulefile -replace "aethylred", $author} + $modulefile = Foreach-Object {$modulefile -replace "blank", $module} + Set-Content Modulefile $modulefile + echo "Modulefile updated." + + echo "Update manifests/init.pp..." + $initfile = Get-Content manifests/init.pp.orig + $initfile = Foreach-Object {$initfile -replace "blank", $module} + Set-Content manifests/init.pp $initfile + echo "manifests/init.pp updated." + + echo "Update tests\init.pp..." + $testfile = Get-Content tests/init.pp.orig + $testfile = Foreach-Object {$testfile -replace "blank", $module} + Set-Content tests/init.pp $testfile + echo "tests/init.pp updated." + + } else { + throw "ERROR: Bad module parameter '$module', must be a single word made up of word caracters [a-zA-Z_0-9]" + } +} else { + throw "ERROR: Bad author parameter '$author', must be a single word made up of word caracters [a-zA-Z_0-9]" +} \ No newline at end of file From dc020c5a1a1eb9b25e472d9439e9f43c4bbae32e Mon Sep 17 00:00:00 2001 From: Aaron Hicks Date: Tue, 28 Aug 2012 16:54:18 +1200 Subject: [PATCH 07/36] First go with a cleanup script, be careful with it, git reset --hard HEAD should save you using the incorrect cmdlet --- cleanup.ps1 | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 cleanup.ps1 diff --git a/cleanup.ps1 b/cleanup.ps1 new file mode 100644 index 0000000..13a2353 --- /dev/null +++ b/cleanup.ps1 @@ -0,0 +1,12 @@ +echo "Cleaning up template..." +if ((Test-Path 'Modulefile') -and (Test-Path 'manifests/init.pp') -and (Test-Path 'tests/init.pp')){ + echo "Deleting .orig templates..." + Remove-Item 'Modulefile.orig' + Remove-Item 'manifests/init.pp.orig' + Remove-Item 'tests/init.pp.orig' + Remove-Item 'README1st.markdown' + Remove-Item 'unblank.ps1' + Remove-Item 'cleanup.ps1' +} else { + throw "ERROR: Cannot find required files, have you run unblank.ps1?" +} \ No newline at end of file From ab368a7ed01c4297536dfd8f9bcd5c8a5e0f6426 Mon Sep 17 00:00:00 2001 From: Aaron Hicks Date: Tue, 11 Sep 2012 16:50:08 +1200 Subject: [PATCH 08/36] Changed from the Creative Commons (which is not suitable for software) to the GPL See http://wiki.creativecommons.org/FAQ#Can_I_use_a_Creative_Commons_license_for_software.3F Attribute the Open Source Puppet project. --- README.markdown | 14 +- README1st.markdown | 92 +++--- gpl.txt | 674 +++++++++++++++++++++++++++++++++++++++++ manifests/init.pp.orig | 16 + tests/init.pp.orig | 14 + 5 files changed, 764 insertions(+), 46 deletions(-) create mode 100644 gpl.txt diff --git a/README.markdown b/README.markdown index 51deb40..a842054 100644 --- a/README.markdown +++ b/README.markdown @@ -14,4 +14,16 @@ This module is derived from the puppet-blank module by Aaron Hicks (aethylred@gm * https://github.com/Aethylred/puppet-blank -Creative Commons Licence
This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License \ No newline at end of file +This module has been developed for the use with Open Source Puppet (Apache 2.0 license) for automating server & service deployment. + +* http://puppetlabs.com/puppet/puppet-open-source/ + +# Gnu General Public License + +This file is part of the blank Puppet module. + +The blank Puppet module is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. + +The blank Puppet module is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along with the blank Puppet module. If not, see . \ No newline at end of file diff --git a/README1st.markdown b/README1st.markdown index 704b089..5c79803 100644 --- a/README1st.markdown +++ b/README1st.markdown @@ -9,17 +9,15 @@ Use this module to start a new blank puppet module with all the required compone ## Create a new blank module 1. Clone this repository: - -``` -git clone -o puppet-blank -b master git://github.com/Aethylred/puppet-blank.git /path/to/new/repository -``` + ``` + git clone -o puppet-blank -b master git://github.com/Aethylred/puppet-blank.git /path/to/new/repository + ``` 2. Use the `unblank.ps1` script to customise the blank template 3. Delete the `.orig` templates 4. Add a new `origin` remote - -``` -git remote add origin git@a.git.repo:reponame.git -``` + ``` + git remote add origin git@a.git.repo:reponame.git + ``` ## Windows scripts @@ -34,10 +32,9 @@ Powershell will not run unsigned scripts by default, this can be enabled by exec 3. When *Powershell* shows up in the search results, right click and select *Run as administrator* 4. Windows UAC may ask for permission to run as an administrator, click *Yes* 5. Run the following command in the administrator Powershell: - -``` -set-executionpolicy remotesigned -``` + ``` + set-executionpolicy remotesigned + ``` 6. Press *Enter* again to confirm the policy change ## Change author and module @@ -46,57 +43,61 @@ This updates the author and module name using the `.orig` templates. This script 1. Start Powershell in the blank module directory 2. Run the `unblank.ps1` script: - -``` -.\unblank.ps1 newauthor newmodule -``` + ``` + .\unblank.ps1 newauthor newmodule + ``` 3. Add the newly created files to the git version control: -``` -git add Modulefile manifests\init.pp tests\init.pp -``` + + ``` + git add Modulefile manifests\init.pp tests\init.pp + ``` 4. Commit these changes to git: -``` -git commit -am "Unblanked module with newauthor and newmodule" -``` + ``` + git commit -am "Unblanked module with newauthor and newmodule" + ``` 5. Add new remote repository: -``` -git remote add origin git@git.repo.server:repository.git -``` + ``` + git remote add origin git@git.repo.server:repository.git + ``` 6. Push changes to origin: -``` -git push origin master -``` + ``` + git push origin master + ``` 7. The new module is ready for further development ## There's been an update to puppet-blank Just merge from the puppet-blank remote, though conflicts will be expected: -``` -git pull puppet-blank master -``` + ``` + git pull puppet-blank master + ``` ## Cleaning up the puppet-blank files 1. Start Powershell in the blank module directory 2. Run the cleanup script: -`.\cleanup.ps1` + ``` + .\cleanup.ps1 + ``` 3. Commit the changes to git: -``` -git commit -am "Cleaned up with the puppet-blank cleanup script" -``` + ``` + git commit -am "Cleaned up with the puppet-blank cleanup script" + ``` 4. Push changes to remote: -``` -git push origin master -``` + ``` + git push origin master + ``` + **NOTE:** The cleanup script is *destructive* and will delete several files, including itself. + **NOTE:** The puppet-blank remote is read-only, it should not be possible to push to it. ## Prepare a module for submission to Puppet Forge 1. To perform this step, the module will need to be cloned to a Linux server where puppet has been installed, and that the `UNKNOWN` entries in the `Modulefile` have been corrected. 2. in the parent directory to the module, build the module metadata where the module is in the directory `puppet-module`: -``` -puppet module build puppet-module -``` + ``` + puppet module build puppet-module + ``` 3. Submit the resulting tarball to Puppet Forge as per: http://docs.puppetlabs.com/puppet/2.7/reference/modules_publishing.html @@ -107,10 +108,9 @@ More like questions that should be asked. ## Why not use the puppet module generator? This module started with the standard module generation using - -``` -puppet module generate author blank -``` + ``` + puppet module generate author-blank + ``` ...so why not continue to use it? This module is intended for: @@ -119,6 +119,8 @@ This module is intended for: 2. Use as a starting point for a collection of modules and prepopulated with things like licensing, boiler plate, pictures of cats, etc. etc. +3. Writing a module in an environment where `puppet module generate` doesn't work, i.e. Windows. + ## Why Windows powershell scripts? My $work environment is restricted to using Windows 7, so I required scripts that run under Windows 7. I used Powershell because it has regular expressions, which made this much easier than `.bat` batch files. \ No newline at end of file diff --git a/gpl.txt b/gpl.txt new file mode 100644 index 0000000..9e419e0 --- /dev/null +++ b/gpl.txt @@ -0,0 +1,674 @@ +GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. \ No newline at end of file diff --git a/manifests/init.pp.orig b/manifests/init.pp.orig index 5f9fb87..a376811 100644 --- a/manifests/init.pp.orig +++ b/manifests/init.pp.orig @@ -10,6 +10,22 @@ # # Sample Usage: # + +# This file is part of the blank Puppet module. +# +# The blank Puppet module is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# The blank Puppet module is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with the blank Puppet module. If not, see . + # [Remember: No empty lines between comments and class definition] class blank { diff --git a/tests/init.pp.orig b/tests/init.pp.orig index 2775393..75828d1 100644 --- a/tests/init.pp.orig +++ b/tests/init.pp.orig @@ -1 +1,15 @@ +# This file is part of the blank Puppet module. +# +# The blank Puppet module is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# The blank Puppet module is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with the blank Puppet module. If not, see . include blank From cc36221bd958e26d9965612bee387498826f46b9 Mon Sep 17 00:00:00 2001 From: Aaron Hicks Date: Tue, 11 Sep 2012 16:51:29 +1200 Subject: [PATCH 09/36] added a .gitignore --- .gitignore | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..92de487 --- /dev/null +++ b/.gitignore @@ -0,0 +1,30 @@ + +#ignore thumbnails created by windows +Thumbs.db +#Ignore files build by Visual Studio +*.obj +*.exe +*.pdb +*.user +*.aps +*.pch +*.vspscc +*_i.c +*_p.c +*.ncb +*.suo +*.tlb +*.tlh +*.bak +*.cache +*.ilk +*.log +[Bb]in +[Dd]ebug*/ +*.lib +*.sbr +obj/ +[Rr]elease*/ +_ReSharper*/ +[Tt]est[Rr]esult* +*~ \ No newline at end of file From dac4a5b55cd28431af4d168098875f520cd18d6e Mon Sep 17 00:00:00 2001 From: Aaron Hicks Date: Fri, 1 Mar 2013 13:37:18 +1300 Subject: [PATCH 10/36] update the instructions in README1st.markdown --- README1st.markdown | 47 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/README1st.markdown b/README1st.markdown index 5c79803..1fb1318 100644 --- a/README1st.markdown +++ b/README1st.markdown @@ -9,15 +9,23 @@ Use this module to start a new blank puppet module with all the required compone ## Create a new blank module 1. Clone this repository: + ``` git clone -o puppet-blank -b master git://github.com/Aethylred/puppet-blank.git /path/to/new/repository ``` -2. Use the `unblank.ps1` script to customise the blank template -3. Delete the `.orig` templates -4. Add a new `origin` remote +1. Use the `unblank.ps1` script to customise the blank template +1. Delete clean up blank with `cleanup.ps1` +1. Commit changes +1. Add a new `origin` remote: + ``` git remote add origin git@a.git.repo:reponame.git ``` +1. Push your changes: + + ``` + git push origin master + ``` ## Windows scripts @@ -31,18 +39,22 @@ Powershell will not run unsigned scripts by default, this can be enabled by exec 2. Type "powershell" in the *Search programs and files* box, do not press enter. 3. When *Powershell* shows up in the search results, right click and select *Run as administrator* 4. Windows UAC may ask for permission to run as an administrator, click *Yes* -5. Run the following command in the administrator Powershell: +5. Run the following command in the administrator PowerShell: + ``` set-executionpolicy remotesigned ``` 6. Press *Enter* again to confirm the policy change +**NOTE:** You may need to repeat this in both PowerShell and PowerShell (x86) on 64-bit systems. + ## Change author and module This updates the author and module name using the `.orig` templates. This script can be re-run, creating new templates. This may not be advisable in later stages of module development. 1. Start Powershell in the blank module directory 2. Run the `unblank.ps1` script: + ``` .\unblank.ps1 newauthor newmodule ``` @@ -52,37 +64,44 @@ This updates the author and module name using the `.orig` templates. This script git add Modulefile manifests\init.pp tests\init.pp ``` 4. Commit these changes to git: + ``` git commit -am "Unblanked module with newauthor and newmodule" ``` 5. Add new remote repository: + ``` git remote add origin git@git.repo.server:repository.git ``` 6. Push changes to origin: + ``` git push origin master ``` 7. The new module is ready for further development -## There's been an update to puppet-blank +## Updating puppet-blank Just merge from the puppet-blank remote, though conflicts will be expected: - ``` - git pull puppet-blank master - ``` + +``` +git pull puppet-blank master +``` ## Cleaning up the puppet-blank files 1. Start Powershell in the blank module directory 2. Run the cleanup script: + ``` .\cleanup.ps1 ``` 3. Commit the changes to git: + ``` git commit -am "Cleaned up with the puppet-blank cleanup script" ``` 4. Push changes to remote: + ``` git push origin master ``` @@ -95,11 +114,12 @@ Just merge from the puppet-blank remote, though conflicts will be expected: 1. To perform this step, the module will need to be cloned to a Linux server where puppet has been installed, and that the `UNKNOWN` entries in the `Modulefile` have been corrected. 2. in the parent directory to the module, build the module metadata where the module is in the directory `puppet-module`: + ``` puppet module build puppet-module ``` -3. Submit the resulting tarball to Puppet Forge as per: -http://docs.puppetlabs.com/puppet/2.7/reference/modules_publishing.html +3. Submit the resulting tarball to Puppet Forge as per [their instructions] +(http://docs.puppetlabs.com/puppet/2.7/reference/modules_publishing.html) # Frequently Asked Questions @@ -107,7 +127,8 @@ More like questions that should be asked. ## Why not use the puppet module generator? -This module started with the standard module generation using +This module started with the standard module generation using + ``` puppet module generate author-blank ``` @@ -116,11 +137,9 @@ This module started with the standard module generation using This module is intended for: 1. Writing a module in an environment where puppet is not or can not be installed - 2. Use as a starting point for a collection of modules and prepopulated with things like licensing, boiler plate, pictures of cats, etc. etc. - 3. Writing a module in an environment where `puppet module generate` doesn't work, i.e. Windows. ## Why Windows powershell scripts? -My $work environment is restricted to using Windows 7, so I required scripts that run under Windows 7. I used Powershell because it has regular expressions, which made this much easier than `.bat` batch files. \ No newline at end of file +My `$work` environment is restricted to using Windows 7, so I required scripts that run under Windows 7. I used Powershell because it has Perl-like regular expressions, which made this much easier than `.bat` batch files. \ No newline at end of file From 2caa71871280e7261ef15ea4b144064a61800d86 Mon Sep 17 00:00:00 2001 From: Aaron Hicks Date: Tue, 23 Apr 2013 10:12:35 +1200 Subject: [PATCH 11/36] This update should prime the puppet-blank for testing with Travis CI https://travis-ci.org/ --- .fixtures.yml.orig | 6 ++++++ .travis.yml | 27 +++++++++++++++++++++++++++ Gemfile | 13 +++++++++++++ Rakefile | 1 + cleanup.ps1 | 3 ++- metadata.json | 12 ------------ unblank.ps1 | 7 +++++++ 7 files changed, 56 insertions(+), 13 deletions(-) create mode 100644 .fixtures.yml.orig create mode 100644 .travis.yml create mode 100644 Gemfile create mode 100644 Rakefile delete mode 100644 metadata.json diff --git a/.fixtures.yml.orig b/.fixtures.yml.orig new file mode 100644 index 0000000..8f78ed0 --- /dev/null +++ b/.fixtures.yml.orig @@ -0,0 +1,6 @@ +fixtures: + repositories: + stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib.git" + firewall: "git://github.com/puppetlabs/puppetlabs-firewall.git" + symlinks: + blank: "#{source_dir}" \ No newline at end of file diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..5a6f345 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,27 @@ +language: ruby +bundler_args: --without development +script: "bundle exec rake spec SPEC_OPTS='--format documentation'" +rvm: + - 1.8.7 + - 1.9.3 + - ruby-head +env: + - PUPPET_GEM_VERSION="~> 2.6.0" + - PUPPET_GEM_VERSION="~> 2.7.0" + - PUPPET_GEM_VERSION="~> 3.0.0" + - PUPPET_GEM_VERSION="~> 3.1.0" +matrix: + allow_failures: + - rvm: ruby-head + - env: PUPPET_GEM_VERSION="~> 2.6.0" + exclude: + - rvm: 1.9.3 + env: PUPPET_GEM_VERSION="~> 2.7.0" + - rvm: ruby-head + env: PUPPET_GEM_VERSION="~> 2.7.0" + - rvm: 1.9.3 + env: PUPPET_GEM_VERSION="~> 2.6.0" + - rvm: ruby-head + env: PUPPET_GEM_VERSION="~> 2.6.0" +notifications: + email: false \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..1f68c49 --- /dev/null +++ b/Gemfile @@ -0,0 +1,13 @@ +source 'https://rubygems.org' + +group :development, :test do + gem 'puppetlabs_spec_helper', :require => false +end + +if puppetversion = ENV['PUPPET_GEM_VERSION'] + gem 'puppet', puppetversion, :require => false +else + gem 'puppet', :require => false +end + +# vim:ft=ruby \ No newline at end of file diff --git a/Rakefile b/Rakefile new file mode 100644 index 0000000..cd3d379 --- /dev/null +++ b/Rakefile @@ -0,0 +1 @@ +require 'puppetlabs_spec_helper/rake_tasks' diff --git a/cleanup.ps1 b/cleanup.ps1 index 13a2353..142f031 100644 --- a/cleanup.ps1 +++ b/cleanup.ps1 @@ -1,10 +1,11 @@ echo "Cleaning up template..." -if ((Test-Path 'Modulefile') -and (Test-Path 'manifests/init.pp') -and (Test-Path 'tests/init.pp')){ +if ((Test-Path 'Modulefile') -and (Test-Path 'manifests/init.pp') -and (Test-Path 'tests/init.pp') -and (Test-Path '.fixtures.yml')){ echo "Deleting .orig templates..." Remove-Item 'Modulefile.orig' Remove-Item 'manifests/init.pp.orig' Remove-Item 'tests/init.pp.orig' Remove-Item 'README1st.markdown' + Remove-Item '.fixtures.yml.orig' Remove-Item 'unblank.ps1' Remove-Item 'cleanup.ps1' } else { diff --git a/metadata.json b/metadata.json deleted file mode 100644 index 8ce7797..0000000 --- a/metadata.json +++ /dev/null @@ -1,12 +0,0 @@ -/* -+-----------------------------------------------------------------------+ -| | -| ==> DO NOT EDIT THIS FILE! <== | -| | -| You should edit the `Modulefile` and run `puppet-module build` | -| to generate the `metadata.json` file for your releases. | -| | -+-----------------------------------------------------------------------+ -*/ - -{} diff --git a/unblank.ps1 b/unblank.ps1 index 14fb6d6..765d407 100644 --- a/unblank.ps1 +++ b/unblank.ps1 @@ -20,6 +20,13 @@ if ($author -match "^\w+$") { Set-Content tests/init.pp $testfile echo "tests/init.pp updated." + echo "Update .fixtures.yml..." + $modulefile = Get-Content .fixtures.yaml.orig + $modulefile = Foreach-Object {$modulefile -replace "aethylred", $author} + $modulefile = Foreach-Object {$modulefile -replace "blank", $module} + Set-Content .fixtures.yaml $modulefile + echo ".fixtures.yml updated." + } else { throw "ERROR: Bad module parameter '$module', must be a single word made up of word caracters [a-zA-Z_0-9]" } From c05f2703604311dbc19bff3129aab05ccd0db3d7 Mon Sep 17 00:00:00 2001 From: Aaron Hicks Date: Tue, 23 Apr 2013 10:13:51 +1200 Subject: [PATCH 12/36] change hard tabs to spaces --- cleanup.ps1 | 16 ++++++++-------- unblank.ps1 | 40 ++++++++++++++++++++-------------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/cleanup.ps1 b/cleanup.ps1 index 142f031..b202e80 100644 --- a/cleanup.ps1 +++ b/cleanup.ps1 @@ -1,13 +1,13 @@ echo "Cleaning up template..." if ((Test-Path 'Modulefile') -and (Test-Path 'manifests/init.pp') -and (Test-Path 'tests/init.pp') -and (Test-Path '.fixtures.yml')){ - echo "Deleting .orig templates..." - Remove-Item 'Modulefile.orig' - Remove-Item 'manifests/init.pp.orig' - Remove-Item 'tests/init.pp.orig' - Remove-Item 'README1st.markdown' + echo "Deleting .orig templates..." + Remove-Item 'Modulefile.orig' + Remove-Item 'manifests/init.pp.orig' + Remove-Item 'tests/init.pp.orig' + Remove-Item 'README1st.markdown' Remove-Item '.fixtures.yml.orig' - Remove-Item 'unblank.ps1' - Remove-Item 'cleanup.ps1' + Remove-Item 'unblank.ps1' + Remove-Item 'cleanup.ps1' } else { - throw "ERROR: Cannot find required files, have you run unblank.ps1?" + throw "ERROR: Cannot find required files, have you run unblank.ps1?" } \ No newline at end of file diff --git a/unblank.ps1 b/unblank.ps1 index 765d407..0006ca0 100644 --- a/unblank.ps1 +++ b/unblank.ps1 @@ -1,24 +1,24 @@ Param($author,$module) if ($author -match "^\w+$") { - if ($module -match "^\w+$") { - echo "Update Modulefile..." - $modulefile = Get-Content Modulefile.orig - $modulefile = Foreach-Object {$modulefile -replace "aethylred", $author} - $modulefile = Foreach-Object {$modulefile -replace "blank", $module} - Set-Content Modulefile $modulefile - echo "Modulefile updated." + if ($module -match "^\w+$") { + echo "Update Modulefile..." + $modulefile = Get-Content Modulefile.orig + $modulefile = Foreach-Object {$modulefile -replace "aethylred", $author} + $modulefile = Foreach-Object {$modulefile -replace "blank", $module} + Set-Content Modulefile $modulefile + echo "Modulefile updated." - echo "Update manifests/init.pp..." - $initfile = Get-Content manifests/init.pp.orig - $initfile = Foreach-Object {$initfile -replace "blank", $module} - Set-Content manifests/init.pp $initfile - echo "manifests/init.pp updated." + echo "Update manifests/init.pp..." + $initfile = Get-Content manifests/init.pp.orig + $initfile = Foreach-Object {$initfile -replace "blank", $module} + Set-Content manifests/init.pp $initfile + echo "manifests/init.pp updated." - echo "Update tests\init.pp..." - $testfile = Get-Content tests/init.pp.orig - $testfile = Foreach-Object {$testfile -replace "blank", $module} - Set-Content tests/init.pp $testfile - echo "tests/init.pp updated." + echo "Update tests\init.pp..." + $testfile = Get-Content tests/init.pp.orig + $testfile = Foreach-Object {$testfile -replace "blank", $module} + Set-Content tests/init.pp $testfile + echo "tests/init.pp updated." echo "Update .fixtures.yml..." $modulefile = Get-Content .fixtures.yaml.orig @@ -27,9 +27,9 @@ if ($author -match "^\w+$") { Set-Content .fixtures.yaml $modulefile echo ".fixtures.yml updated." - } else { - throw "ERROR: Bad module parameter '$module', must be a single word made up of word caracters [a-zA-Z_0-9]" - } + } else { + throw "ERROR: Bad module parameter '$module', must be a single word made up of word caracters [a-zA-Z_0-9]" + } } else { throw "ERROR: Bad author parameter '$author', must be a single word made up of word caracters [a-zA-Z_0-9]" } \ No newline at end of file From 1deb8d04cec5fd57614f20d98dab2212bdd4bf08 Mon Sep 17 00:00:00 2001 From: Aaron Hicks Date: Wed, 8 May 2013 12:09:35 +1200 Subject: [PATCH 13/36] Fix typos in unblank and tune Travis setup --- .fixtures.yml.orig | 1 - spec/spec_helper.rb | 19 +------------------ unblank.ps1 | 4 ++-- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/.fixtures.yml.orig b/.fixtures.yml.orig index 8f78ed0..78fcd83 100644 --- a/.fixtures.yml.orig +++ b/.fixtures.yml.orig @@ -1,6 +1,5 @@ fixtures: repositories: stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib.git" - firewall: "git://github.com/puppetlabs/puppetlabs-firewall.git" symlinks: blank: "#{source_dir}" \ No newline at end of file diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index a4aeeae..2c6f566 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,18 +1 @@ -require 'pathname' -dir = Pathname.new(__FILE__).parent -$LOAD_PATH.unshift(dir, dir + 'lib', dir + '../lib') - -require 'mocha' -require 'puppet' -gem 'rspec', '=1.2.9' -require 'spec/autorun' - -Spec::Runner.configure do |config| - config.mock_with :mocha -end - -# We need this because the RAL uses 'should' as a method. This -# allows us the same behaviour but with a different method name. -class Object - alias :must :should -end +require 'puppetlabs_spec_helper/module_spec_helper' diff --git a/unblank.ps1 b/unblank.ps1 index 0006ca0..c91f66f 100644 --- a/unblank.ps1 +++ b/unblank.ps1 @@ -21,10 +21,10 @@ if ($author -match "^\w+$") { echo "tests/init.pp updated." echo "Update .fixtures.yml..." - $modulefile = Get-Content .fixtures.yaml.orig + $modulefile = Get-Content .fixtures.yml.orig $modulefile = Foreach-Object {$modulefile -replace "aethylred", $author} $modulefile = Foreach-Object {$modulefile -replace "blank", $module} - Set-Content .fixtures.yaml $modulefile + Set-Content .fixtures.yml $modulefile echo ".fixtures.yml updated." } else { From 2eb5bc07576af0afa327094bf81878d4bcf49989 Mon Sep 17 00:00:00 2001 From: Aaron Hicks Date: Mon, 19 Aug 2013 16:04:37 +1200 Subject: [PATCH 14/36] New Version! 0.1.0 --- .gitignore | 1 + Modulefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 92de487..eb1a520 100644 --- a/.gitignore +++ b/.gitignore @@ -26,5 +26,6 @@ Thumbs.db obj/ [Rr]elease*/ _ReSharper*/ +pkg/* [Tt]est[Rr]esult* *~ \ No newline at end of file diff --git a/Modulefile b/Modulefile index 338a703..5f19f59 100644 --- a/Modulefile +++ b/Modulefile @@ -1,5 +1,5 @@ name 'nesi-git' -version '0.0.1' +version '0.1.0' source 'https://github.com/nesi/puppet-git' author 'Aaron Hicks' license 'GPL3' From 7a4ea9515f2e7f734795dbfe22b4336e559222ec Mon Sep 17 00:00:00 2001 From: Aaron Hicks Date: Thu, 29 Aug 2013 13:19:21 +1200 Subject: [PATCH 15/36] Add .project to .gitignore for Eclipse users --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 92de487..89251ef 100644 --- a/.gitignore +++ b/.gitignore @@ -27,4 +27,5 @@ obj/ [Rr]elease*/ _ReSharper*/ [Tt]est[Rr]esult* -*~ \ No newline at end of file +.project +*~ From 655b04dcb4fc8bced65bc7ed7f36af280a979aa0 Mon Sep 17 00:00:00 2001 From: Aaron Hicks Date: Fri, 6 Sep 2013 19:47:33 +1200 Subject: [PATCH 16/36] add Eclipse/Geppetto .project file to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 92de487..e8333e0 100644 --- a/.gitignore +++ b/.gitignore @@ -27,4 +27,5 @@ obj/ [Rr]elease*/ _ReSharper*/ [Tt]est[Rr]esult* +.project *~ \ No newline at end of file From 599a0a3087dd99392eaddfaf49d6a8504e8bf5b5 Mon Sep 17 00:00:00 2001 From: Aaron Hicks Date: Wed, 11 Sep 2013 11:44:26 +1200 Subject: [PATCH 17/36] Update travis config to use rspec-puppet-augeas https://github.com/domcleal/rspec-puppet-augeas --- .travis.yml | 2 ++ Gemfile | 2 ++ spec/spec_helper.rb | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/.travis.yml b/.travis.yml index 5a6f345..eff1a0b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,8 @@ language: ruby bundler_args: --without development script: "bundle exec rake spec SPEC_OPTS='--format documentation'" +before_install: + - sudo apt-get install -qq augeas-tools augeas-lenses libaugeas-dev rvm: - 1.8.7 - 1.9.3 diff --git a/Gemfile b/Gemfile index 1f68c49..8e87fda 100644 --- a/Gemfile +++ b/Gemfile @@ -6,6 +6,8 @@ end if puppetversion = ENV['PUPPET_GEM_VERSION'] gem 'puppet', puppetversion, :require => false + gem 'ruby-augeas', :require => false + gem 'rspec-puppet-augeas', require => false else gem 'puppet', :require => false end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 2c6f566..76b8923 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1 +1,5 @@ require 'puppetlabs_spec_helper/module_spec_helper' +require 'rspec-puppet-augeas' +RSpec.configure do |c| + c.augeas_fixtures = File.join(File.dirname(File.expand_path(__FILE__)), 'fixtures', 'augeas') +end \ No newline at end of file From 1b020c75382143a4799ad5fb7c32d44dc76516ac Mon Sep 17 00:00:00 2001 From: Aaron Hicks Date: Wed, 11 Sep 2013 11:54:15 +1200 Subject: [PATCH 18/36] update documentation to include rspec-puppet-augeas --- README.markdown | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/README.markdown b/README.markdown index a842054..85d44cd 100644 --- a/README.markdown +++ b/README.markdown @@ -10,6 +10,8 @@ Update your license details here. # Attribution +## puppet-blank + This module is derived from the puppet-blank module by Aaron Hicks (aethylred@gmail.com) * https://github.com/Aethylred/puppet-blank @@ -18,6 +20,18 @@ This module has been developed for the use with Open Source Puppet (Apache 2.0 l * http://puppetlabs.com/puppet/puppet-open-source/ +## rspec-puppet-augeas + +This module includes the [Travis](https://travis-ci.org) configuration to use [`rspec-puppet-augeas`](https://github.com/domcleal/rspec-puppet-augeas) to test and verify changes made to files using the [`augeas` resource](http://docs.puppetlabs.com/references/latest/type.html#augeas) available in Puppet. Check the `rspec-puppet-augeas` [documentation](https://github.com/domcleal/rspec-puppet-augeas/blob/master/README.md) for usage. + +This will require a copy of the original input files to `spec/fixtures/augeas` using the same filesystem layout that the resource expects: + + $ tree spec/fixtures/augeas/ + spec/fixtures/augeas/ + `-- etc + `-- ssh + `-- sshd_config + # Gnu General Public License This file is part of the blank Puppet module. From 5f16330d2c4d41ee9b748068716a6897de92fe18 Mon Sep 17 00:00:00 2001 From: Aaron Hicks Date: Wed, 30 Oct 2013 14:51:08 +1300 Subject: [PATCH 19/36] Improve Travis setup now includes: - improved testing matrix - excludin unsupported ruby and puppet version combinations - syntax check for puppet 2.6.0 - syntax check for ruby --- .gitignore | 2 ++ .travis.yml | 20 +++++++++++++------- Gemfile | 13 +++++++++---- Rakefile | 23 +++++++++++++++++++++++ spec/spec.opts | 6 ++---- spec/spec_helper_system.rb | 26 ++++++++++++++++++++++++++ 6 files changed, 75 insertions(+), 15 deletions(-) create mode 100644 spec/spec_helper_system.rb diff --git a/.gitignore b/.gitignore index 89251ef..95b0d30 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,5 @@ _ReSharper*/ [Tt]est[Rr]esult* .project *~ +*.sublime-project +*.sublime-workspace diff --git a/.travis.yml b/.travis.yml index eff1a0b..599a3b8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,29 +1,35 @@ language: ruby bundler_args: --without development -script: "bundle exec rake spec SPEC_OPTS='--format documentation'" +script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'" before_install: - - sudo apt-get install -qq augeas-tools augeas-lenses libaugeas-dev + - sudo apt-get install -qq augeas-tools augeas-lenses libaugeas-dev libaugeas-ruby rvm: - 1.8.7 - 1.9.3 - - ruby-head + - 2.0.0 env: + matrix: - PUPPET_GEM_VERSION="~> 2.6.0" - PUPPET_GEM_VERSION="~> 2.7.0" - PUPPET_GEM_VERSION="~> 3.0.0" - PUPPET_GEM_VERSION="~> 3.1.0" + - PUPPET_GEM_VERSION="~> 3.2.0" + - PUPPET_GEM_VERSION="~> 3.3.1" matrix: allow_failures: - - rvm: ruby-head - env: PUPPET_GEM_VERSION="~> 2.6.0" exclude: - rvm: 1.9.3 env: PUPPET_GEM_VERSION="~> 2.7.0" - - rvm: ruby-head - env: PUPPET_GEM_VERSION="~> 2.7.0" - rvm: 1.9.3 env: PUPPET_GEM_VERSION="~> 2.6.0" - - rvm: ruby-head + - rvm: 2.0.0 env: PUPPET_GEM_VERSION="~> 2.6.0" + - rvm: 2.0.0 + env: PUPPET_GEM_VERSION="~> 2.7.0" + - rvm: 2.0.0 + env: PUPPET_GEM_VERSION="~> 3.0.0" + - rvm: 2.0.0 + env: PUPPET_GEM_VERSION="~> 3.1.0" notifications: email: false \ No newline at end of file diff --git a/Gemfile b/Gemfile index 8e87fda..dd6e6ed 100644 --- a/Gemfile +++ b/Gemfile @@ -1,15 +1,20 @@ source 'https://rubygems.org' group :development, :test do + gem 'rake', :require => false + gem 'rspec-puppet', :require => false gem 'puppetlabs_spec_helper', :require => false + gem 'ruby-augeas', :require => false + gem 'rspec-puppet-augeas', :require => false + gem 'rspec-system', :require => false + gem 'rspec-system-puppet', :require => false + gem 'puppet-lint', :require => false end if puppetversion = ENV['PUPPET_GEM_VERSION'] - gem 'puppet', puppetversion, :require => false - gem 'ruby-augeas', :require => false - gem 'rspec-puppet-augeas', require => false + gem 'puppet', puppetversion, :require => false else - gem 'puppet', :require => false + gem 'puppet', :require => false end # vim:ft=ruby \ No newline at end of file diff --git a/Rakefile b/Rakefile index cd3d379..268c50c 100644 --- a/Rakefile +++ b/Rakefile @@ -1 +1,24 @@ +require 'rubygems' require 'puppetlabs_spec_helper/rake_tasks' +require 'rspec-system/rake_task' +require 'puppet-lint/tasks/puppet-lint' +PuppetLint.configuration.send('disable_80chars') +PuppetLint.configuration.send('disable_class_parameter_defaults') +PuppetLint.configuration.send('disable_class_inherits_from_params_class') +PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"] + +desc "Check for puppet and ruby syntax errors." +task :validate do + if ENV['PUPPET_GEM_VERSION'] == '~> 2.6.0' + puppet_parse_command = 'puppet --parseonly --ignoreimport' + else + puppet_parse_command = 'puppet parser validate --noop' + end + Dir['manifests/**/*.pp'].each do |path| + sh "#{puppet_parse_command} #{path}" + end + ruby_parse_command = 'ruby -c' + Dir['spec/**/*.rb'].each do |path| + sh "#{ruby_parse_command} #{path}" + end +end diff --git a/spec/spec.opts b/spec/spec.opts index 91cd642..de653df 100644 --- a/spec/spec.opts +++ b/spec/spec.opts @@ -1,6 +1,4 @@ ---format -s +--format s --colour ---loadby -mtime +--loadby mtime --backtrace diff --git a/spec/spec_helper_system.rb b/spec/spec_helper_system.rb new file mode 100644 index 0000000..199c0ef --- /dev/null +++ b/spec/spec_helper_system.rb @@ -0,0 +1,26 @@ +require 'rspec-system/spec_helper' +require 'rspec-system-puppet/helpers' +require 'rspec-system-serverspec/helpers' +include Serverspec::Helper::RSpecSystem +include Serverspec::Helper::DetectOS +include RSpecSystemPuppet::Helpers + +RSpec.configure do |c| + # Project root + proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..')) + + # Enable colour + c.tty = true + + c.include RSpecSystemPuppet::Helpers + + # This is where we 'setup' the nodes before running our tests + c.before :suite do + # Install puppet + puppet_install + + # Install modules and dependencies + puppet_module_install(:source => proj_root, :module_name => 'puppet') + # shell('puppet module install puppetlabs-stdlib --version 2.4.0') + end +end \ No newline at end of file From 79cef1e7e39fa88b86db9b967893ec9518814026 Mon Sep 17 00:00:00 2001 From: Aaron Hicks Date: Wed, 30 Oct 2013 15:01:14 +1300 Subject: [PATCH 20/36] Cleanup blank remnants. --- .fixtures.yml.orig => .fixtures.yaml | 0 Modulefile.orig => Modulefile | 0 README1st.markdown | 145 --------------------------- cleanup.ps1 | 13 --- manifests/init.pp.orig | 33 ------ tests/init.pp.orig | 15 --- unblank.ps1 | 35 ------- 7 files changed, 241 deletions(-) rename .fixtures.yml.orig => .fixtures.yaml (100%) rename Modulefile.orig => Modulefile (100%) delete mode 100644 README1st.markdown delete mode 100644 cleanup.ps1 delete mode 100644 manifests/init.pp.orig delete mode 100644 tests/init.pp.orig delete mode 100644 unblank.ps1 diff --git a/.fixtures.yml.orig b/.fixtures.yaml similarity index 100% rename from .fixtures.yml.orig rename to .fixtures.yaml diff --git a/Modulefile.orig b/Modulefile similarity index 100% rename from Modulefile.orig rename to Modulefile diff --git a/README1st.markdown b/README1st.markdown deleted file mode 100644 index 1fb1318..0000000 --- a/README1st.markdown +++ /dev/null @@ -1,145 +0,0 @@ -# blank - -This is a blank puppet module. - -# Usage - -Use this module to start a new blank puppet module with all the required components ready for submitting to Puppet Forge. - -## Create a new blank module - -1. Clone this repository: - - ``` - git clone -o puppet-blank -b master git://github.com/Aethylred/puppet-blank.git /path/to/new/repository - ``` -1. Use the `unblank.ps1` script to customise the blank template -1. Delete clean up blank with `cleanup.ps1` -1. Commit changes -1. Add a new `origin` remote: - - ``` - git remote add origin git@a.git.repo:reponame.git - ``` -1. Push your changes: - - ``` - git push origin master - ``` - -## Windows scripts - -Provided are some Powershell scripts that can be used to manage the blank puppet module template. - -## Enable execution of unsigned scripts - -Powershell will not run unsigned scripts by default, this can be enabled by executing the following command in an Administrator Powershell. This is required before any of the other powershell scripts will run. - -1. Click *Start* menu -2. Type "powershell" in the *Search programs and files* box, do not press enter. -3. When *Powershell* shows up in the search results, right click and select *Run as administrator* -4. Windows UAC may ask for permission to run as an administrator, click *Yes* -5. Run the following command in the administrator PowerShell: - - ``` - set-executionpolicy remotesigned - ``` -6. Press *Enter* again to confirm the policy change - -**NOTE:** You may need to repeat this in both PowerShell and PowerShell (x86) on 64-bit systems. - -## Change author and module - -This updates the author and module name using the `.orig` templates. This script can be re-run, creating new templates. This may not be advisable in later stages of module development. - -1. Start Powershell in the blank module directory -2. Run the `unblank.ps1` script: - - ``` - .\unblank.ps1 newauthor newmodule - ``` -3. Add the newly created files to the git version control: - - ``` - git add Modulefile manifests\init.pp tests\init.pp - ``` -4. Commit these changes to git: - - ``` - git commit -am "Unblanked module with newauthor and newmodule" - ``` -5. Add new remote repository: - - ``` - git remote add origin git@git.repo.server:repository.git - ``` -6. Push changes to origin: - - ``` - git push origin master - ``` -7. The new module is ready for further development - -## Updating puppet-blank - -Just merge from the puppet-blank remote, though conflicts will be expected: - -``` -git pull puppet-blank master -``` - -## Cleaning up the puppet-blank files -1. Start Powershell in the blank module directory -2. Run the cleanup script: - - ``` - .\cleanup.ps1 - ``` -3. Commit the changes to git: - - ``` - git commit -am "Cleaned up with the puppet-blank cleanup script" - ``` -4. Push changes to remote: - - ``` - git push origin master - ``` - -**NOTE:** The cleanup script is *destructive* and will delete several files, including itself. - -**NOTE:** The puppet-blank remote is read-only, it should not be possible to push to it. - -## Prepare a module for submission to Puppet Forge - -1. To perform this step, the module will need to be cloned to a Linux server where puppet has been installed, and that the `UNKNOWN` entries in the `Modulefile` have been corrected. -2. in the parent directory to the module, build the module metadata where the module is in the directory `puppet-module`: - - ``` - puppet module build puppet-module - ``` -3. Submit the resulting tarball to Puppet Forge as per [their instructions] -(http://docs.puppetlabs.com/puppet/2.7/reference/modules_publishing.html) - -# Frequently Asked Questions - -More like questions that should be asked. - -## Why not use the puppet module generator? - -This module started with the standard module generation using - - ``` - puppet module generate author-blank - ``` -...so why not continue to use it? - -This module is intended for: - -1. Writing a module in an environment where puppet is not or can not be installed -2. Use as a starting point for a collection of modules and prepopulated with things like licensing, boiler plate, pictures of cats, etc. etc. -3. Writing a module in an environment where `puppet module generate` doesn't work, i.e. Windows. - -## Why Windows powershell scripts? - -My `$work` environment is restricted to using Windows 7, so I required scripts that run under Windows 7. I used Powershell because it has Perl-like regular expressions, which made this much easier than `.bat` batch files. \ No newline at end of file diff --git a/cleanup.ps1 b/cleanup.ps1 deleted file mode 100644 index b202e80..0000000 --- a/cleanup.ps1 +++ /dev/null @@ -1,13 +0,0 @@ -echo "Cleaning up template..." -if ((Test-Path 'Modulefile') -and (Test-Path 'manifests/init.pp') -and (Test-Path 'tests/init.pp') -and (Test-Path '.fixtures.yml')){ - echo "Deleting .orig templates..." - Remove-Item 'Modulefile.orig' - Remove-Item 'manifests/init.pp.orig' - Remove-Item 'tests/init.pp.orig' - Remove-Item 'README1st.markdown' - Remove-Item '.fixtures.yml.orig' - Remove-Item 'unblank.ps1' - Remove-Item 'cleanup.ps1' -} else { - throw "ERROR: Cannot find required files, have you run unblank.ps1?" -} \ No newline at end of file diff --git a/manifests/init.pp.orig b/manifests/init.pp.orig deleted file mode 100644 index a376811..0000000 --- a/manifests/init.pp.orig +++ /dev/null @@ -1,33 +0,0 @@ -# Class: blank -# -# This module manages blank -# -# Parameters: -# -# Actions: -# -# Requires: -# -# Sample Usage: -# - -# This file is part of the blank Puppet module. -# -# The blank Puppet module is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# The blank Puppet module is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with the blank Puppet module. If not, see . - -# [Remember: No empty lines between comments and class definition] -class blank { - - -} diff --git a/tests/init.pp.orig b/tests/init.pp.orig deleted file mode 100644 index 75828d1..0000000 --- a/tests/init.pp.orig +++ /dev/null @@ -1,15 +0,0 @@ -# This file is part of the blank Puppet module. -# -# The blank Puppet module is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# The blank Puppet module is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with the blank Puppet module. If not, see . -include blank diff --git a/unblank.ps1 b/unblank.ps1 deleted file mode 100644 index c91f66f..0000000 --- a/unblank.ps1 +++ /dev/null @@ -1,35 +0,0 @@ -Param($author,$module) -if ($author -match "^\w+$") { - if ($module -match "^\w+$") { - echo "Update Modulefile..." - $modulefile = Get-Content Modulefile.orig - $modulefile = Foreach-Object {$modulefile -replace "aethylred", $author} - $modulefile = Foreach-Object {$modulefile -replace "blank", $module} - Set-Content Modulefile $modulefile - echo "Modulefile updated." - - echo "Update manifests/init.pp..." - $initfile = Get-Content manifests/init.pp.orig - $initfile = Foreach-Object {$initfile -replace "blank", $module} - Set-Content manifests/init.pp $initfile - echo "manifests/init.pp updated." - - echo "Update tests\init.pp..." - $testfile = Get-Content tests/init.pp.orig - $testfile = Foreach-Object {$testfile -replace "blank", $module} - Set-Content tests/init.pp $testfile - echo "tests/init.pp updated." - - echo "Update .fixtures.yml..." - $modulefile = Get-Content .fixtures.yml.orig - $modulefile = Foreach-Object {$modulefile -replace "aethylred", $author} - $modulefile = Foreach-Object {$modulefile -replace "blank", $module} - Set-Content .fixtures.yml $modulefile - echo ".fixtures.yml updated." - - } else { - throw "ERROR: Bad module parameter '$module', must be a single word made up of word caracters [a-zA-Z_0-9]" - } -} else { - throw "ERROR: Bad author parameter '$author', must be a single word made up of word caracters [a-zA-Z_0-9]" -} \ No newline at end of file From b67c7bb57485f5709aac2d237073b7fdbeb48555 Mon Sep 17 00:00:00 2001 From: Aaron Hicks Date: Wed, 30 Oct 2013 15:16:01 +1300 Subject: [PATCH 21/36] Some work on the README and a stub test for git. --- README.markdown | 25 +++++-------------------- spec/classes/init_spec.rb | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 20 deletions(-) create mode 100644 spec/classes/init_spec.rb diff --git a/README.markdown b/README.markdown index 93e8f35..7111233 100644 --- a/README.markdown +++ b/README.markdown @@ -1,26 +1,9 @@ # puppet-git ============ -**WARNING** Depreciated, changes to how Puppet sets up the environment variables with `exec` resources means this module no longer works as intended when creating repositories as any user other than root. It is recommended that the Puppetlabs vcsrepo module is used instead: https://github.com/puppetlabs/puppetlabs-vcsrepo +A puppet module for managing the installation and configuration of [git](http://git-scm.com/). -A puppet module for managing git resources - -# To install into puppet - -Clone into your puppet configuration in your `puppet/modules` directory: - - git clone git://github.com/nesi/puppet-git.git git - -Or if you're managing your Puppet configuration with git, in your `puppet` directory: - - git submodule add git://github.com/nesi/puppet-git.git modules/git --init --recursive - cd modules/git - git checkout master - git pull - cd ../.. - git commit -m "added git submodule from https://github.com/nesi/puppet-git" - -It might seem bit excessive, but it will make sure the submodule isn't headless... +**WARNING** Changes to how Puppet sets up the environment variables with `exec` resources means this module no longer works as intended when managing repositories as any user other than root. It is recommended that the Puppetlabs vcsrepo module is used instead: https://github.com/puppetlabs/puppetlabs-vcsrepo # Usage @@ -62,7 +45,9 @@ Otherwise using parameters: * *user_name* sets the user's name to the specified string, and not the default of `${name} on ${fqdn}`, where fqdn is the fully qualified domain name as discovered by facter. * *user_email* sets the user's email address to the specified string, and not the default of `${name}@${fqdn}`, where fqdn is the fully qualified domain name as discovered by facter. -## To specify a git repository +## To specify a git repository **Depreciated** + +**Usin the git::repo class is depreciated and vcsrepo should be considered** This will clone a git repository from a vaild git URI to a specified path on the target server. It is **strongly** recommended that *read-only* git URIs are used. If no source is given, the target path will simply be initialised as a git repository. diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb new file mode 100644 index 0000000..2a051e4 --- /dev/null +++ b/spec/classes/init_spec.rb @@ -0,0 +1,38 @@ +require 'spec_helper' +describe 'git', :type => :class do + context "on a Debian OS" do + let :facts do + { + :osfamily => 'Debian', + } + end + describe "with no parameters" do + it { should include_class('git::params') } + end + end + + context "on a RedHat OS" do + let :facts do + { + :osfamily => 'RedHat', + } + end + describe "with no parameters" do + it { should include_class('git::params') } + end + end + + context "on an Unknown OS" do + let :facts do + { + :osfamily => 'Unknown', + } + end + it do + expect { + should include_class('puppet::params') + }.to raise_error(Puppet::Error, /The NeSI Puppet Puppet module does not support Unknown family of operating systems/) + end + end + +end From ab12ccd2077ab5032a60502c308ea422d017e8a2 Mon Sep 17 00:00:00 2001 From: Aaron Hicks Date: Wed, 30 Oct 2013 15:20:55 +1300 Subject: [PATCH 22/36] Update to comply with puppet-lint checks --- .fixtures.yaml => .fixtures.yml | 2 +- manifests/params.pp | 6 +++--- manifests/repo.pp | 2 +- spec/classes/init_spec.rb | 2 +- spec/spec_helper_system.rb | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) rename .fixtures.yaml => .fixtures.yml (79%) diff --git a/.fixtures.yaml b/.fixtures.yml similarity index 79% rename from .fixtures.yaml rename to .fixtures.yml index 78fcd83..6891a5f 100644 --- a/.fixtures.yaml +++ b/.fixtures.yml @@ -2,4 +2,4 @@ fixtures: repositories: stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib.git" symlinks: - blank: "#{source_dir}" \ No newline at end of file + git: "#{source_dir}" \ No newline at end of file diff --git a/manifests/params.pp b/manifests/params.pp index d0afd63..aca07f2 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -10,10 +10,10 @@ $gui_package = 'git-gui' $bin = '/usr/bin/git' $su_cmd = '/bin/su' - if $::operatingsystem =~ /^(Debian|Ubuntu)$/ and versioncmp($::operatingsystemrelease, "12") < 0 { + if $::operatingsystem =~ /^(Debian|Ubuntu)$/ and versioncmp($::operatingsystemrelease, '12') < 0 { $package = 'git-core' }else{ - $package = 'git' + $package = 'git' } $grep_cmd = $::operatingsystem ? { Archlinux => '/usr/bin/grep', @@ -21,7 +21,7 @@ } } default:{ - warning("git not configured for ${::operatingsystem} on ${::fqdn}") + warning("The NeSI Git Puppet module does not support ${::osfamily} family of operating systems") } } } diff --git a/manifests/repo.pp b/manifests/repo.pp index c0a6d34..4364446 100644 --- a/manifests/repo.pp +++ b/manifests/repo.pp @@ -34,7 +34,7 @@ if $owner != 'root' { $su_do = "${git::params::su_cmd} -l ${owner} -c \"" - $su_end = "\"" + $su_end = '"' } else { $su_do = '' $su_end = '' diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb index 2a051e4..cda653f 100644 --- a/spec/classes/init_spec.rb +++ b/spec/classes/init_spec.rb @@ -31,7 +31,7 @@ it do expect { should include_class('puppet::params') - }.to raise_error(Puppet::Error, /The NeSI Puppet Puppet module does not support Unknown family of operating systems/) + }.to raise_error(Puppet::Error, /The NeSI Git Puppet module does not support Unknown family of operating systems/) end end diff --git a/spec/spec_helper_system.rb b/spec/spec_helper_system.rb index 199c0ef..1f7c553 100644 --- a/spec/spec_helper_system.rb +++ b/spec/spec_helper_system.rb @@ -20,7 +20,7 @@ puppet_install # Install modules and dependencies - puppet_module_install(:source => proj_root, :module_name => 'puppet') + puppet_module_install(:source => proj_root, :module_name => 'git') # shell('puppet module install puppetlabs-stdlib --version 2.4.0') end end \ No newline at end of file From 317e91824136292a637e119ae07c50a4a34274fd Mon Sep 17 00:00:00 2001 From: Aaron Hicks Date: Wed, 30 Oct 2013 16:08:53 +1300 Subject: [PATCH 23/36] Set paramaters by osfamily fact, and remove git::install from git class pending merging them. Added test for ArchLinux --- manifests/init.pp | 9 ++++----- manifests/params.pp | 31 +++++++++++++++++++------------ spec/classes/init_spec.rb | 11 +++++++++++ 3 files changed, 34 insertions(+), 17 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 3dd3bda..0f7a065 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -31,13 +31,12 @@ # # Somewhat derived from https://github.com/theforeman/puppet-git class git( + $ensure = 'installed', + $package = $git::params::package, $gui = false, $svn = true, $git_root = false ) inherits git::params { - class{'git::install': - gui => $gui, - svn => $svn, - git_root => $git_root, - } + + } diff --git a/manifests/params.pp b/manifests/params.pp index aca07f2..513c888 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -4,24 +4,31 @@ class git::params { - case $::operatingsystem { - 'Scientific','CentOS','Ubuntu','Debian','Amazon','Archlinux','Gentoo','Fedora' :{ - $svn_package = 'git-svn' - $gui_package = 'git-gui' - $bin = '/usr/bin/git' - $su_cmd = '/bin/su' - if $::operatingsystem =~ /^(Debian|Ubuntu)$/ and versioncmp($::operatingsystemrelease, '12') < 0 { + # Common variables: + $svn_package = 'git-svn' + $gui_package = 'git-gui' + $bin = '/usr/bin/git' + $su_cmd = '/bin/su' + + case $::osfamily { + Debian: { + if versioncmp($::operatingsystemrelease, '12') < 0 { $package = 'git-core' }else{ $package = 'git' } - $grep_cmd = $::operatingsystem ? { - Archlinux => '/usr/bin/grep', - default => '/bin/grep' - } + $grep_cmd = '/bin/grep' + } + RedHat: { + $package = 'git' + $grep_cmd = '/bin/grep' + } + ArchLinux:{ + $package = 'git' + $grep_cmd = '/usr/bin/grep' } default:{ - warning("The NeSI Git Puppet module does not support ${::osfamily} family of operating systems") + fail("The NeSI Git Puppet module does not support ${::osfamily} family of operating systems") } } } diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb index cda653f..a07cc28 100644 --- a/spec/classes/init_spec.rb +++ b/spec/classes/init_spec.rb @@ -22,6 +22,17 @@ end end + context "on a ArchLinux OS" do + let :facts do + { + :osfamily => 'ArchLinux', + } + end + describe "with no parameters" do + it { should include_class('git::params') } + end + end + context "on an Unknown OS" do let :facts do { From 3711d2c9126ce5b9e05dfe812cea8c42b91cc3c9 Mon Sep 17 00:00:00 2001 From: Aaron Hicks Date: Wed, 30 Oct 2013 16:32:34 +1300 Subject: [PATCH 24/36] Merge git::install into git class --- README.markdown | 8 ++++---- manifests/init.pp | 38 +++++++++++++++++++++++++++++++++-- manifests/install.pp | 42 --------------------------------------- spec/classes/init_spec.rb | 41 ++++++++++++++++++++++++++++++++++++-- 4 files changed, 79 insertions(+), 50 deletions(-) delete mode 100644 manifests/install.pp diff --git a/README.markdown b/README.markdown index 7111233..268ec09 100644 --- a/README.markdown +++ b/README.markdown @@ -16,14 +16,14 @@ A basic install with the defaults would be: Otherwise using the parametrs: class{git: - svn => true, - gui => true, + svn => 'installed', + gui => 'installed', } ### Parameters -* *svn* if true the git-svn package will also be installed -* *gui* if true the git-gui package will also be installed +* **svn**: Sets the ensure paramater passed to the git-svn package. The default is `installed`. +* **gui**: Sets the ensure parameter passed to the git-gui package. The default is `absent`. ## To set up git for a user diff --git a/manifests/init.pp b/manifests/init.pp index 0f7a065..502815d 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -33,10 +33,44 @@ class git( $ensure = 'installed', $package = $git::params::package, - $gui = false, - $svn = true, + $gui = 'absent', + $svn = 'installed', $git_root = false ) inherits git::params { + case $ensure { + /^installed$|^(\d+)?(\.(x|\*|\d+))?(\.(x|\*|\d+))?(|-(\S+))$/: { + $ensure_dir = 'directory' + $ensure_file = 'file' + $ensure_present = 'present' + } + default: { + $ensure_dir = 'absent' + $ensure_file = 'absent' + $ensure_present = 'absent' + } + } + + package{'git': + ensure => $ensure, + name => $package, + } + + package{'git-svn': + ensure => $svn, + name => $git::params::svn_package, + } + + package{'git-gui': + ensure => $gui, + name => $git::params::gui_package, + } + + # Need to consider if this should happen or not. + # if $git_root { + # $root_name = "root on ${::fqdn}" + # $root_email = "root@${::fqdn}" + # git::user{'root':} + # } } diff --git a/manifests/install.pp b/manifests/install.pp deleted file mode 100644 index f7b4090..0000000 --- a/manifests/install.pp +++ /dev/null @@ -1,42 +0,0 @@ -# Git installer manifest -# DO NOT USE DIRECTLY -# -# Use this instead: -# include git -# -# or: -# class {'git': -# svn => true, -# gui => true, -#} - -class git::install( - $gui, - $svn, - $git_root -){ - require git::params - - if ! defined(Package[$git::params::package]) { - package{$git::params::package: ensure => installed} - } - - if $svn { - package{$git::params::svn_package: ensure => installed} - } else { - package{$git::params::svn_package: ensure => absent} - } - - if $gui { - package{$git::params::gui_package: ensure => installed} - } else { - package{$git::params::gui_package: ensure => absent} - } - - if $git_root { - $root_name = "root on ${::fqdn}" - $root_email = "root@${::fqdn}" - git::user{'root':} - } - -} diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb index a07cc28..ca58036 100644 --- a/spec/classes/init_spec.rb +++ b/spec/classes/init_spec.rb @@ -1,13 +1,42 @@ require 'spec_helper' describe 'git', :type => :class do - context "on a Debian OS" do + context "on a later (post 12) Debian OS" do let :facts do { :osfamily => 'Debian', + :operatingsystemrelease => '12', } end describe "with no parameters" do it { should include_class('git::params') } + it { should contain_package('git').with( + 'ensure' => 'installed', + 'name' => 'git' + ) } + it { should contain_package('git-svn').with( + 'ensure' => 'installed', + 'name' => 'git-svn' + ) } + it { should contain_package('git-gui').with( + 'ensure' => 'absent', + 'name' => 'git-gui' + ) } + end + end + + context "on an early (pre 12) Debian OS" do + let :facts do + { + :osfamily => 'Debian', + :operatingsystemrelease => '11', + } + end + describe "with no parameters" do + it { should include_class('git::params') } + it { should contain_package('git').with( + 'ensure' => 'installed', + 'name' => 'git-core' + ) } end end @@ -19,6 +48,10 @@ end describe "with no parameters" do it { should include_class('git::params') } + it { should contain_package('git').with( + 'ensure' => 'installed', + 'name' => 'git' + ) } end end @@ -30,10 +63,14 @@ end describe "with no parameters" do it { should include_class('git::params') } + it { should contain_package('git').with( + 'ensure' => 'installed', + 'name' => 'git' + ) } end end - context "on an Unknown OS" do + context "on an Unknown OS" do let :facts do { :osfamily => 'Unknown', From 3e871acd4ba3de10b51bbbe83836590ad57c5ef0 Mon Sep 17 00:00:00 2001 From: Aaron Hicks Date: Wed, 30 Oct 2013 16:56:09 +1300 Subject: [PATCH 25/36] depreciation warning in git::repo Update README --- README.markdown | 37 +++++++++++++++++++++++++++++++++++-- manifests/repo.pp | 2 ++ 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/README.markdown b/README.markdown index 268ec09..2db5513 100644 --- a/README.markdown +++ b/README.markdown @@ -3,7 +3,25 @@ A puppet module for managing the installation and configuration of [git](http://git-scm.com/). -**WARNING** Changes to how Puppet sets up the environment variables with `exec` resources means this module no longer works as intended when managing repositories as any user other than root. It is recommended that the Puppetlabs vcsrepo module is used instead: https://github.com/puppetlabs/puppetlabs-vcsrepo +**WARNING** Changes to how Puppet sets up the environment variables with `exec` resources means this module no longer works as intended when managing repositories as any user other than root. It is recommended that the [Puppetlabs vcsrepo module](https://github.com/puppetlabs/puppetlabs-vcsrepo) is used manage repositories. + +## Feature Roadmap + +This module is going to be refactored to operate in conjunction to the vcsrepo module. It will manage the installation of git, the configuration of git specific settings, executing git commands, and eventually the management of git hook scripts. + +#### Implemented Features: +* Installs git from packages +* Optionally installs git-svn from packages (defaults installed) +* Optionally installs git-gui from packages (defaults not installed) + +#### Features not yet updated +* Initialising user accounts with git configurations + +#### Features to be Implemented +* Sets git user's globals settings +* Sets git repository local settings +* Executes git commands +* Pushes hook scripts into git repositories # Usage @@ -47,7 +65,7 @@ Otherwise using parameters: ## To specify a git repository **Depreciated** -**Usin the git::repo class is depreciated and vcsrepo should be considered** +**Usin the `git::repo` class is depreciated and `vcsrepo` should be considered instead.** This will clone a git repository from a vaild git URI to a specified path on the target server. It is **strongly** recommended that *read-only* git URIs are used. If no source is given, the target path will simply be initialised as a git repository. @@ -83,6 +101,8 @@ With minimum parameters to clone from a remote source: # Attribution +## puppet-blank + This module is derived from the puppet-blank module by Aaron Hicks (aethylred@gmail.com) * https://github.com/Aethylred/puppet-blank @@ -91,6 +111,19 @@ This module has been developed for the use with Open Source Puppet (Apache 2.0 l * http://puppetlabs.com/puppet/puppet-open-source/ +## rspec-puppet-augeas + +This module includes the [Travis](https://travis-ci.org) configuration to use [`rspec-puppet-augeas`](https://github.com/domcleal/rspec-puppet-augeas) to test and verify changes made to files using the [`augeas` resource](http://docs.puppetlabs.com/references/latest/type.html#augeas) available in Puppet. Check the `rspec-puppet-augeas` [documentation](https://github.com/domcleal/rspec-puppet-augeas/blob/master/README.md) for usage. + +This will require a copy of the original input files to `spec/fixtures/augeas` using the same filesystem layout that the resource expects: +``` +$ tree spec/fixtures/augeas/ +spec/fixtures/augeas/ +`-- etc + `-- ssh + `-- sshd_config +``` + # Gnu General Public License This file is part of the git Puppet module. diff --git a/manifests/repo.pp b/manifests/repo.pp index 4364446..f4a2328 100644 --- a/manifests/repo.pp +++ b/manifests/repo.pp @@ -27,6 +27,8 @@ $bare = false ){ + warning('Using git::repo is depreciated!') + require git require git::params From 4b168e4de1ca469aea569308d749632831793fa9 Mon Sep 17 00:00:00 2001 From: Aaron Hicks Date: Thu, 31 Oct 2013 10:12:21 +1300 Subject: [PATCH 26/36] Finish documenting git class parameters. --- README.markdown | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.markdown b/README.markdown index 2db5513..0c645f5 100644 --- a/README.markdown +++ b/README.markdown @@ -40,8 +40,11 @@ Otherwise using the parametrs: ### Parameters +* **ensure**: Sets the ensure parameter passed to the git package. The default is `installed`. * **svn**: Sets the ensure paramater passed to the git-svn package. The default is `installed`. * **gui**: Sets the ensure parameter passed to the git-gui package. The default is `absent`. +* **package**: Specifies a custom package. The default is `git`, except for older versions of Debian and Ubuntu where the default is `git-core`. +* **git_root**: Currently does nothing, it's functionality is to be reviewed. ## To set up git for a user From c42536de2456a1f8aac09704a6ff9b96733057ef Mon Sep 17 00:00:00 2001 From: Aaron Hicks Date: Thu, 31 Oct 2013 10:19:09 +1300 Subject: [PATCH 27/36] ensure for the git package should override the ensure for git)_gui and git_svn. Updated tests. --- manifests/init.pp | 15 +++++++-------- spec/classes/init_spec.rb | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 8 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 502815d..800775b 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -38,16 +38,15 @@ $git_root = false ) inherits git::params { + # ensure statement for the git package overrides svn and gui ensure. case $ensure { /^installed$|^(\d+)?(\.(x|\*|\d+))?(\.(x|\*|\d+))?(|-(\S+))$/: { - $ensure_dir = 'directory' - $ensure_file = 'file' - $ensure_present = 'present' + $ensure_svn = $svn + $ensure_gui = $gui } default: { - $ensure_dir = 'absent' - $ensure_file = 'absent' - $ensure_present = 'absent' + $ensure_svn = 'absent' + $ensure_gui = 'absent' } } @@ -57,12 +56,12 @@ } package{'git-svn': - ensure => $svn, + ensure => $ensure_svn, name => $git::params::svn_package, } package{'git-gui': - ensure => $gui, + ensure => $ensure_gui, name => $git::params::gui_package, } diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb index ca58036..53fea52 100644 --- a/spec/classes/init_spec.rb +++ b/spec/classes/init_spec.rb @@ -22,6 +22,45 @@ 'name' => 'git-gui' ) } end + describe "with ensure => absent" do + let :params do + { + :ensure => 'absent', + } + end + it { should include_class('git::params') } + it { should contain_package('git').with( + 'ensure' => 'absent' + ) } + it { should contain_package('git-svn').with( + 'ensure' => 'absent' + ) } + it { should contain_package('git-gui').with( + 'ensure' => 'absent' + ) } + end + describe "with svn => absent" do + let :params do + { + :svn => 'absent', + } + end + it { should include_class('git::params') } + it { should contain_package('git-svn').with( + 'ensure' => 'absent' + ) } + end + describe "with gui => installed" do + let :params do + { + :gui => 'installed', + } + end + it { should include_class('git::params') } + it { should contain_package('git-gui').with( + 'ensure' => 'installed' + ) } + end end context "on an early (pre 12) Debian OS" do From f7ba20f02dfca59c93182cf9fbdb894445c8ba50 Mon Sep 17 00:00:00 2001 From: Aaron Hicks Date: Thu, 31 Oct 2013 11:03:43 +1300 Subject: [PATCH 28/36] breakpoint for changing from git-core to git should be 10/11 not 11/12. This should address #30 --- manifests/params.pp | 2 +- spec/classes/init_spec.rb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index 513c888..75a54d2 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -12,7 +12,7 @@ case $::osfamily { Debian: { - if versioncmp($::operatingsystemrelease, '12') < 0 { + if versioncmp($::operatingsystemrelease, '11') < 0 { $package = 'git-core' }else{ $package = 'git' diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb index 53fea52..0a3ddf2 100644 --- a/spec/classes/init_spec.rb +++ b/spec/classes/init_spec.rb @@ -1,10 +1,10 @@ require 'spec_helper' describe 'git', :type => :class do - context "on a later (post 12) Debian OS" do + context "on a later (post 11) Debian OS" do let :facts do { :osfamily => 'Debian', - :operatingsystemrelease => '12', + :operatingsystemrelease => '11', } end describe "with no parameters" do @@ -63,11 +63,11 @@ end end - context "on an early (pre 12) Debian OS" do + context "on an early (pre 11) Debian OS" do let :facts do { :osfamily => 'Debian', - :operatingsystemrelease => '11', + :operatingsystemrelease => '10', } end describe "with no parameters" do From d5639fa1fb1cab6391230f491283219da8e43dfa Mon Sep 17 00:00:00 2001 From: Aaron Hicks Date: Thu, 31 Oct 2013 11:28:24 +1300 Subject: [PATCH 29/36] Markup README to get puppet syntax highlighting in code blocks --- README.markdown | 68 +++++++++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 31 deletions(-) diff --git a/README.markdown b/README.markdown index 0c645f5..228fd3c 100644 --- a/README.markdown +++ b/README.markdown @@ -27,16 +27,18 @@ This module is going to be refactored to operate in conjunction to the vcsrepo m ## To install git -A basic install with the defaults would be: - - include git - -Otherwise using the parametrs: +A basic install with the defaults would be: +```puppet +include git +``` - class{git: - svn => 'installed', - gui => 'installed', - } +Otherwise using the parametrs: +```puppet +class{git: + svn => 'installed', + gui => 'installed', +} +``` ### Parameters @@ -50,40 +52,44 @@ Otherwise using the parametrs: This basically sets the users name and email as git global variables, and should allow them to just use git. The username should be a valid user account. -With default settings just use: - - git::user{'username':} - -Otherwise using parameters: +With default settings just use: +```puppet +git::user{'username':} +``` - git::user{'username': - user_name => 'Some User', - user_email => 'someuser@example.org', - } +Otherwise using parameters: +```puppet +git::user{'username': + user_name => 'Some User', + user_email => 'someuser@example.org', +} +``` ### Parameters * *user_name* sets the user's name to the specified string, and not the default of `${name} on ${fqdn}`, where fqdn is the fully qualified domain name as discovered by facter. * *user_email* sets the user's email address to the specified string, and not the default of `${name}@${fqdn}`, where fqdn is the fully qualified domain name as discovered by facter. -## To specify a git repository **Depreciated** +## To specify a git repository -**Usin the `git::repo` class is depreciated and `vcsrepo` should be considered instead.** +**Using the `git::repo` class is depreciated and `vcsrepo` should be considered instead.** This will clone a git repository from a vaild git URI to a specified path on the target server. It is **strongly** recommended that *read-only* git URIs are used. If no source is given, the target path will simply be initialised as a git repository. -With minimum parameters, should create the directory `/usr/src/repo` and run `git init` in it: - - git::repo{'repo_name': - path => '/usr/src/repo', - } - -With minimum parameters to clone from a remote source: +With minimum parameters, should create the directory `/usr/src/repo` and run `git init` in it: +```puppet +git::repo{'repo_name': + path => '/usr/src/repo', +} +``` - git::repo{'repo_name': - path => '/usr/src/repo', - source => 'git://example.org/example/repo.git' - } +With minimum parameters to clone from a remote source: +```puppet +git::repo{'repo_name': + path => '/usr/src/repo', + source => 'git://example.org/example/repo.git' +} +``` ### Parameters From bef964155e653a256ac5ce39a6a42ed8d15caa93 Mon Sep 17 00:00:00 2001 From: Aaron Hicks Date: Thu, 31 Oct 2013 13:19:41 +1300 Subject: [PATCH 30/36] Version 0.1.1 --- Modulefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Modulefile b/Modulefile index 5f19f59..ddbfdec 100644 --- a/Modulefile +++ b/Modulefile @@ -1,5 +1,5 @@ -name 'nesi-git' -version '0.1.0' +name 'Aethylred-git' +version '0.1.1' source 'https://github.com/nesi/puppet-git' author 'Aaron Hicks' license 'GPL3' From ee058893fc33559155d4bdecc490f13730db20cc Mon Sep 17 00:00:00 2001 From: Aaron Hicks Date: Thu, 31 Oct 2013 13:31:23 +1300 Subject: [PATCH 31/36] Add travis status image. --- README.markdown | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.markdown b/README.markdown index 228fd3c..a942e76 100644 --- a/README.markdown +++ b/README.markdown @@ -1,6 +1,8 @@ # puppet-git ============ +[![Build Status](https://travis-ci.org/nesi/puppet-git.png?branch=master)](https://travis-ci.org/nesi/puppet-git) + A puppet module for managing the installation and configuration of [git](http://git-scm.com/). **WARNING** Changes to how Puppet sets up the environment variables with `exec` resources means this module no longer works as intended when managing repositories as any user other than root. It is recommended that the [Puppetlabs vcsrepo module](https://github.com/puppetlabs/puppetlabs-vcsrepo) is used manage repositories. From b9f03026153283aa5aee2d2457fc42ba5d692cbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20A=2E=20S=C3=A1nchez=20Hidalgo?= Date: Thu, 31 Oct 2013 17:38:06 +0100 Subject: [PATCH 32/36] Add timeout parameter to git::repo --- manifests/repo.pp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/manifests/repo.pp b/manifests/repo.pp index f4a2328..640e405 100644 --- a/manifests/repo.pp +++ b/manifests/repo.pp @@ -24,7 +24,8 @@ $owner = 'root', $group = 'root', $update = false, - $bare = false + $bare = false, + $timeout = 60 ){ warning('Using git::repo is depreciated!') @@ -78,7 +79,7 @@ provider => shell, creates => $creates, require => Package[$git::params::package], - timeout => 600, + timeout => $timeout, } # I think tagging works, but it's possible setting a tag and a branch will just fight. From 667903c60e079e6a1db6dec497d324a60d767f65 Mon Sep 17 00:00:00 2001 From: Aaron Hicks Date: Fri, 1 Nov 2013 09:46:28 +1300 Subject: [PATCH 33/36] Further restriction of the git vs. git-core test to just Ubuntu. --- manifests/params.pp | 2 +- spec/classes/init_spec.rb | 26 ++++++++++++++++++++++---- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index 75a54d2..938e02a 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -12,7 +12,7 @@ case $::osfamily { Debian: { - if versioncmp($::operatingsystemrelease, '11') < 0 { + if $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '11') < 0 { $package = 'git-core' }else{ $package = 'git' diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb index 0a3ddf2..f7ed37a 100644 --- a/spec/classes/init_spec.rb +++ b/spec/classes/init_spec.rb @@ -1,10 +1,10 @@ require 'spec_helper' describe 'git', :type => :class do - context "on a later (post 11) Debian OS" do + context "on a Debian OS" do let :facts do { - :osfamily => 'Debian', - :operatingsystemrelease => '11', + :osfamily => 'Debian', + :operatingsystem => 'Debian', } end describe "with no parameters" do @@ -63,10 +63,28 @@ end end - context "on an early (pre 11) Debian OS" do + context "on an later (post 11) Ubuntu OS" do + let :facts do + { + :osfamily => 'Debian', + :operatingsystem => 'Ubuntu', + :operatingsystemrelease => '11', + } + end + describe "with no parameters" do + it { should include_class('git::params') } + it { should contain_package('git').with( + 'ensure' => 'installed', + 'name' => 'git' + ) } + end + end + + context "on an early (pre 11) Ubuntu OS" do let :facts do { :osfamily => 'Debian', + :operatingsystem => 'Ubuntu', :operatingsystemrelease => '10', } end From 56245322865b155d163fb83f52729aea70b97880 Mon Sep 17 00:00:00 2001 From: Aaron Hicks Date: Fri, 1 Nov 2013 10:03:30 +1300 Subject: [PATCH 34/36] version 0.1.2 --- Modulefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modulefile b/Modulefile index ddbfdec..03393dd 100644 --- a/Modulefile +++ b/Modulefile @@ -1,5 +1,5 @@ name 'Aethylred-git' -version '0.1.1' +version '0.1.2' source 'https://github.com/nesi/puppet-git' author 'Aaron Hicks' license 'GPL3' From 6545b575437a144e1e2f21f0ebb893ff08ddfa3d Mon Sep 17 00:00:00 2001 From: John Bond Date: Mon, 3 Feb 2014 15:27:37 +0100 Subject: [PATCH 35/36] Remove -l parameter from su. This forces the users enviroment to be loaded which changes the CWD Change branch parameter to real_branch where appropriate. --- manifests/repo.pp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/manifests/repo.pp b/manifests/repo.pp index 640e405..e98f4b3 100644 --- a/manifests/repo.pp +++ b/manifests/repo.pp @@ -36,7 +36,7 @@ validate_bool($bare, $update) if $owner != 'root' { - $su_do = "${git::params::su_cmd} -l ${owner} -c \"" + $su_do = "${git::params::su_cmd} ${owner} -c \"" $su_end = '"' } else { $su_do = '' @@ -96,16 +96,16 @@ exec {"git_${name}_co_branch": cwd => $path, provider => shell, - command => "${su_do}${git::params::bin} checkout ${branch}${su_end}", - unless => "${su_do}${git::params::bin} branch|${git::params::grep_cmd} -P '\\* ${branch}'${su_end}", + command => "${su_do}${git::params::bin} checkout ${real_branch}${su_end}", + unless => "${su_do}${git::params::bin} branch|${git::params::grep_cmd} -P '\\* ${real_branch}'${su_end}", require => Exec["git_repo_${name}"], } if $update { exec {"git_${name}_pull": cwd => $path, provider => shell, - command => "${su_do}${git::params::bin} reset --hard origin/${branch}${su_end}", - unless => "${su_do}${git::params::bin} fetch && ${git::params::bin} diff origin/${branch} --no-color --exit-code${su_end}", + command => "${su_do}${git::params::bin} reset --hard origin/${real_branch}${su_end}", + unless => "${su_do}${git::params::bin} fetch && ${git::params::bin} diff origin/${real_branch} --no-color --exit-code${su_end}", require => Exec["git_repo_${name}"], } } From f0a386966b8c1c353295d67ff0f64e2101b0f162 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20A=2E=20S=C3=A1nchez=20Hidalgo?= Date: Mon, 17 Feb 2014 16:39:43 +0100 Subject: [PATCH 36/36] FIX group ownership on directory --- manifests/repo.pp | 1 + 1 file changed, 1 insertion(+) diff --git a/manifests/repo.pp b/manifests/repo.pp index e98f4b3..e758e9c 100644 --- a/manifests/repo.pp +++ b/manifests/repo.pp @@ -69,6 +69,7 @@ file{$path: ensure => directory, owner => $owner, + group => $group, recurse => true, } }