change approach again

build.sh

@@ -1,23 +0,0 @@
-#!/bin/bash
-
-POSTS=`find ./posts -mindepth 1 -type d | sort -r`
-INDEX_TOC=`pwd`/toc.inc
-
-
-rm -f $INDEX_TOC
-for I in $POSTS; do
-  (
-    echo $I;
-    cd $I;
-    TITLE=`cat article.html | grep '<title>' | sed 's!^[[:space:]]*<title>\(.*\)</title>!\1!'`
-    DATE=`cat article.html | grep '<meta name="date"' | sed 's!^[[:space:]]*<meta name="date" content="\(.*\)"/>!\1!'`
-    PATH=`echo $I | sed 's!^\./!!'`
-    echo "<li><a href=\"$PATH/article.html\">$DATE - $TITLE</a></li>" >> $INDEX_TOC
-  )
-done
-
-cat index.header toc.inc index.footer > index.html
-
-
-rsync -av --delete --exclude-from excludes.lst . /var/www/html
-

default.css

@@ -1,7 +0,0 @@
-body {
-  background-color: white;
-  font-family: "verdana", sans-serif;
-  font-size: 16px;
-}
-
-

dist/config.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = require("fs");
+const cmdargs = require("command-line-args");
+const OPTION_DEFINITIONS = [
+    { name: 'verbose', alias: 'v', type: Boolean },
+    { name: 'config', alias: 'c', type: String, defaultValue: '~/homepage.conf' }
+];
+function readConfig() {
+    let options = cmdargs(OPTION_DEFINITIONS);
+    exports.dict = JSON.parse(fs.readFileSync(options.config, "utf8"));
+}
+exports.readConfig = readConfig;
+readConfig();
+//# sourceMappingURL=config.js.map

dist/config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":";;AAAA,yBAAwB;AACxB,6CAA4C;AAI5C,MAAM,kBAAkB,GAAG;IACvB,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE;IAC9C,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,iBAAiB,EAAE;CAChF,CAAC;AAKF;IACI,IAAI,OAAO,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAA;IACzC,YAAI,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;AAC9D,CAAC;AAHD,gCAGC;AAED,UAAU,EAAE,CAAA"}

dist/log.js

@@ -0,0 +1,82 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const moment = require("moment");
+const config = require("./config");
+const nodemailer = require("nodemailer");
+var Level;
+(function (Level) {
+    Level[Level["All"] = 0] = "All";
+    Level[Level["NoDebug"] = 1] = "NoDebug";
+    Level[Level["NoDebugNoInfo"] = 2] = "NoDebugNoInfo";
+    Level[Level["NoDebugNoInfoNoWarning"] = 3] = "NoDebugNoInfoNoWarning";
+})(Level || (Level = {}));
+var level = Level.NoDebug;
+function timestamp() {
+    return moment().format('HH:mm:ss.SSS');
+}
+function setLevel(value) {
+    switch (value) {
+        case 'info':
+            level = Level.NoDebug;
+            break;
+        case 'warn':
+            level = Level.NoDebugNoInfo;
+            break;
+        case 'error':
+            level = Level.NoDebugNoInfoNoWarning;
+            break;
+        default: level = Level.All;
+    }
+}
+exports.setLevel = setLevel;
+function sendAlarmMail(subject, message) {
+    let transport = nodemailer.createTransport({
+        host: config.dict.smtpHost,
+        port: config.dict.smtpPort,
+        secure: false,
+        tls: {
+            rejectUnauthorized: false
+        }
+    });
+    let mail = {
+        from: config.dict.smtpSender,
+        to: config.dict.smtpReceiver,
+        subject: subject,
+        text: message
+    };
+    transport.sendMail(mail)
+        .then((v) => {
+        info(`Mail sent, ${subject}, ${message}, ${v.response}`);
+    })
+        .catch((reason) => {
+        error(`Failure when sending alarm mail: ${message}, ${reason}`);
+    });
+}
+exports.sendAlarmMail = sendAlarmMail;
+function info(message) {
+    if (level < Level.NoDebugNoInfo) {
+        console.log(`${timestamp()} [ II ] ${message}`);
+    }
+}
+exports.info = info;
+function warn(message) {
+    if (level < Level.NoDebugNoInfoNoWarning) {
+        console.log(`${timestamp()} [ WW ] ${message}`);
+    }
+}
+exports.warn = warn;
+function error(message) {
+    console.log(`${timestamp()} [ EE ] ${message}`);
+}
+exports.error = error;
+function success(message) {
+    console.log(`${timestamp()} [ OK ] ${message}`);
+}
+exports.success = success;
+function debug(message) {
+    if (level < Level.NoDebug) {
+        console.log(`${timestamp()} [ DB ] ${message}`);
+    }
+}
+exports.debug = debug;
+//# sourceMappingURL=log.js.map

