deploy: Further improvements regarding db initialization

- Proper chain between init_user and zeus log file tasks
- Prevent setting of user groups for unsaved user entry
- Fix for duplicate variable declaration in dev mode

deploy/grnet-zeus/manifests/init.pp

@@ -118,6 +118,7 @@
         owner => 'www-data',
         group => 'celery',
         recurse => true,
+        ignore => '.git',
         require => Package['celeryd']
     }
 
@@ -176,9 +177,10 @@
         require => File['zeus_settings']
     }
 
-    $collectcmd = "python manage.py collectstatic --noinput"
     if $dev {
         $collectcmd = "python manage.py collectstatic --noinput -l"
+    } else {
+        $collectcmd = "python manage.py collectstatic --noinput"
     }
 
     exec {'zeus_collectstatic':
@@ -250,9 +252,7 @@
         cwd => $appdir,
         path => ["/usr/bin", "/usr/sbin"],
         require => [File['zeus_settings'], Exec['zeus_migrations']],
-        creates => '/srv/zeus-data/zeus.log',
-        user => 'www-data',
-        group => 'celery'
+        notify  => File['zeus_zeus_log']
     }
 
     apache::listen { $port: }

deploy/init.py

@@ -27,11 +27,13 @@ def main(institution_name, username, password):
     user.management_p = True
     user.institution = inst
     user.ecounting_account = False
-    user.user_groups = UserGroup.objects.all()
     user.info = {
         "name": username,
         "password": make_password(password)
     }
+    if not user.pk:
+        user.save()
+    user.user_groups = UserGroup.objects.all()
     user.save()
 
 main(*sys.argv[1:])