Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Make the dev Vagrant virtual box and the test suite (using the dev vm…
… as target) work again
- Loading branch information
Showing
with
263 additions
and 82 deletions.
- +11 −0 .gitignore
- +18 −0 .gitmodules
- +67 −13 README.md
- +34 −37 buildout.cfg
- +3 −3 dev/clean_dev.sh
- +1 −0 dev/modules/apt
- +1 −0 dev/modules/concat
- +1 −0 dev/modules/nginx
- +1 −0 dev/modules/postgresql
- +1 −0 dev/modules/stdlib
- +1 −0 dev/modules/supervisord
- +1 −0 dev/modules/sysconfig/files/karma.conf.dev.js
- +13 −3 dev/modules/sysconfig/manifests/buildout.pp
- +2 −2 dev/modules/sysconfig/manifests/packages.pp
- +11 −0 src/cm/wsgi.py
- +31 −3 test-suite/README.md
- +21 −0 test-suite/package.json
- +45 −21 test-suite/start-test-suite.sh
@@ -0,0 +1,18 @@ | ||
[submodule "dev/modules/nginx"] | ||
path = dev/modules/nginx | ||
url = https://github.com/jfryman/puppet-nginx.git | ||
[submodule "dev/modules/stdlib"] | ||
path = dev/modules/stdlib | ||
url = https://github.com/puppetlabs/puppetlabs-stdlib.git | ||
[submodule "dev/modules/apt"] | ||
path = dev/modules/apt | ||
url = https://github.com/puppetlabs/puppetlabs-apt.git | ||
[submodule "dev/modules/postgresql"] | ||
path = dev/modules/postgresql | ||
url = https://github.com/puppetlabs/puppetlabs-postgresql.git | ||
[submodule "dev/modules/supervisord"] | ||
path = dev/modules/supervisord | ||
url = https://github.com/adedommelin/puppet-supervisord.git | ||
[submodule "dev/modules/concat"] | ||
path = dev/modules/concat | ||
url = https://github.com/puppetlabs/puppetlabs-concat.git |
Submodule postgresql
added at
0caf8a
Submodule supervisord
added at
f1f5e3
@@ -1,18 +1,28 @@ | ||
class sysconfig::buildout { | ||
|
||
file { 'buildout-dev.cfg': | ||
ensure => 'present', | ||
path => "/srv/comt/buildout-dev.cfg", | ||
replace => 'yes', | ||
owner => 'vagrant', | ||
group => 'vagrant', | ||
mode => 755, | ||
source => 'puppet:///modules/sysconfig/buildout-dev.cfg' | ||
} | ||
|
||
exec { | ||
'bootstrap': | ||
command => '/usr/bin/python bootstrap.py', | ||
command => '/usr/bin/python bootstrap-buildout.py', | ||
cwd => '/srv/comt', | ||
creates => '/srv/comt/bin', | ||
user => 'vagrant'; | ||
'buildout': | ||
command => '/srv/comt/bin/buildout -c /srv/comt/buildout-prod.cfg', | ||
command => '/srv/comt/bin/buildout -c /srv/comt/buildout-dev.cfg', | ||
cwd => '/srv/comt', | ||
timeout => 0, | ||
creates => '/srv/comt/bin/gunicorn'; | ||
} | ||
|
||
Exec['bootstrap'] -> Exec['buildout'] | ||
File['buildout-dev.cfg'] -> Exec['bootstrap'] -> Exec['buildout'] | ||
|
||
} |
@@ -0,0 +1,11 @@ | ||
import os | ||
import sys | ||
|
||
os.environ['DJANGO_SETTINGS_MODULE'] = 'cm.settings' | ||
|
||
path = os.environ['PROJECT_PATH'] | ||
if path not in sys.path: | ||
sys.path.append(path) | ||
|
||
import django.core.handlers.wsgi | ||
app = django.core.handlers.wsgi.WSGIHandler() |
Oops, something went wrong.