Added ENV Var BASE_URL to js code

pull/130/head
Chris Chase 2020-07-29 14:01:42 +09:30
parent 0eaacba591
commit 229fb903cd
3 changed files with 25 additions and 21 deletions

9
app.js
View File

@ -14,6 +14,7 @@ var busboy = require('connect-busboy'); // for file upload
// basic auth // basic auth
var BASIC_AUTH_USER = process.env.BASIC_AUTH_USER; var BASIC_AUTH_USER = process.env.BASIC_AUTH_USER;
var BASIC_AUTH_PWD = process.env.BASIC_AUTH_PWD; var BASIC_AUTH_PWD = process.env.BASIC_AUTH_PWD;
const BASE_URL = process.env.BASE_URL || '/';
if (BASIC_AUTH_USER && BASIC_AUTH_PWD) { if (BASIC_AUTH_USER && BASIC_AUTH_PWD) {
app.use(function(req, res, next) { app.use(function(req, res, next) {
@ -43,10 +44,10 @@ app.use(bodyParser.urlencoded({ // to support URL-encoded bodies
app.use(busboy()); // to support file uploads app.use(busboy()); // to support file uploads
// include all folders // include all folders
app.use(express.static(__dirname + '/public')); app.use(BASE_URL, express.static(__dirname + '/public'));
app.use(express.static(__dirname + '/public/css')); app.use(BASE_URL, express.static(__dirname + '/public/css'));
app.use(express.static(__dirname + '/public/js')); app.use(BASE_URL, express.static(__dirname + '/public/js'));
app.use(express.static(__dirname + '/config')); app.use(BASE_URL, express.static(__dirname + '/config'));
app.set('views', __dirname + '/views'); app.set('views', __dirname + '/views');
// set host to 127.0.0.1 or the value set by environment var HOST // set host to 127.0.0.1 or the value set by environment var HOST

View File

@ -1,21 +1,24 @@
const BASE_URL = process.env.BASE_URL || '/';
exports.routes = { exports.routes = {
"root" : "/", "root" : BASE_URL,
"save" : "/save", "save" : BASE_URL+"save",
"run" : "/runjob", "run" : BASE_URL+"runjob",
"crontab" : "/crontab", "crontab" : BASE_URL+"crontab",
"stop" : "/stop", "stop" : BASE_URL+"stop",
"start" : "/start", "start" : BASE_URL+"start",
"remove": "/remove", "remove": BASE_URL+"remove",
"backup": "/backup", "backup": BASE_URL+"backup",
"restore": "/restore", "restore": BASE_URL+"restore",
"delete_backup": "/delete", "delete_backup": BASE_URL+"delete",
"restore_backup": "/restore_backup", "restore_backup": BASE_URL+"restore_backup",
"export": "/export", "export": BASE_URL+"export",
"import": "/import", // this is import from database "import": BASE_URL+"import", // this is import from database
"import_crontab": "/import_crontab", // this is from existing crontab "import_crontab": BASE_URL+"import_crontab", // this is from existing crontab
"logger": "/logger", "logger": BASE_URL+"logger",
"stdout": "/stdout", "stdout": BASE_URL+"stdout",
}; };
exports.relative = Object.keys(exports.routes).reduce((p, c) => ({...p, [c]: exports.routes[c].replace(/^\//, '')}), {}); exports.relative = Object.keys(exports.routes).reduce((p, c) => ({...p, [c]: exports.routes[c].replace(/^\//, '')}), {});
exports.relative["root"] = "."; exports.relative["root"] = ".";

View File

@ -6,7 +6,7 @@
<script src="bootstrap.min.js"></script> <script src="bootstrap.min.js"></script>
<script src="mailconfig.js"></script> <script src="mailconfig.js"></script>
<script type="text/javascript" src="https://cdn.datatables.net/v/bs/dt-1.10.12/datatables.min.js"></script> <script type="text/javascript" src="https://cdn.datatables.net/v/bs/dt-1.10.12/datatables.min.js"></script>
<link rel="stylesheet" href="bootstrap.min.css" /> <link rel="stylesheet" href="css/bootstrap.min.css" />
<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.10.12/css/dataTables.bootstrap.min.css"/> <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.10.12/css/dataTables.bootstrap.min.css"/>
<script type="text/javascript"> <script type="text/javascript">
var crontabs = []; var crontabs = [];