Changes for working on the STOUT server
diff --git a/demo/client/twisted_client.py b/demo/client/twisted_client.py
index a808ab9..68ce4ad 100644
--- a/demo/client/twisted_client.py
+++ b/demo/client/twisted_client.py
@@ -22,11 +22,11 @@
# stored within the client folder. This directory contains the example
# webpage that the user will interact with.
root = Resource()
-root.putChild("test", File("/vagrant/www"))
+root.putChild("test", File("/home/ubuntu/sites/testing/source/static/test-ale/client/www"))
factory = Site(root)
# Enable the webserver and listen on port 9000
# so we can distinguish this web server to regular
# port 80 web servers.
-reactor.listenTCP(80, factory)
+reactor.listenTCP(8080, factory)
reactor.run()
diff --git a/demo/client/www/index.html b/demo/client/www/index.html
index b6cb05d..340de16 100644
--- a/demo/client/www/index.html
+++ b/demo/client/www/index.html
@@ -19,7 +19,7 @@
<meta charset="UTF-8">
<title></title>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.4/css/bootstrap.min.css"/>
- <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.css"/>
+ <link rel="stylesheet" href="https://cdn.leafletjs.com/leaflet-0.7.3/leaflet.css"/>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.2/jquery-ui.min.css"/>
@@ -154,7 +154,7 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.2/underscore.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.4/js/bootstrap.min.js"></script>
-<script src="http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.js"></script>
+<script src="https://cdn.leafletjs.com/leaflet-0.7.3/leaflet.js"></script>
<script src="js/map.js"></script>
<script src="js/logging.js"></script>
diff --git a/demo/client/www/js/logging.js b/demo/client/www/js/logging.js
index a16b7dd..5ab3959 100644
--- a/demo/client/www/js/logging.js
+++ b/demo/client/www/js/logging.js
@@ -49,7 +49,7 @@
var ale2 = new userale(
{
- loggingUrl: 'http://192.16.1.100',
+ loggingUrl: 'https://'+location.hostname,
toolName: 'userale-test',
toolVersion: '3.0.0',
elementGroups: [
diff --git a/demo/client/www/js/map.js b/demo/client/www/js/map.js
index 2805607..05fc291 100644
--- a/demo/client/www/js/map.js
+++ b/demo/client/www/js/map.js
@@ -21,7 +21,7 @@
$( document ).ready(function() {
var map = L.map('map-container').setView([51.505, -0.09], 13);
- L.tileLayer('http://{s}.tiles.mapbox.com/v3/dvreed77.i39bj2hd/{z}/{x}/{y}.png', {
+ L.tileLayer('https://{s}.tiles.mapbox.com/v3/dvreed77.i39bj2hd/{z}/{x}/{y}.png', {
attribution: 'Map data © <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="http://mapbox.com">Mapbox</a>',
maxZoom: 18
}).addTo(map);
diff --git a/demo/dashboard/files/twisted_app.py b/demo/dashboard/files/twisted_app.py
index 2904700..1e66bbc 100644
--- a/demo/dashboard/files/twisted_app.py
+++ b/demo/dashboard/files/twisted_app.py
@@ -28,7 +28,7 @@
import simplejson
-ALLOW_ORIGIN = 'http://192.16.1.10'
+ALLOW_ORIGIN = 'http://localhost:8080'
if not os.path.exists('/var/log/xdata'):
os.makedirs('/var/log/xdata')
@@ -145,7 +145,7 @@
root.putChild("send_log", Logger())
# create a resource to serve static files
-tmp_service = internet.TCPServer(80, Site(root))
+tmp_service = internet.TCPServer(5050, Site(root))
application = service.Application("User-ALE")
# attach the service to its parent application
