update cron + push script

diff --git a/install.py b/install.py
index 044d9ff652be56f96116deb82edda6139f6c056c..7e4c45b1447e169e8b34a7251f5c419bb87ae5d8 100755 (executable)
--- a/install.py
+++ b/install.py
@@ -158,7 +158,7 @@ class DockerCompositionInstaller(object):
         # version with migration
         # command = "cd /srv/ircam-www && git pull origin dev &&  " + self.docker_compose + " -f " + self.config + " run app /srv/app/manage.py migrate --noinput && ./scripts/push.sh >> /var/log/cri/cron/`date +\%Y\%m\%d\%H\%M\%S`-cron.log 2>&1 \n"
         # without migration
-        command = "cd /srv/ircam-www && git pull origin dev && ./scripts/push.sh >> /var/log/cri/cron/`date +\%Y\%m\%d-\%H-\%M-\%S`-cron.log 2>&1 \n"
+        command = "cd /srv/ircam-www && ./scripts/push.sh >> /var/log/cri/cron/`date +\%Y\%m\%d-\%H-\%M-\%S`-cron.log 2>&1 \n"
         rule = self.cron_rule % (self.user, command)
         f = open('/etc/cron.d/' + self.name, 'w')
         f.write(rule)

diff --git a/scripts/push.sh b/scripts/push.sh
index 2bc080c7df76d0a8af77f8729bb067aafd29c68f..4b8ccb9ef72752121e47d7245d6f5abcc49b07e6 100755 (executable)
--- a/scripts/push.sh
+++ b/scripts/push.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 
 docker-compose run db /srv/scripts/backup_db.sh
-git add data/media
+cd data
+git add .
 git commit -a -m "update DB and media"
-git push
+git pull origin master
+git push origin master