diff --git a/infoscreen/static/infoscreen/js/infoscreen_controllers.js b/infoscreen/static/infoscreen/js/infoscreen_controllers.js index 4176671..7890587 100644 --- a/infoscreen/static/infoscreen/js/infoscreen_controllers.js +++ b/infoscreen/static/infoscreen/js/infoscreen_controllers.js @@ -56,7 +56,8 @@ app.filter('unsafe', function($sce) { app.controller('ABBController', function($scope, $http){ $scope.jobs = []; var min_date = moment().subtract(30,'days').format("YYYY-MM-DD%20HH:mm:ss"); - var url = "https://sahkoinsinoorikilta.fi/api/news.php"; + // TODO: FIX, we try to get rid of php, not depend on it! + var url = "https://old.sahkoinsinoorikilta.fi/api/news.php"; var params = "?type=11&lang=fi&title_search=ABB&min_date="+min_date $http.get(url+params).then(function(response){ $scope.jobs = _.filter(response.data, function(job){ diff --git a/sikweb/settings.py b/sikweb/settings.py index a845434..6ec495c 100644 --- a/sikweb/settings.py +++ b/sikweb/settings.py @@ -17,7 +17,7 @@ from sikweb.base import * DEBUG = os.getenv('DEBUG', False) == 'True' URL = os.getenv("HOST", "api.sahkoinsinoorikilta.fi") -FRONTEND_URL = os.getenv("FRONTEND_URL", "prod.sahkoinsinoorikilta.fi") +FRONTEND_URL = os.getenv("FRONTEND_URL", "sahkoinsinoorikilta.fi") ALLOWED_HOSTS = ["localhost", "127.0.0.1", FRONTEND_URL, URL] if DEBUG: ALLOWED_HOSTS = ["*"] diff --git a/stack-compose.yml b/stack-compose.yml index ca2e14b..ebd24ba 100644 --- a/stack-compose.yml +++ b/stack-compose.yml @@ -47,7 +47,7 @@ services: - DB_USER_FILE=/run/secrets/BACKEND_DB_USER - DB_PASSWD_FILE=/run/secrets/BACKEND_DB_PASSWD - HOST=api.sahkoinsinoorikilta.fi - - FRONTEND_URL=prod.sahkoinsinoorikilta.fi + - FRONTEND_URL=sahkoinsinoorikilta.fi - DB_HOST=db - DB_PORT=5432 - EMAIL_API_KEY_FILE=/run/secrets/BACKEND_EMAIL_API_KEY