dist/log.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"log.js","sourceRoot":"","sources":["../src/log.ts"],"names":[],"mappings":";;AAAA,iCAAgC;AAChC,mCAAkC;AAClC,yCAAwC;AAGxC,IAAK,KAKJ;AALD,WAAK,KAAK;IACN,+BAAG,CAAA;IACH,uCAAO,CAAA;IACP,mDAAa,CAAA;IACb,qEAAsB,CAAA;AAC1B,CAAC,EALI,KAAK,KAAL,KAAK,QAKT;AAED,IAAI,KAAK,GAAG,KAAK,CAAC,OAAO,CAAA;AAEzB;IACI,OAAO,MAAM,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,CAAA;AAC1C,CAAC;AAED,kBAAyB,KAAa;IAClC,QAAQ,KAAK,EAAE;QACX,KAAK,MAAM;YAAG,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC;YAAC,MAAK;QAC1C,KAAK,MAAM;YAAG,KAAK,GAAG,KAAK,CAAC,aAAa,CAAC;YAAC,MAAK;QAChD,KAAK,OAAO;YAAE,KAAK,GAAG,KAAK,CAAC,sBAAsB,CAAC;YAAC,MAAK;QACzD,OAAO,CAAC,CAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAA;KAClC;AACL,CAAC;AAPD,4BAOC;AAED,uBAA8B,OAAgB,EAAE,OAAgB;IAC5D,IAAI,SAAS,GAAG,UAAU,CAAC,eAAe,CAAC;QACvC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ;QAC1B,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ;QAC1B,MAAM,EAAE,KAAK;QACb,GAAG,EAAE;YACD,kBAAkB,EAAE,KAAK;SAC5B;KACJ,CAAC,CAAC;IAEH,IAAI,IAAI,GAAgC;QACpC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU;QAC5B,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,YAAY;QAC5B,OAAO,EAAE,OAAO;QAChB,IAAI,EAAE,OAAO;KAChB,CAAC;IAEF,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC;SACnB,IAAI,CAAC,CAAC,CAA8B,EAAE,EAAE;QACrC,IAAI,CAAC,cAAc,OAAO,KAAK,OAAO,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;IAC5D,CAAC,CAAC;SACD,KAAK,CAAC,CAAC,MAAY,EAAE,EAAE;QACpB,KAAK,CAAC,oCAAoC,OAAO,KAAK,MAAM,EAAE,CAAC,CAAA;IACnE,CAAC,CAAC,CAAA;AAEV,CAAC;AAzBD,sCAyBC;AAED,cAAqB,OAAe;IAChC,IAAI,KAAK,GAAG,KAAK,CAAC,aAAa,EAAE;QAC7B,OAAO,CAAC,GAAG,CAAC,GAAG,SAAS,EAAE,WAAW,OAAO,EAAE,CAAC,CAAA;KAClD;AACL,CAAC;AAJD,oBAIC;AAED,cAAqB,OAAe;IAChC,IAAI,KAAK,GAAG,KAAK,CAAC,sBAAsB,EAAE;QACtC,OAAO,CAAC,GAAG,CAAC,GAAG,SAAS,EAAE,WAAW,OAAO,EAAE,CAAC,CAAA;KAClD;AACL,CAAC;AAJD,oBAIC;AAED,eAAsB,OAAe;IACjC,OAAO,CAAC,GAAG,CAAC,GAAG,SAAS,EAAE,WAAW,OAAO,EAAE,CAAC,CAAA;AACnD,CAAC;AAFD,sBAEC;AAED,iBAAwB,OAAe;IACnC,OAAO,CAAC,GAAG,CAAC,GAAG,SAAS,EAAE,WAAW,OAAO,EAAE,CAAC,CAAA;AACnD,CAAC;AAFD,0BAEC;AAED,eAAsB,OAAe;IACjC,IAAI,KAAK,GAAG,KAAK,CAAC,OAAO,EAAE;QACvB,OAAO,CAAC,GAAG,CAAC,GAAG,SAAS,EAAE,WAAW,OAAO,EAAE,CAAC,CAAA;KAClD;AACL,CAAC;AAJD,sBAIC"}

