summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortomsmeding <tom.smeding@gmail.com>2019-02-03 17:35:20 +0100
committertomsmeding <tom.smeding@gmail.com>2019-02-03 17:35:20 +0100
commita52b7b3949e5fc39611e8d5f0a8791efcc5a816e (patch)
treea8c2a3ba8ff8b8fe4bc0eec269e040d0b4c03e5d
parent683f35ac44f725c6ea4276e4042b3a5d424776a8 (diff)
Move web_files to server folder
-rw-r--r--modules/$common.js2
-rw-r--r--modules/subd-krokodil/subd-krokodil.js2
-rwxr-xr-xwebserver.js14
3 files changed, 9 insertions, 9 deletions
diff --git a/modules/$common.js b/modules/$common.js
index c5c3635..3d66042 100644
--- a/modules/$common.js
+++ b/modules/$common.js
@@ -5,8 +5,8 @@ var cwd=process.cwd();
var globalAccounts=require(cwd+"/globalAccounts.json");
module.exports={
- "rootdir":path.dirname(cwd),
"serverdir":cwd,
+ "webfilesdir":cwd+"/web_files",
"simpleHTMLescape":function simpleHTMLescape(str){
return str.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');
},
diff --git a/modules/subd-krokodil/subd-krokodil.js b/modules/subd-krokodil/subd-krokodil.js
index beabddd..b788863 100644
--- a/modules/subd-krokodil/subd-krokodil.js
+++ b/modules/subd-krokodil/subd-krokodil.js
@@ -10,7 +10,7 @@ module.exports=function(app,io,moddir){
});
router.get("/",function(req,res){
- res.sendFile(cmn.rootdir+"/web_files/krokodil.jpg");
+ res.sendFile(cmn.webfilesdir+"/krokodil.jpg");
});
app.use(function(req,res,next){
diff --git a/webserver.js b/webserver.js
index ab524ca..319f392 100755
--- a/webserver.js
+++ b/webserver.js
@@ -77,7 +77,7 @@ for(i=0;i<module_list.length;i++){
function requestFile(req,res,listdirs,path,origpath){
- fname=cmn.rootdir+"/web_files"+path;
+ fname=cmn.webfilesdir+path;
console.log("Requesting file "+fname);
if(!fs.existsSync(fname)){
res.status(404).send("That file does not exist.");
@@ -158,32 +158,32 @@ app.get("/google*.html",function(req,res){
["o","k","rip","rip2"].forEach(function(target){
app.get("/"+target,function(req,res){
- res.sendFile(cmn.rootdir+"/web_files/"+target+".html");
+ res.sendFile(cmn.webfilesdir+"/"+target+".html");
});
app.get("/"+target+"/*",function(req,res){
res.set('Content-Type', 'text/html');
res.send(
- String(fs.readFileSync(cmn.rootdir+"/web_files/"+target+".html"))
+ String(fs.readFileSync(cmn.webfilesdir+"/"+target+".html"))
.replace("<!--MESSAGEMESSAGE-->",cmn.simpleHTMLescape(url.parse(req.url).pathname.slice(target.length+2)))
);
});
});
app.get("/dr",function(req,res){
- res.sendFile(cmn.rootdir+"/web_files/duckroll.html");
+ res.sendFile(cmn.webfilesdir+"/duckroll.html");
});
app.get(["/gpg","/pgp","/gpg.asc","/pgp.asc"],function(req,res){
res.type("text/plain");
- res.sendFile(cmn.rootdir+"/web_files/pgp.asc");
+ res.sendFile(cmn.webfilesdir+"/pgp.asc");
});
app.get("/tomsg",function(req,res){
- res.sendFile(cmn.rootdir+"/web_files/tomsg.html");
+ res.sendFile(cmn.webfilesdir+"/tomsg.html");
});
app.get("/goioi",function(req,res){
- res.sendFile(cmn.rootdir+"/web_files/goioi.html");
+ res.sendFile(cmn.webfilesdir+"/goioi.html");
});