Skip to content

Commit

Permalink
lots of fixes to account administration ui, change to elastic.yml to …
Browse files Browse the repository at this point in the history 
…manage heap size, etc
  • Loading branch information
Bryce Ellis Montano committed Mar 21, 2019
1 parent 36acec1 commit 007eff5
Show file tree
Hide file tree
Showing 26 changed files with 185 additions and 188 deletions.
2 changes: 1 addition & 1 deletion docker-configs/elastic/elasticsearch.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ discovery.zen.minimum_master_nodes: 1
xpack.security.enabled: false
path.repo: [ '/opt/scotbackup/elastic', '/opt/scotbackup/']
path.data: /var/lib/elasticsearch/
#path.logs: /var/log/elasticsearch/
discovery.type: single-node
5 changes: 3 additions & 2 deletions docker-configs/mongodb/set_mongodb_config.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ set='$set'
# users if we're recreating the container (provided we're using some persistent storage)

if [ ! -f /var/lib/mongodb/mongodb_password_set ]; then
mongo scot-prod --host mongodb /opt/scot/install/src/mongodb/reset.js
mongo scot-prod --host mongodb /opt/scot/install/src/mongodb/admin_user.js
cd /opt/scot/install/src/mongodb/
mongo scot-prod --host mongodb reset.js
mongo scot-prod --host mongodb admin_user.js
mongo scot-prod --host mongodb --eval "db.user.update({username:'admin'}, {$set:{pwhash:'$HASH'}}, {multi:true})"
echo "Mapping set for Mongo" > /var/lib/mongodb/mongodb_password_set
fi
Expand Down
14 changes: 0 additions & 14 deletions public/asset-manifest.json
View file

This file was deleted.

