diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | README.md | 6 | ||||
| -rw-r--r-- | TODO.md | 3 | ||||
| -rwxr-xr-x | bin/mrconfig | 2 |
4 files changed, 6 insertions, 7 deletions
@@ -15,7 +15,7 @@ # CWD = $(shell pwd) -REPO = git://git.sarava.org/puppet-bootstrap.git +REPO = git://git.fluxo.info/puppet-bootstrap.git PUPPET = FACTER_BOOTSTRAP_PATH="$(CWD)" puppet apply --confdir="$(CWD)" --modulepath=modules all: deps remote modules config @@ -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/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 ---------------------------------------- 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 @@ -6,7 +6,6 @@ High priority - puppet: masterless: - keyringer/gpg integration. - - http://it-dev.web.cern.ch/book/cern-puppet-development-user-guide/puppet-development-work-flow-git/hiera-hierarchical-databa-1 - https://github.com/compete/hiera_yamlgpg - https://github.com/crayfishx/hiera-gpg - https://github.com/StackExchange/blackbox @@ -39,8 +38,8 @@ Medium priority - support for $dombr and $dobios on backupninja::sys for servers and physical machines. - sync-backups support for rsyncing from kvms / snapshots. - nodo: use prompt.sh from bash-prompt as a submodule. +- common: autoload. - general: - - features/autoload: nodo, virtual, dhcp and others. - rollback of commits about charset. - switch to conf.d: - php ("refactor" branch), remove E_STRICT from production's error_reporting. diff --git a/bin/mrconfig b/bin/mrconfig index d061f5b..dc753ac 100755 --- a/bin/mrconfig +++ b/bin/mrconfig @@ -4,7 +4,7 @@ # # Parameters -GIT="git.sarava.org" +GIT="git.fluxo.info" URL="https://$GIT/?a=project_index" CWD="`pwd`" WORK="`dirname $0`/.." |