diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2015-11-06 11:01:26 -0200 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2015-11-06 11:01:26 -0200 |
commit | 8748f432cdb01090767001523496f096345a492b (patch) | |
tree | cba4fd0d8d4501424c7fb5e84ba37dc2cdd7fca4 /puppet/README.md | |
parent | 506b62a99e35c69354e8bc977780e41117f1e6ca (diff) | |
parent | 5512c493e13998d4c83d7eab3d89e5a1c0836566 (diff) | |
download | debian-8748f432cdb01090767001523496f096345a492b.tar.gz debian-8748f432cdb01090767001523496f096345a492b.tar.bz2 |
Merge commit '5512c493e13998d4c83d7eab3d89e5a1c0836566' into develop
Conflicts:
puppet/puppet.conf
Diffstat (limited to 'puppet/README.md')
-rw-r--r-- | puppet/README.md | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/puppet/README.md b/puppet/README.md index 67dad5f..bb5375d 100644 --- a/puppet/README.md +++ b/puppet/README.md @@ -5,14 +5,14 @@ This is a multi-purpose but very specific puppet module which can be used: * As the base repository for a puppet infrastructure. * As a standalone provisioner for boxes, with Vagrant support. -* It can be optionally used together with the Hydra Suite from https://git.sarava.org/?p=hydra.git +* It can be optionally used together with the Hydra Suite from https://git.fluxo.info/hydra.git -Setting up a new puppetmaster repository ----------------------------------------- +Setting up a new puppet repository +---------------------------------- You'll basically use the `bootstrap` repository as your `puppet` repository: - git clone git://git.sarava.org/puppet-bootstrap.git puppet + git clone git://git.fluxo.info/puppet-bootstrap.git puppet cd puppet && git tag -v # check integrity make deps # install dependencies make submodules # add all needed puppet module as as git submodules @@ -24,7 +24,7 @@ Using as a standalone provisioner This will be a `Vagrant` example: cd your-project - git clone git://git.sarava.org/puppet-bootstrap.git puppet # use submodule or subtree as you please + git clone git://git.fluxo.info/puppet-bootstrap.git puppet # use submodule or subtree as you please ln -s puppet/Vagrantfile # or copy if you want to customize ( cd puppet && make modules ) # need the mr binary to download the submodules vagrant up web # with no arguments, all defined VMs are started |