2 changes: 1 addition & 1 deletion public/index.html
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><meta name="description" content=""><meta name="author" content=""><meta name="referrer" content="no-referrer"><title>SCOT 3.7</title><link rel="stylesheet" href="/css/revl.css"><link rel="manifest" href="/manifest.json"><link rel="stylesheet" href="/libs/bootstrap/css/bootstrap.min.css"><link rel="stylesheet" href="/libs/bootstrap/css/bootstrap-grid.min.css"><link rel="stylesheet" href="/css/react-table.css"><link rel="stylesheet" href="/css/font-awesome.min.css"><link rel="stylesheet" href="/css/react-calendar.css"><link rel="stylesheet" href="/css/reactTags.css"><link rel="stylesheet" href="/css/jquery.qtip.css"><link rel="stylesheet" href="/css/table-twbs.css"><link rel="stylesheet" href="/css/jquery-ui.css"><link rel="stylesheet" href="/css/codemirror.min.css"><link rel="stylesheet" href="/css/react-datetime.css"><link rel="stylesheet" href="/libs/tablesorter-master/css/theme.default.css"><link rel="stylesheet" href="/css/styles.css"><link rel="stylesheet" href="/css/sandbox.css"><link rel="stylesheet" href="/css/scot.css"><script type="text/javascript" src="/libs/jquery-3.3.1/jquery.min.js"></script><script type="text/javascript" src="/libs/bootstrap/js/bootstrap.min.js"></script><script type="text/javascript" src="/libs/jquery-2.1.1.1-nav.min.js"></script><script type="text/javascript" src="/libs/tinymce/js/tinymce/tinymce.min.js"></script><script type="text/javascript" src="/libs/bootstrap/js/bootstrap-nav.min.js"></script><script type="text/javascript" src="/libs/tablesorter-master/js/jquery.tablesorter.js"></script><script type="text/javascript" src="/libs/tablesorter-master/js/jquery.tablesorter.widgets.js"></script><script src="/libs/tablesorter-master/js/widgets/widget-sortTbodies.js"></script><script type="text/javascript" src="/libs/jquery.qtip.js"></script><script type="text/javascript" src="/libs/jquery-ui.min.js"></script><script type="text/javascript" src="/libs/jquery.ba-urlinternal.min.js"></script><script type="text/javascript" src="/libs/d3.4_10_0.min.js"></script><script type="text/javascript" src="/libs/polybool.min.js"></script><script src="/libs/jquery.mark.min.js"></script><style>body{padding-bottom:40px;background-color:#fff}</style><link href="/static/css/main.63eddf49.chunk.css" rel="stylesheet"></head><body><div id="notification"></div><div id="admin_notices"></div><span style="visibility:hidden;position:absolute;s-index:-5;top:0;left:0" id="invisible" class="details-subject"></span><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(l){function e(e){for(var r,t,n=e[0],o=e[1],u=e[2],f=0,i=[];f<n.length;f++)t=n[f],p[t]&&i.push(p[t][0]),p[t]=0;for(r in o)Object.prototype.hasOwnProperty.call(o,r)&&(l[r]=o[r]);for(s&&s(e);i.length;)i.shift()();return c.push.apply(c,u||[]),a()}function a(){for(var e,r=0;r<c.length;r++){for(var t=c[r],n=!0,o=1;o<t.length;o++){var u=t[o];0!==p[u]&&(n=!1)}n&&(c.splice(r--,1),e=f(f.s=t[0]))}return e}var t={},p={1:0},c=[];function f(e){if(t[e])return t[e].exports;var r=t[e]={i:e,l:!1,exports:{}};return l[e].call(r.exports,r,r.exports,f),r.l=!0,r.exports}f.m=l,f.c=t,f.d=function(e,r,t){f.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},f.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(r,e){if(1&e&&(r=f(r)),8&e)return r;if(4&e&&"object"==typeof r&&r&&r.__esModule)return r;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:r}),2&e&&"string"!=typeof r)for(var n in r)f.d(t,n,function(e){return r[e]}.bind(null,n));return t},f.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(r,"a",r),r},f.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},f.p="/";var r=window.webpackJsonp=window.webpackJsonp||[],n=r.push.bind(r);r.push=e,r=r.slice();for(var o=0;o<r.length;o++)e(r[o]);var s=n;a()}([])</script><script src="/static/js/2.5677ac7c.chunk.js"></script><script src="/static/js/main.bd33c90b.chunk.js"></script></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><meta name="description" content=""><meta name="author" content=""><meta name="referrer" content="no-referrer"><title>SCOT 3.7</title><link rel="stylesheet" href="/css/revl.css"><link rel="manifest" href="/manifest.json"><link rel="stylesheet" href="/libs/bootstrap/css/bootstrap.min.css"><link rel="stylesheet" href="/libs/bootstrap/css/bootstrap-grid.min.css"><link rel="stylesheet" href="/css/react-table.css"><link rel="stylesheet" href="/css/font-awesome.min.css"><link rel="stylesheet" href="/css/react-calendar.css"><link rel="stylesheet" href="/css/reactTags.css"><link rel="stylesheet" href="/css/jquery.qtip.css"><link rel="stylesheet" href="/css/table-twbs.css"><link rel="stylesheet" href="/css/jquery-ui.css"><link rel="stylesheet" href="/css/codemirror.min.css"><link rel="stylesheet" href="/css/react-datetime.css"><link rel="stylesheet" href="/libs/tablesorter-master/css/theme.default.css"><link rel="stylesheet" href="/css/styles.css"><link rel="stylesheet" href="/css/sandbox.css"><link rel="stylesheet" href="/css/scot.css"><script type="text/javascript" src="/libs/jquery-3.3.1/jquery.min.js"></script><script type="text/javascript" src="/libs/bootstrap/js/bootstrap.min.js"></script><script type="text/javascript" src="/libs/jquery-2.1.1.1-nav.min.js"></script><script type="text/javascript" src="/libs/tinymce/js/tinymce/tinymce.min.js"></script><script type="text/javascript" src="/libs/bootstrap/js/bootstrap-nav.min.js"></script><script type="text/javascript" src="/libs/tablesorter-master/js/jquery.tablesorter.js"></script><script type="text/javascript" src="/libs/tablesorter-master/js/jquery.tablesorter.widgets.js"></script><script src="/libs/tablesorter-master/js/widgets/widget-sortTbodies.js"></script><script type="text/javascript" src="/libs/jquery.qtip.js"></script><script type="text/javascript" src="/libs/jquery-ui.min.js"></script><script type="text/javascript" src="/libs/jquery.ba-urlinternal.min.js"></script><script type="text/javascript" src="/libs/d3.4_10_0.min.js"></script><script type="text/javascript" src="/libs/polybool.min.js"></script><script src="/libs/jquery.mark.min.js"></script><style>body{padding-bottom:40px;background-color:#fff}</style><link href="/static/css/main.d459716a.chunk.css" rel="stylesheet"></head><body><div id="notification"></div><div id="admin_notices"></div><span style="visibility:hidden;position:absolute;s-index:-5;top:0;left:0" id="invisible" class="details-subject"></span><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(l){function e(e){for(var r,t,n=e[0],o=e[1],u=e[2],f=0,i=[];f<n.length;f++)t=n[f],p[t]&&i.push(p[t][0]),p[t]=0;for(r in o)Object.prototype.hasOwnProperty.call(o,r)&&(l[r]=o[r]);for(s&&s(e);i.length;)i.shift()();return c.push.apply(c,u||[]),a()}function a(){for(var e,r=0;r<c.length;r++){for(var t=c[r],n=!0,o=1;o<t.length;o++){var u=t[o];0!==p[u]&&(n=!1)}n&&(c.splice(r--,1),e=f(f.s=t[0]))}return e}var t={},p={1:0},c=[];function f(e){if(t[e])return t[e].exports;var r=t[e]={i:e,l:!1,exports:{}};return l[e].call(r.exports,r,r.exports,f),r.l=!0,r.exports}f.m=l,f.c=t,f.d=function(e,r,t){f.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},f.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(r,e){if(1&e&&(r=f(r)),8&e)return r;if(4&e&&"object"==typeof r&&r&&r.__esModule)return r;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:r}),2&e&&"string"!=typeof r)for(var n in r)f.d(t,n,function(e){return r[e]}.bind(null,n));return t},f.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(r,"a",r),r},f.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},f.p="/";var r=window.webpackJsonp=window.webpackJsonp||[],n=r.push.bind(r);r.push=e,r=r.slice();for(var o=0;o<r.length;o++)e(r[o]);var s=n;a()}([])</script><script src="/static/js/2.17067e73.chunk.js"></script><script src="/static/js/main.22fbdc3c.chunk.js"></script></body></html>
28 changes: 13 additions & 15 deletions public/manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
{
"short_name": "SCOT 3.7",
"name": "Sandia Cyber Omni Tracker",
"icons": [
{
"src": "favicon.ico",
"sizes": "64x64 32x32 24x24 16x16",
"type": "image/x-icon"
}
],
"start_url": "./index.html",
"display": "standalone",
"theme_color": "#000000",
"background_color": "#ffffff",
"csp": "script-src 'self' 'unsafe-inline'; object-src 'self'"
}
"main.css": "/static/css/main.d459716a.chunk.css",
"main.js": "/static/js/main.22fbdc3c.chunk.js",
"main.js.map": "/static/js/main.22fbdc3c.chunk.js.map",
"runtime~main.js": "/static/js/runtime~main.42ac5946.js",
"runtime~main.js.map": "/static/js/runtime~main.42ac5946.js.map",
"static/js/2.17067e73.chunk.js": "/static/js/2.17067e73.chunk.js",
"static/js/2.17067e73.chunk.js.map": "/static/js/2.17067e73.chunk.js.map",
"index.html": "/index.html",
"precache-manifest.b596cce2d910ab054e150809773ade8a.js": "/precache-manifest.b596cce2d910ab054e150809773ade8a.js",
"service-worker.js": "/service-worker.js",
"static/css/main.d459716a.chunk.css.map": "/static/css/main.d459716a.chunk.css.map",
"static/media/scot_logo_473x473.png": "/static/media/scot_logo_473x473.981c5c79.png"
}
26 changes: 0 additions & 26 deletions public/precache-manifest.acda7d4f01062c0a8ba69b6108c54021.js
View file

