I'm compelled to write about this subject today because of having received this question multiple times since sysadvent began. Capistrano or Puppet? Both. Puppet provides you with a way to specify a state your system should be in. Puppet's features will help you keep a machine in the same state. If someone hand-edits an apache config, you can have puppet automatically replace it with the correct o