dist/main.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = require("fs");
+const config = require("./config");
+const logger = require("./log");
+const express = require("express");
+logger.info("Homepage starting");
+let app = express();
+let masterTmpl;
+app.engine('pag', (filePath, options, callback) => {
+    fs.readFile(filePath, (err, content) => {
+        if (err) {
+            return callback(new Error(err.message));
+        }
+        let renderedPhase1 = content.toString()
+            .replace('#bla#', 'blu');
+        let renderedPhase2 = masterTmpl
+            .replace('#maincontent#', renderedPhase1)
+            .replace('#title#', options.title);
+        return callback(null, renderedPhase2);
+    });
+});
+app.set('views', './docroot');
+app.set('view engine', 'pag');
+app.get('/index', (req, res) => {
+    res.render('index', { 'title': 'Projects - just for fun' });
+});
+app.get('/', (req, res) => {
+    res.send('Hello world!');
+});
+masterTmpl = fs.readFileSync(config.dict.masterTmpl).toString();
+app.listen(config.dict.httpPort, () => {
+    logger.info("Homepage is listening");
+});
+logger.info("Homepage running");
+//# sourceMappingURL=main.js.map

dist/main.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";;AAAA,yBAAwB;AAExB,mCAAkC;AAClC,gCAA+B;AAE/B,mCAAkC;AAIlC,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAA;AAEhC,IAAI,GAAG,GAAG,OAAO,EAAE,CAAA;AAEnB,IAAI,UAAkB,CAAA;AAEtB,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,QAAgB,EAAE,OAAY,EAAE,QAAa,EAAE,EAAE;IAChE,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE;QACnC,IAAI,GAAG,EAAE;YACL,OAAO,QAAQ,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAA;SAC1C;QACD,IAAI,cAAc,GAAG,OAAO,CAAC,QAAQ,EAAE;aACtC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;QAExB,IAAI,cAAc,GAAG,UAAU;aAC9B,OAAO,CAAC,eAAe,EAAE,cAAc,CAAC;aACxC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;QAClC,OAAO,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC,CAAA;IACzC,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAA;AAEF,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,WAAW,CAAC,CAAA;AAC7B,GAAG,CAAC,GAAG,CAAC,aAAa,EAAE,KAAK,CAAC,CAAA;AAE7B,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;IAC3B,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,EAAC,OAAO,EAAE,yBAAyB,EAAC,CAAC,CAAA;AAC7D,CAAC,CAAC,CAAA;AAEF,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;IACtB,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;AAC5B,CAAC,CAAC,CAAA;AAEF,UAAU,GAAG,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,CAAA;AAE/D,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE;IAClC,MAAM,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAA;AACxC,CAAC,CAAC,CAAA;AACF,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAA"}

