[trafficcontrol] 04/04: Fixes #2848 extraneous code removed, restored config and properties files to default settings

[mi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mitchell852 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git

commit af59e199f9f5b45f7f66a384ccb06d75f2d4e77b
Author: cgillo000 <ch...@cable.comcast.com>
AuthorDate: Mon Sep 24 09:15:35 2018 -0600

    Fixes #2848 extraneous code removed, restored config and properties
    files to default settings
---
 ...ableDeliveryServiceRequestCommentsController.js |  3 --
 .../app/src/traffic_portal_properties.json         |  2 +-
 traffic_portal/conf/config.js                      | 51 +++++++++++-----------
 3 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/traffic_portal/app/src/common/modules/table/deliveryServiceRequestComments/TableDeliveryServiceRequestCommentsController.js b/traffic_portal/app/src/common/modules/table/deliveryServiceRequestComments/TableDeliveryServiceRequestCommentsController.js
index 268653e..ed775de 100644
--- a/traffic_portal/app/src/common/modules/table/deliveryServiceRequestComments/TableDeliveryServiceRequestCommentsController.js
+++ b/traffic_portal/app/src/common/modules/table/deliveryServiceRequestComments/TableDeliveryServiceRequestCommentsController.js
@@ -37,9 +37,6 @@ var TableDeliveryServicesRequestsController = function (request, $scope, $state,
 		}).then(
 			function (comments) {
 				$scope.comments = comments;
-				if ($scope.comments.length <= 0) {
-
-				}
 			}
 		);
 	};
diff --git a/traffic_portal/app/src/traffic_portal_properties.json b/traffic_portal/app/src/traffic_portal_properties.json
index 64ea674..cc3734e 100644
--- a/traffic_portal/app/src/traffic_portal_properties.json
+++ b/traffic_portal/app/src/traffic_portal_properties.json
@@ -377,7 +377,7 @@
     },
     "dsRequests": {
       "_comments": "Should all delivery service changes go through the delivery service review process? You can also provide a role that will skip the process.",
-      "enabled": true,
+      "enabled": false,
       "roleNeededToSkip": "admin"
     },
     "servers": {
diff --git a/traffic_portal/conf/config.js b/traffic_portal/conf/config.js
index b59aa31..9830667 100644
--- a/traffic_portal/conf/config.js
+++ b/traffic_portal/conf/config.js
@@ -19,31 +19,30 @@
 
 // this is the config that is consumed by /server.js on traffic portal startup (sudo service traffic_portal start)
 module.exports = {
-	timeout: '120s',
-	useSSL: true, // set to true if you plan to use https (self-signed or trusted certs).
-	port: 8080, // set to http port
-	sslPort: 4443, // set to https port
-	// if useSSL is true, generate ssl certs and provide the proper locations.
-	ssl: {
-		key:    '/etc/pki/tls/private/localhost.key',
-		cert:   '/etc/pki/tls/certs/localhost.crt',
-		ca:     [ '/etc/pki/tls/certs/ca-bundle.crt' ]
-	},
-	// set api 'base_url' to the traffic ops api url (all api calls made from the traffic portal will be proxied to the api base_url)
-	api: {
-		base_url: 'https://localhost:6443/api/'
-	},
-	// default static files location (this is where the traffic portal html, css and javascript was installed. rpm installs these files at /opt/traffic_portal/public
-	// change this to ./app/dist/public/ if you are running locally for development
-	files: {
-		// static: '/opt/traffic_portal/public'
-		static: './app/dist/public'
-	},
-	// default log location (this is where traffic_portal logs are written)
-	// change this to ./server/log/access.log if you are running traffic portal locally for development
-	log: {
-		stream: '/var/log/traffic_portal/access.log'
-	},
-	reject_unauthorized: 0 // 0 if using self-signed certs, 1 if trusted certs
+    timeout: '120s',
+    useSSL: true, // set to true if you plan to use https (self-signed or trusted certs).
+    port: 80, // set to http port
+    sslPort: 443, // set to https port
+    // if useSSL is true, generate ssl certs and provide the proper locations.
+    ssl: {
+        key:    '/etc/pki/tls/private/localhost.key',
+        cert:   '/etc/pki/tls/certs/localhost.crt',
+        ca:     [ '/etc/pki/tls/certs/ca-bundle.crt' ]
+    },
+    // set api 'base_url' to the traffic ops api url (all api calls made from the traffic portal will be proxied to the api base_url)
+    api: {
+        base_url: 'https://trafficops.CHANGEME.domain.com/api/'
+    },
+    // default static files location (this is where the traffic portal html, css and javascript was installed. rpm installs these files at /opt/traffic_portal/public
+    // change this to ./app/dist/public/ if you are running locally for development
+    files: {
+        static: '/opt/traffic_portal/public'
+    },
+    // default log location (this is where traffic_portal logs are written)
+    // change this to ./server/log/access.log if you are running traffic portal locally for development
+    log: {
+        stream: '/var/log/traffic_portal/access.log'
+    },
+    reject_unauthorized: 0 // 0 if using self-signed certs, 1 if trusted certs
 };