Skip to content
This repository has been archived by the owner on Feb 28, 2021. It is now read-only.

Commit

Permalink
force puppet to use global vars
Browse files Browse the repository at this point in the history
  • Loading branch information
khamidou committed Jan 6, 2014
1 parent c8bae5b commit 75c0424
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
3 changes: 2 additions & 1 deletion Vagrantfile
Expand Up @@ -5,8 +5,9 @@ Vagrant.configure("2") do |config|
puppet.module_path = "puppet_modules"
puppet.manifest_file = "vagrant.pp"
#puppet.options = "--debug --verbose"
puppet.facter = {"server_name"=> "kitebox.dev"}
end
config.vm.host_name = "example.com"
config.vm.host_name = "kitebox.dev"
config.vm.network "private_network", ip: "192.168.50.4"
config.vm.network "forwarded_port", guest: 80, host: 8080
end
2 changes: 0 additions & 2 deletions manifests/default.pp
@@ -1,7 +1,5 @@
# this is the main config file for puppet

import "settings.pp"

exec {"apt-get update":
path => ["/usr/bin/", "/usr/sbin"],
}
Expand Down
1 change: 0 additions & 1 deletion manifests/vagrant.pp
@@ -1,5 +1,4 @@
# Puppet manifest for setting up kite on vagrant

import "default.pp"

host {'kitebox.dev':
Expand Down
2 changes: 2 additions & 0 deletions puppet_modules/supervisord/templates/supervisord.conf.erb
Expand Up @@ -29,10 +29,12 @@ process_name=filterdaemon_sup ; process_name expr (default %(program_name)s)
stdout_logfile=/tmp/filterdaemon.out ; stdout log path, NONE for none; default AUTO
redirect_stderr=true
startretries=20
directory=<%= maildirs %>

[program:python_serv]
command=<%= appdir %>server.py <%= maildirs %>
process_name=kite_server
stdout_logfile=/tmp/kiteserv.out
redirect_stderr=true
startretries=20
directory=<%= maildirs %>

0 comments on commit 75c0424

Please sign in to comment.