English below
Camptocamp recherche pour compléter son équipe «Infrastructure Solutions » un/une Spécialiste GNU/Linux expérimenté.
En tant que spécialiste GNU/Linux, vous êtes intéressé par la gestion d’infrastructures complexes, l’utilisation et le développement de solutions innovantes visant à automatiser et professionnaliser ce domaine.
The first edition of the Open Source Data Center Conference (OSDC) is taking place in Nürnberg during two days (April 29th and 30th).
The conference program includes talks on many Open Source Tools for System Administration.
Camptocamp makes heavy use of Puppet as a tool to manage system configuration on internal and customers servers as well as workstations. Therefore, we are very excited to share experiences with other European Puppet users there.
Stay tuned for more updates !
When several people work on the same set of files, for instance puppet recipes , conflicts happen now and then:
marc@lonquimay:/tmp/puppetmaster$ bzr merge -q
Text conflict in modules/mysql/manifests/classes/server.pp
As every decent machine has vim installed, you are only one step away from resolving these conflicts in a comprehensive and colorful way. Just type:
vimdiff modules/mysql/manifests/classes/server.pp.{THIS,OTHER}
Vim will open both files, splitted in the same window:
As usual with splits, you can switch back and forth with CTRL-W CTRL-W. Now position the cursor on one of the conflicting lines. Then type do to "obtain" the code block from the other file or dp to "push" it to the other file. You can of course edit any of the files as usual.
That’s it, don’t forget to bzr resolve the conflict !
