use bash script for postgress too. Also I think requirements.txt nede…

…d to be redone

init-host.py

@@ -72,11 +72,13 @@ def main():
     # summon tar and qcow files
     if not isfile(join(TAR_DIR, basename(TAR_URL))):
         progress("Downloading %s".format(basename(TAR_URL)))
-        run(["wget", TAR_URL], cwd=TAR_DIR)
+        os.chdir(TAR_DIR)
+        run(["wget", TAR_URL])
+        os.chdir(LAVA_DIR)
     else:
         progress("Found existing target_bins/{}".format(basename(TAR_URL)))
 
-    if not isfile(join(LAVA_DIR, basename(QCOW_URL))):
+    if not isfile(join(LAVA_DIR, basename(QCOW_FILE_NAME))):
         progress("Downloading {}".format(basename(QCOW_URL)))
         run(["wget", "--no-check-certificate", QCOW_URL, "-O", QCOW_FILE_NAME])
     else:
@@ -86,7 +88,7 @@ def main():
         progress("Building host.json")
         # Build host.json
         json_configs = {}
-        json_configs["qemu"] = "anda-system-i386"
+        json_configs["qemu"] = "panda-system-i386"
         json_configs["qcow_dir"] = LAVA_DIR
         json_configs["output_dir"] = join(LAVA_DIR, "target_injections")
         json_configs["config_dir"] = join(LAVA_DIR, "target_configs")

install.sh

@@ -53,9 +53,9 @@ progress "Installed build dependencies"
 $SUDO pip3 install --upgrade pip
 
 # This seems to be the better replacement to have all python packages
-$SUDO pip3 install -r docker/requirements.txt
+$SUDO pip3 install -r requirements.txt
 progress "Installed Python requirements"
 
-$SUDO python3 setup_container.py
+./setup_container.sh
 
 progress "Installed LAVA"

requirements.txt

@@ -1,13 +1,9 @@
-SQLAlchemy==1.0.14
-zmq==0.0.0
-pyzmq==15.2.0
-psycopg2==2.6.1
-lockfile==0.10.2
-tabulate==0.7.5
-pexpect==3.2
-psutil==5.6.6
-ipython==2.3.0
-colorama==0.3.2
-numpy==1.8.2
-argparse==1.2.1
-pandare
+colorama
+db
+ipython
+lockfile
+numpy
+pandare
+PyYAML
+SQLAlchemy
+tabulate

scripts/setup_postgres.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+set -ex
+
+PGPASS="${HOME}/.pgpass"
+
+if [ ! -f "${PGPASS}" ]; then
+    postgres_depends=$(dpkg-query -W -f='${depends}' 'postgresql')
+    postgres_pkg=$(echo "${postgres_depends}" | grep -oP 'postgresql-[0-9]+.?[0-9]+')
+    postgres_version=${postgres_pkg/postgresql-/}
+    pg_hba="/etc/postgresql/${postgres_version}/main/pg_hba.conf"
+    postgres_password='postgrespostgres'
+
+    sudo sed -i.bak -E 's/^(local\s+all\s+postgres\s+)md5$/\1peer/' "${pg_hba}"
+    sudo service postgresql reload
+
+    password_sql="ALTER USER postgres WITH PASSWORD '${postgres_password}';"
+    sudo -u postgres psql -c "${password_sql}"
+
+    echo "*:*:*:postgres:${postgres_password}" > "${PGPASS}"
+    chmod 600 "${PGPASS}"
+
+    sudo sed -i.bak -E 's/^(local\s+all\s+postgres\s+)peer$/\1md5/' "${pg_hba}"
+    sudo service postgresql reload
+fi