Bug fixes, makefile for launch

config/README.md

@@ -1,8 +0,0 @@
-## Configuration: example
-The files inside this directory (not the ones in `env/`) are a sample of the required configuration.
-
-Please create a copy of these files under `<location of downloads>/config/...`.
-
-> Note:
->
-> Some of the fields are blank, please fill them in as needed.

config/container.yaml

@@ -0,0 +1,37 @@
+mail:
+  smtp_server: smtp.ethz.ch
+  port: 587
+  sender: "****************"
+  recipient: "****************"
+  uname: "****************"
+  password: "************"
+
+
+slack:
+  bot_id: U02MR1R8UJH
+  archive_id: C02MM7YG1V4
+  debug_id: C02NM2H9J5Q
+  api_wait_time: 90
+  auth_token: "****************"
+  app_token: "****************"
+
+
+database:
+  debug_db: /app/containerdata/debug/downloads.db
+  db_printout: /app/containerdata/backups
+  production_db_name: coss_archiving
+  production_user_name: "ca_rw"
+  production_password: "****************"
+
+  ## user_name: ca_ro
+  ## password: "****************"
+
+
+downloads:
+  local_storage_path: /app/containerdata/files
+  debug_storage_path: /app/containerdata/debug/
+  default_download_path: /app/containerdata/tmp
+  remote_storage_path: /helbing_support/Archiving-Pipeline
+  browser_profile_path: /app/containerdata/dependencies/news_fetch.profile
+  # please keep this exact name
+  browser_print_delay: 3

config/db.config.ini

@@ -1,7 +0,0 @@
-[DATABASE]
-db_name: coss_archiving
-user_name: ****************
-password: ****************
-
-## user_name: ca_ro
-## password: #TK5cLxA^YyoxWjR6

config/local.env

@@ -0,0 +1,18 @@
+CONTAINER_DATA=***********
+UNAME=***********
+U_ID=***********
+
+DB_HOST=***********
+
+
+OPENCONNECT_URL=***********
+OPENCONNECT_USER=***********
+OPENCONNECT_PASSWORD=***********
+OPENCONNECT_OPTIONS=--authgroup student-net
+
+
+NAS_HOST=***********
+NAS_PATH=/gess_coss_1/helbing_support/Archiving-Pipeline
+NAS_USERNAME=***********
+NAS_PASSWORD=***********
+# Special characters like # need to be escaped (write: \#) 

config/nas_login.config

@@ -1,3 +0,0 @@
-user=remoll
-domain=D
-password=****************

config/nas_sync.config

@@ -1,12 +0,0 @@
-settings {
-   logfile    = "/tmp/lsyncd.log",
-   statusFile = "/tmp/lsyncd.status",
-   nodaemon   = true,
-}
-
-sync {
-   default.rsync,
-   source = "/sync/local_files",
-   target = "/sync/remote_files",
-   init = false,
-}

config/news_fetch.config.ini

@@ -1,31 +0,0 @@
-[MAIL]
-smtp_server: smtp.ethz.ch
-port: 587
-sender: ****************
-recipient: ****************
-uname: ****************
-password: ****************
-
-
-[SLACK]
-bot_id: U02MR1R8UJH
-archive_id: C02MM7YG1V4
-debug_id: C02NM2H9J5Q
-api_wait_time: 90
-auth_token: ****************
-app_token: ****************
-
-
-[DATABASE]
-download_db_debug: /app/containerdata/debug/downloads.db
-db_printout: /app/containerdata/backups
-
-
-[DOWNLOADS]
-local_storage_path: /app/containerdata/files
-debug_storage_path: /app/containerdata/debug/
-default_download_path: /app/containerdata/tmp
-remote_storage_path: /helbing_support/Archiving-Pipeline
-browser_profile_path: /app/containerdata/dependencies/news_fetch.profile
-# please keep this exact name
-browser_print_delay: 3

config/vpn.config

@@ -1,4 +0,0 @@
-OPENCONNECT_URL=sslvpn.ethz.ch/student-net
-OPENCONNECT_USER=****************
-OPENCONNECT_PASSWORD=****************
-OPENCONNECT_OPTIONS=--authgroup student-net