rename scripts

diff --git a/README.rst b/README.rst
index 93bdc5786cac6ee9210d54a764efd0a2b8254b8f..2e7b14371213dc1b57f2310392c36d2b7be3d919 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -45,14 +45,14 @@ Backup / Restore
 To backup the database, in **another** terminal (or a Docker Quickstart Terminal)::
 
     cd Manifeste
-    scripts/backup.sh
+    scripts/push.sh
 
 giving your user password if asked...
 
 To restore the backuped database, in another terminal (or a Docker Quickstart Terminal)::
 
     cd Manifeste
-    scripts/restore.sh
+    scripts/pull.sh
 
 If the app is broken after a restore script, restart the composition with::
 

diff --git a/app/middleware.py b/app/middleware.py
deleted file mode 100644 (file)
index 43a158a..0000000
--- a/app/middleware.py
+++ /dev/null
@@ -1,22 +0,0 @@
-from django.core.exceptions import MiddlewareNotUsed
-from django.conf import settings
-from django.core.management import call_command
-
-
-class StartupMiddleware(object):
-
-    def __init__(self):
-        up = False
-        print 'check..................................'
-        while not up:
-            try:
-                # # The following db settings name is django 1.2.  django < 1.2 will use settings.DATABASE_NAME
-                # if settings.DATABASES['default']['NAME'] == ':memory:':
-                call_command('syncdb', interactive=False)
-                call_command('collectstatic', interactive=False)
-                up = True
-            except:
-                print 'waiting...'
-                time.sleep(1)
-
-        raise MiddlewareNotUsed('Startup complete')

diff --git a/scripts/backup.sh b/scripts/backup.sh
deleted file mode 100755 (executable)
index 14175e7..0000000
--- a/scripts/backup.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-docker-compose run db /srv/scripts/backup_db.sh
-git add data/media
-git commit -a -m "update DB and media"
-git push

diff --git a/scripts/pull.sh b/scripts/pull.sh
new file mode 100755 (executable)
index 0000000..bd4b4f4
--- /dev/null
+++ b/scripts/pull.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+sudo chown -R $USER data/media
+sudo chown -R $USER data/backup
+git pull
+git submodule foreach git pull origin master
+docker-compose run db /srv/scripts/restore_db.sh

diff --git a/scripts/push.sh b/scripts/push.sh
new file mode 100755 (executable)
index 0000000..14175e7
--- /dev/null
+++ b/scripts/push.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+docker-compose run db /srv/scripts/backup_db.sh
+git add data/media
+git commit -a -m "update DB and media"
+git push

diff --git a/scripts/restore.sh b/scripts/restore.sh
deleted file mode 100755 (executable)
index bd4b4f4..0000000
--- a/scripts/restore.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-sudo chown -R $USER data/media
-sudo chown -R $USER data/backup
-git pull
-git submodule foreach git pull origin master
-docker-compose run db /srv/scripts/restore_db.sh