This file was deleted.

26 changes: 26 additions & 0 deletions public/precache-manifest.b596cce2d910ab054e150809773ade8a.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
self.__precacheManifest = [
{
"revision": "981c5c79f3644d601a8bfd8c4f4d3bfd",
"url": "/static/media/scot_logo_473x473.981c5c79.png"
},
{
"revision": "42ac5946195a7306e2a5",
"url": "/static/js/runtime~main.42ac5946.js"
},
{
"revision": "22fbdc3c4db166fd73ff",
"url": "/static/js/main.22fbdc3c.chunk.js"
},
{
"revision": "17067e73abb7d4584e97",
"url": "/static/js/2.17067e73.chunk.js"
},
{
"revision": "22fbdc3c4db166fd73ff",
"url": "/static/css/main.d459716a.chunk.css"
},
{
"revision": "199f750a82a311d72ec941335f0144fa",
"url": "/index.html"
}
];
2 changes: 1 addition & 1 deletion public/service-worker.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
importScripts("https://storage.googleapis.com/workbox-cdn/releases/3.6.3/workbox-sw.js");

importScripts(
"/precache-manifest.acda7d4f01062c0a8ba69b6108c54021.js"
"/precache-manifest.b596cce2d910ab054e150809773ade8a.js"
);

workbox.clientsClaim();
Expand Down
2 changes: 1 addition & 1 deletion public/static/css/main.63eddf49.chunk.css → public/static/css/main.d459716a.chunk.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...ic/static/css/main.63eddf49.chunk.css.map → ...ic/static/css/main.d459716a.chunk.css.map
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions public/static/js/2.17067e73.chunk.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/static/js/2.5677ac7c.chunk.js.map → public/static/js/2.17067e73.chunk.js.map
View file

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions public/static/js/2.5677ac7c.chunk.js
View file

This file was deleted.

2 changes: 2 additions & 0 deletions public/static/js/main.22fbdc3c.chunk.js
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions public/static/js/main.22fbdc3c.chunk.js.map
View file

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions public/static/js/main.bd33c90b.chunk.js
View file

This file was deleted.

1 change: 0 additions & 1 deletion public/static/js/main.bd33c90b.chunk.js.map
View file

This file was deleted.

2 changes: 1 addition & 1 deletion public/static/js/runtime~main.fdfcfda2.js → public/static/js/runtime~main.42ac5946.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 007eff5

Please sign in to comment.