#56: path to config.ini is now relative

vital_site/scripts/on_web_server_startup.sh

@@ -11,11 +11,11 @@
 
 # Read details from Config File
 # reading from config file
-dbhost=$(awk -F ":" '/VITAL_DB_HOST/ {print $2}' /home/vital/config.ini | tr -d ' ')
-dbpass=$(awk -F ":" '/VITAL_DB_PWD/ {print $2}' /home/vital/config.ini | tr -d ' ')
-dbname=$(awk -F ":" '/VITAL_DB_NAME/ {print $2}' /home/vital/config.ini | tr -d ' ')
-dbuser=$(awk -F ":" '/VITAL_DB_USER/ {print $2}' /home/vital/config.ini | tr -d ' ')
-dbport=$(awk -F ":" '/VITAL_DB_PORT/ {print $2}' /home/vital/config.ini | tr -d ' ')
+dbhost=$(awk -F ":" '/VITAL_DB_HOST/ {print $2}' ../../../../config/config.ini | tr -d ' ')
+dbpass=$(awk -F ":" '/VITAL_DB_PWD/ {print $2}' ../../../../config/config.ini | tr -d ' ')
+dbname=$(awk -F ":" '/VITAL_DB_NAME/ {print $2}' ../../../../config/config.ini | tr -d ' ')
+dbuser=$(awk -F ":" '/VITAL_DB_USER/ {print $2}' ../../../../config/config.ini | tr -d ' ')
+dbport=$(awk -F ":" '/VITAL_DB_PORT/ {print $2}' ../../../../config/config.ini | tr -d ' ')
 
 
 

vital_site/scripts/ws_course_network_startup.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 
 #reading from config file
-host=$(awk -F ":" '/VITAL_DB_HOST/ {print $2}' /home/vital/config.ini | tr -d ' ')
-pass=$(awk -F ":" '/VITAL_DB_PWD/ {print $2}' /home/vital/config.ini | tr -d ' ')
-port=$(awk -F ":" '/VITAL_DB_PORT/ {print $2}' /home/vital/config.ini | tr -d ' ')
-dbname=$(awk -F ":" '/VITAL_DB_NAME/ {print $2}' /home/vital/config.ini | tr -d ' ')
+host=$(awk -F ":" '/VITAL_DB_HOST/ {print $2}' ../../../../config/config.ini | tr -d ' ')
+pass=$(awk -F ":" '/VITAL_DB_PWD/ {print $2}' ../../../../config/config.ini | tr -d ' ')
+port=$(awk -F ":" '/VITAL_DB_PORT/ {print $2}' ../../../../config/config.ini | tr -d ' ')
+dbname=$(awk -F ":" '/VITAL_DB_NAME/ {print $2}' ../../../../config/config.ini | tr -d ' ')
 
 vlan=$1
 if /sbin/ethtool bond0.$vlan | grep -q "Link detected: yes"; then

vital_site/vital/management/commands/CollectCourseStats.py

@@ -3,6 +3,7 @@
 from django.utils import timezone
 from vital.models import Course, Registered_Course, User_Network_Configuration, Available_Config, User_VM_Config
 from django.utils.crypto import get_random_string
+from django.conf import settings
 import ConfigParser
 import os
 import errno
@@ -11,8 +12,7 @@
 config = ConfigParser.ConfigParser()
 config.optionxform=str
 
-# TODO change to common config file in shared location
-config.read("/home/vital/config.ini")
+config.read("../../"+settings.CONFIG_PATH)
 
 class Command(BaseCommand):
     help = "Collect Stats for the Vital"

vital_site/vital/management/commands/ResetCourse.py

@@ -3,6 +3,7 @@
 from django.utils import timezone
 from vital.models import Course, Registered_Course, User_Network_Configuration, Available_Config, User_VM_Config
 from django.utils.crypto import get_random_string
+from django.conf import settings
 import ConfigParser
 import os
 import errno
@@ -11,8 +12,7 @@
 config = ConfigParser.ConfigParser()
 config.optionxform=str
 
-# TODO change to common config file in shared location
-config.read("/home/vital/config.ini")
+config.read("../../"+settings.CONFIG_PATH)
 
 class Command(BaseCommand):
     help = "resets a course to remove all students and generate a new registration code"

vital_site/vital/management/commands/ResetStudentEnvironment.py

@@ -6,14 +6,13 @@
 from django.contrib.sessions.models import Session
 import ConfigParser
 from django.db import transaction
+from django.conf import settings
 
 logger = logging.getLogger(__name__)
 config = ConfigParser.ConfigParser()
 config.optionxform=str
 
-# TODO change to common config file in shared location
-config.read("/home/vital/config.ini")
-
+config.read("../../"+settings.CONFIG_PATH)
 
 class Command(BaseCommand):
 

vital_site/vital/management/commands/ZmqSlave.py

@@ -1,6 +1,7 @@
 from django.core.management.base import BaseCommand, CommandError
 import logging
 from django.utils import timezone
+from django.conf import settings
 
 import zmq
 import vital.tasks as tasks
@@ -10,7 +11,7 @@
 config.optionxform=str
 
 # TODO change to common config file in shared location
-config.read("/home/vital/config.ini")
+config.read("../../"+settings.CONFIG_PATH)
 
 zmqMaster = config.get("VITAL", "ZMQ_MASTER")
 

vital_site/vital/utils.py

@@ -9,12 +9,14 @@
 from django.db import transaction
 from influxdb import InfluxDBClient
 
+from django.conf import settings
+
 logger = logging.getLogger(__name__)
 config = ConfigParser.ConfigParser()
 config.optionxform=str
 
 # TODO change to common config file in shared location
-config.read("/home/vital/config.ini")
+config.read(settings.CONFIG_PATH)
 
 
 def audit(request, action):

vital_site/vital/views/security_view.py

@@ -4,6 +4,8 @@
 from django.http import HttpResponseNotAllowed, HttpResponse
 from django.contrib.auth import update_session_auth_hash
 from django.contrib.auth.decorators import login_required
+from django.conf import settings
+
 from ..utils import XenClient, audit, get_notification_message
 from subprocess import Popen, PIPE
 from captcha.models import CaptchaStore
@@ -26,7 +28,7 @@
 config_ini.optionxform=str
 
 # TODO change to common config file in shared location
-config_ini.read("/home/vital/config.ini")
+config_ini.read("../"+settings.CONFIG_PATH)
 
 
 logger = logging.getLogger(__name__)

vital_site/vital_site/settings.py

@@ -9,7 +9,8 @@
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 config = ConfigParser.ConfigParser()
-config.read("/home/vital/config.ini")
+CONFIG_PATH = "/home/vital/config.ini"
+config.read(CONFIG_PATH)
 
 # SECURITY WARNING: keep the secret key used in production secret!
 SECRET_KEY = config.get("Security", "SECRET_KEY")