docroot/index.pag

@@ -0,0 +1,3 @@
+<h1>Index</h1>
+BlaBla
+#bla#

docroot/master.tmpl

@@ -0,0 +1,10 @@
+<html>
+  <head>
+    <title>#title#</title>
+  </head>
+  <body>
+    <div>
+      #maincontent#
+    </div>
+  </body>
+</html>

excludes.lst

@@ -1,9 +0,0 @@
-export-media
-export-xml
-m4
-*.m4
-*.inc
-*.mk
-Makefile
-.git
-excludes.lst

homepage.conf

@@ -0,0 +1,4 @@
+{
+    "httpPort": 8000,
+    "masterTmpl": "./docroot/master.tmpl"
+}

index.footer

@@ -1,3 +0,0 @@
-</ul>
-</body>
-</html>

index.header

@@ -1,28 +0,0 @@
-<html>	
-	<head>
-		<title>Projects - just for fun</title>
-	</head>
-	<link rel="stylesheet" type="text/css" href="/default.css"/>
-    
-    <body>
-    <h1>Projects - just for fun</h1>
-
-<p>
-I moved my blog away from wordpress.com. Reason is simple: I've no clue of DSGVO and I don't want to spend any time in it. And since I don't know which date wordpress.com is collecting and processing I stopped using it.
-</p>
-<p>
-Here, I've everything under my on control and I know exactly which of your data is processed: nearly no data. There are no cookies, no advertising banners, no web analytics. Just the webserver is writing a logfile, which is rotated away and deleted after 14 days. However, this logfile is not analysed or computed automatically, I just consult it occasionally in case of problems. To learn more about this logfile, see <a href="plain/logfile.html">here</a>. If this is not okay for you, just go away.
-</p>
-<p>
-I'm sure about this, since this is a plain old homepage without any dynamic content. No comments, no mail forms, no Javascript, no responsiveness. It is built using a couple of Makefiles and m4 macros and plain old HTML code.
-</p>
-<p>
-If you want to leave a comment on anything, please use my <a href="mailto:woho@hottis.de">email</a> or <a href="https://twitter.com/wollud1969" target="_blank">Twitter account</a>..
-</p>
-<p>
-And: yes, I know, this homepage is soooo ugly. I'm sorry, no CSS yet.
-</p>
-
-<h2>Overview</h2>
-<ul>
-

index.html

