diff -r 98822a0e9573 -r 66972b143124 dev/modules/sysconfig/manifests/django_init.pp --- a/dev/modules/sysconfig/manifests/django_init.pp Wed Sep 10 16:41:33 2014 +0200 +++ b/dev/modules/sysconfig/manifests/django_init.pp Fri Sep 12 15:28:17 2014 +0200 @@ -6,11 +6,25 @@ notify {'django_init': name => "django init \$superuser_name : ${superuser_name}, \$superuser_pw : ${superuser_pw}", withpath => true }-> - exec { 'syncdb': - command => ". ${path_to_virtualenv}/bin/activate && ${path_to_virtualenv}/bin/python manage.py syncdb --noinput", + exec { 'syncdb_without_south': + command => "/usr/bin/python /srv/spel/dev/files/settings_south_syncdb.py -i /srv/spel/src/spel/settings.py && . ${path_to_virtualenv}/bin/activate && ${path_to_virtualenv}/bin/python manage.py syncdb --noinput", + cwd => '/srv/spel/src', + user => 'vagrant', + provider => 'shell'; + } + exec { 'syncdb_with_south': + command => "/usr/bin/python /srv/spel/dev/files/settings_south_syncdb.py -r -i /srv/spel/src/spel/settings.py && . ${path_to_virtualenv}/bin/activate && ${path_to_virtualenv}/bin/python manage.py syncdb --noinput", cwd => '/srv/spel/src', user => 'vagrant', - provider => 'shell' + provider => 'shell', + require => Exec['syncdb_without_south']; + } + exec { 'tricking_manage_py': + command => ". ${path_to_virtualenv}/bin/activate && ${path_to_virtualenv}/bin/python manage.py migrate --fake", + cwd => '/srv/spel/src', + user => 'vagrant', + provider => 'shell', + require => Exec['syncdb_with_south']; } exec { 'loaddata': @@ -18,7 +32,7 @@ cwd => '/srv/spel/src', user => 'vagrant', provider => 'shell', - require => Exec['syncdb'] + require => Exec['tricking_manage_py'] } exec { 'createsuperuser': @@ -27,7 +41,7 @@ user => 'vagrant', provider => 'shell', onlyif => "/bin/echo \"from django.contrib.auth.models import User; exit(User.objects.filter(username='${superuser_name}').count())\" | . ${path_to_virtualenv}/bin/activate && ${path_to_virtualenv}/bin/python manage.py shell", - require => Exec['syncdb'] + require => Exec['tricking_manage_py'] } } \ No newline at end of file