simplify

software/peertube/buildout.hash.cfg

@@ -54,4 +54,4 @@ md5sum = 58d1a4fe246169dea94d7d243b4bac9e
 
 [template-peertube-restore-script]
 filename = template-peertube-restore.sh.in
-md5sum = bb909227944d626bbe7358ef2669cce2
+md5sum = b13f7e25923da03aaa1d09f54505f639

software/peertube/template-peertube-restore.sh.in

@@ -49,47 +49,6 @@ if ! [ -d /proc/$postgresql_pid ]; then
   exit 1
 fi
 
-tpgwait=60
-while ! [ -e "$pid_file" ]; do
-    tpgwait=$(( $tpgwait - 1 ))
-    test $tpgwait = 0 && die "Can not create pid_file"
-    echo "pid_file not exist; will retry $tpgwait times..." 1>&2
-    sleep 1
-done
-
-# run psql
-psql() {
-    $${postgresql:bin}/psql \
-        -h $${postgresql:pgdata-directory}  \
-        -U $${postgresql:superuser}         \
-        -d $${postgresql:dbname}            \
-        "$@"
-}
-
-echo "Ready to check postgresql is running..."
-
-# initial db setup
-# ( first quering PG several times waiting a bit till postgresql is started and ready )
-tpgwait=10
-while true; do
-    pgtables="$(psql -c '\d' 2>&1)" && break
-    tpgwait=$(( $tpgwait - 1 ))
-    test $tpgwait = 0 && die "pg query problem"
-    echo "I: PostgreSQL is not ready (yet ?); will retry $tpgwait times..." 1>&2
-    sleep 1
-done
-echo "I: PostgreSQL ready." 1>&2
-
-# sleep 5
-
-echo "Check postgresql is running again"
-
-# Check the postgresql is running, if postgresql has stopped, abort
-if ! [ -e "$pid_file" ]; then
-  echo "postgresql exited, aborting."
-  exit 1
-fi
-
 echo "Postgresql is running, ready to restore"
 
 # Restore the database