@@ -1,79 +0,0 @@
-<html>	
-	<head>
-		<title>Projects - just for fun</title>
-	</head>
-	<link rel="stylesheet" type="text/css" href="/default.css"/>
-    
-    <body>
-    <h1>Projects - just for fun</h1>
-
-<p>
-I moved my blog away from wordpress.com. Reason is simple: I've no clue of DSGVO and I don't want to spend any time in it. And since I don't know which date wordpress.com is collecting and processing I stopped using it.
-</p>
-<p>
-Here, I've everything under my on control and I know exactly which of your data is processed: nearly no data. There are no cookies, no advertising banners, no web analytics. Just the webserver is writing a logfile, which is rotated away and deleted after 14 days. However, this logfile is not analysed or computed automatically, I just consult it occasionally in case of problems. To learn more about this logfile, see <a href="plain/logfile.html">here</a>. If this is not okay for you, just go away.
-</p>
-<p>
-I'm sure about this, since this is a plain old homepage without any dynamic content. No comments, no mail forms, no Javascript, no responsiveness. It is built using a couple of Makefiles and m4 macros and plain old HTML code.
-</p>
-<p>
-If you want to leave a comment on anything, please use my <a href="mailto:woho@hottis.de">email</a> or <a href="https://twitter.com/wollud1969" target="_blank">Twitter account</a>..
-</p>
-<p>
-And: yes, I know, this homepage is soooo ugly. I'm sorry, no CSS yet.
-</p>
-
-<h2>Overview</h2>
-<ul>
-
-<li><a href="posts/2018-04-30.01/article.html"> - </a></li>
-<li><a href="posts/2018-02-22.01/article.html"> - </a></li>
-<li><a href="posts/2018-01-26.01/article.html"> - </a></li>
-<li><a href="posts/2017-07-04.01/article.html"> - </a></li>
-<li><a href="posts/2016-12-19.01/article.html"> - </a></li>
-<li><a href="posts/2016-11-02.01/article.html"> - </a></li>
-<li><a href="posts/2016-10-14.01/article.html"> - </a></li>
-<li><a href="posts/2016-09-12.01/article.html"> - </a></li>
-<li><a href="posts/2016-09-09.01/article.html"> - </a></li>
-<li><a href="posts/2016-03-03.01/article.html"> - </a></li>
-<li><a href="posts/2015-10-12.01/article.html"> - </a></li>
-<li><a href="posts/2015-09-14.01/article.html"> - </a></li>
-<li><a href="posts/2015-06-17.01/article.html"> - </a></li>
-<li><a href="posts/2015-06-05.04/article.html"> - </a></li>
-<li><a href="posts/2015-06-05.03/article.html"> - </a></li>
-<li><a href="posts/2015-06-05.02/article.html"> - </a></li>
-<li><a href="posts/2015-06-05.01/article.html"> - </a></li>
-<li><a href="posts/2015-01-01.01/article.html"> - </a></li>
-<li><a href="posts/2014-12-15.01/article.html"> - </a></li>
-<li><a href="posts/2014-12-11.01/article.html"> - </a></li>
-<li><a href="posts/2014-10-27.01/article.html"> - </a></li>
-<li><a href="posts/2014-10-04.01/article.html"> - </a></li>
-<li><a href="posts/2014-08-04.01/article.html"> - </a></li>
-<li><a href="posts/2014-05-11.02/article.html"> - </a></li>
-<li><a href="posts/2014-05-11.01/article.html"> - </a></li>
-<li><a href="posts/2014-04-07.01/article.html"> - </a></li>
-<li><a href="posts/2014-03-11.01/article.html"> - </a></li>
-<li><a href="posts/2014-03-09.01/article.html"> - </a></li>
-<li><a href="posts/2014-02-21.01/article.html"> - </a></li>
-<li><a href="posts/2014-02-13.01/article.html"> - </a></li>
-<li><a href="posts/2014-02-08.01/article.html"> - </a></li>
-<li><a href="posts/2014-01-22.01/article.html"> - </a></li>
-<li><a href="posts/2014-01-18.01/article.html"> - </a></li>
-<li><a href="posts/2014-01-15.01/article.html"> - </a></li>
-<li><a href="posts/2014-01-14.01/article.html"> - </a></li>
-<li><a href="posts/2014-01-08.02/article.html"> - </a></li>
-<li><a href="posts/2014-01-08.01/article.html"> - </a></li>
-<li><a href="posts/2013-11-08.01/article.html"> - </a></li>
-<li><a href="posts/2013-11-07.01/article.html"> - </a></li>
-<li><a href="posts/2013-09-21.01/article.html"> - </a></li>
-<li><a href="posts/2013-09-11.01/article.html"> - </a></li>
-<li><a href="posts/2013-09-10.01/article.html"> - </a></li>
-<li><a href="posts/2013-09-09.01/article.html"> - </a></li>
-<li><a href="posts/2013-07-24.01/article.html"> - </a></li>
-<li><a href="posts/2013-07-01.01/article.html"> - </a></li>
-<li><a href="posts/2013-06-27.02/article.html"> - </a></li>
-<li><a href="posts/2013-06-27.01/article.html"> - </a></li>
-<li><a href="posts/2013-06-26.01/article.html">2013-06-26 - A Web-controlled Picture Frame</a></li>
-</ul>
-</body>
-</html>