Blog

<%- data.blogHttp %>
-- cgit v1.2.3 From acd76a660ad5cc6502e78553fbb3a4ad8f58ec7a Mon Sep 17 00:00:00 2001 From: terminaldweller Date: Fri, 8 Apr 2022 10:45:41 +0430 Subject: updated the permissions policiy --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index 4b67056..a42072f 100755 --- a/server.js +++ b/server.js @@ -49,7 +49,7 @@ app.use(helmet.xssFilter()); app.use((req, res, next) => { res.setHeader( "Permissions-Policy", - "geolocation=(none),midi=(none),notifications=(none),push=(none),sync-xhr=(none),microphone=(none),camera=(none),magnetometer=(none),gyroscope=(none),speaker=(none),vibrate=(none),fullscreen=(self),payment=(none)" + "geolocation=(self),midi=(self),sync-xhr=(self),microphone=(self),camera=(self),magnetometer=(self),gyroscope=(self),fullscreen=(self),payment=(self),usb=(self)" ); next(); }); -- cgit v1.2.3 From 4b70fc00a84c38e0051efb88227318f9337f9632 Mon Sep 17 00:00:00 2001 From: terminaldweller Date: Fri, 15 Apr 2022 11:50:58 +0430 Subject: was using node image for self-signed certificates --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f7697b1..23e5984 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:lts-alpine3.13 AS certbuilder +FROM alpine:3.15 AS certbuilder RUN apk add openssl WORKDIR /certs RUN openssl req -nodes -new -x509 -subj="/C=US/ST=Denial/L=springfield/O=Dis/CN=localhost" -keyout server.key -out server.cert -- cgit v1.2.3 From 4eaa437c0a285c617e30a533d1ef369eaa8644a6 Mon Sep 17 00:00:00 2001 From: terminaldweller Date: Tue, 5 Jul 2022 20:19:16 +0430 Subject: WIP, adding rss to the blog --- Dockerfile | 4 ++-- docker-compose-test.yaml | 25 ++++++++++++---------- docker-compose.yaml | 39 ++++++++++++++++++++++++++++++---- model.js | 55 ++++++++++++++++++++++++++++++++++++------------ server.js | 34 ++++++++++++++++++++++-------- static/about.html | 6 ++++++ views/index.ejs | 8 ++++++- views/rss_feed.pug | 18 ++++++++-------- 8 files changed, 140 insertions(+), 49 deletions(-) diff --git a/Dockerfile b/Dockerfile index 23e5984..551946e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ RUN apk add openssl WORKDIR /certs RUN openssl req -nodes -new -x509 -subj="/C=US/ST=Denial/L=springfield/O=Dis/CN=localhost" -keyout server.key -out server.cert -FROM node:lts-alpine3.13 +FROM node:lts-alpine3.15 COPY --from=certbuilder /certs/ /certs COPY ./package.* /server/ RUN cd /server && npm install --production @@ -11,6 +11,6 @@ COPY ./css /server/css/ COPY ./views /server/views/ COPY ./static /server/static/ COPY ./mds /server/mds/ -COPY ./server.js /server/ +COPY ./*.js /server/ ENTRYPOINT ["/server/server.js"] EXPOSE 9000 diff --git a/docker-compose-test.yaml b/docker-compose-test.yaml index 243b282..fceb9b9 100644 --- a/docker-compose-test.yaml +++ b/docker-compose-test.yaml @@ -1,11 +1,11 @@ version: "3.7" services: - web: - image: web + blog: + image: blog build: - context: ./ + context: . networks: - - webnet + - blognet - dbnet ports: - "19009:9000" @@ -16,30 +16,33 @@ services: - SERVER_LISTEN_PORT=9000 depends_on: - mongo + secrets: + - mongo_user + - mongo_pass mongo: image: mongo:5.0 networks: - dbnet restart: on-failure ports: - - "27117:27017" + - "127.0.0.1:27117:27017" - "127.0.0.1:27118:27018" - "127.0.0.1:27119:27019" volumes: - - db-data:/data/db - env: + - blog-data:/data/db + environment: - MONGO_INITDB_ROOT_USERNAME_FILE=/run/secrets/mongo_user - MONGO_INITDB_ROOT_PASSWORD_FILE=/run/secrets/mongo_pass secrets: - mongo_user - mongo_pass networks: - webnet: + blognet: dbnet: volumes: - db-data: + blog-data: secrets: mongo_user: - file: ./mongo_user + file: ./mongo_secrets/mongo_user mongo_pass: - file: ./mongo_pass + file: ./mongo_secrets/mongo_pass diff --git a/docker-compose.yaml b/docker-compose.yaml index 5f3e217..79e5d0c 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,11 +1,12 @@ version: "3.7" services: - web: - image: web + blog: + image: blog build: context: ./ networks: - - webnet + - blognet + - dbnet restart: unless-stopped ports: - "9000:9000" @@ -16,5 +17,35 @@ services: environment: - SERVER_DEPLOYMENT_TYPE=deployment - SERVER_LISTEN_PORT=9000 + depends_on: + - mongo + secrets: + - mongo_user + - mongo_pass + mongo: + image: mongo:5.0 + networks: + - dbnet + restart: on-failure + ports: + - "127.0.0.1:27117:27017" + - "127.0.0.1:27118:27018" + - "127.0.0.1:27119:27019" + volumes: + - blog-data:/data/db + environment: + - MONGO_INITDB_ROOT_USERNAME_FILE=/run/secrets/mongo_user + - MONGO_INITDB_ROOT_PASSWORD_FILE=/run/secrets/mongo_pass + secrets: + - mongo_user + - mongo_pass networks: - webnet: + blognet: + dbnet: +volumes: + blog-data: +secrets: + mongo_user: + file: ./mongo_secrets/mongo_user + mongo_pass: + file: ./mongo_secrets/mongo_pass diff --git a/model.js b/model.js index 7eba2a4..d4bfc83 100644 --- a/model.js +++ b/model.js @@ -1,22 +1,30 @@ "use strict"; +const fs = require("fs"); +const path = require("path"); const mongoose = require("mongoose"); +const Schema = mongoose.Schema; mongoose.Promise = global.Promise; const db = {}; db.mongoose = mongoose; -db.url = "mongo:27017"; +const db_pass = fs.readFileSync("/run/secrets/mongo_pass").toString(); +const db_user = fs.readFileSync("/run/secrets/mongo_user").toString(); +db.url = "mongodb://" + db_user + ":" + db_pass + "@mongo:27017"; -const blogPostModel = mongoose.model( - "blogPost", - mongoose.Schema( - { - title: String, - description: String, - published: Boolean, - }, - { timestamps: true } - ) -); +const BlogPostSchema = new Schema({ + title: { type: String, required: true, trim: true }, + slug: { type: String, required: true, lowercase: true, trim: true }, + body: { type: String, required: true }, + teaser: { type: String, required: true }, + keywords: { type: Array, required: true }, + lastUpdatedAt: { type: Number }, +}); + +// a simple hook to update the timestamp(lastUpdatedAt) on update +BlogPostSchema.pre("save", function (next) { + this.lastUpdatedAt = Date.now(); + next(); +}); function dbInit() { db.mongoose @@ -29,4 +37,25 @@ function dbInit() { process.exit(1); }); } -module.exports = dbInit; + +function populateDB(model) { + let filePaths = fs.readdirSync(path.join(__dirname, "mds")); + filePaths.forEach((fileName) => { + let fileContent = fs + .readFileSync(path.join(__dirname, "mds", fileName), "utf-8") + .toString(); + let newBlogPost = new model({ + title: fileName, + slug: "slug", + body: fileContent, + teaser: "teaser", + keywords: ["kw1", "kw2"], + }); + newBlogPost.save(); + }); +} +module.exports = { + blogPost: mongoose.model("BlogPost", BlogPostSchema), + dbInit: dbInit, + populateDB: populateDB, +}; diff --git a/server.js b/server.js index a42072f..bd23a1f 100755 --- a/server.js +++ b/server.js @@ -22,15 +22,23 @@ const mit = require("markdown-it")({ html: true }) const spdy = require("spdy"); const helmet = require("helmet"); const morgan = require("morgan"); -const pug = require("pug"); +// const pug = require("pug"); +const model = require("./model"); + +model.dbInit(); +model.populateDB(model.blogPost); const app = express(); app.disable("x-powered-by"); app.use(express.static(path.join(__dirname, "css"))); app.use(express.static(path.join(__dirname, "static"))); app.set("views", path.join(__dirname, "views")); +// app.set("view engine", "ejs"); +// app.engine("ejs", require("ejs").__express); +// app.engine("pug", require("pug").renderFilej); +// app.engine("pug", "pug"); app.set("view engine", "ejs"); -app.engine("ejs", require("ejs").__express); +app.set("view engine", "pug"); app.use(helmet.crossOriginEmbedderPolicy()); app.use(helmet.crossOriginOpenerPolicy()); @@ -85,7 +93,7 @@ function renderAndSend(req, res) { ); //FIXME-this can obviously fail readStream.on("data", (chunk) => { - res.render("index", { + res.render("index.ejs", { cache: true, data: { blogHttp: mit.render(chunk), @@ -111,7 +119,7 @@ app.get("/about", (req, res) => { app.get("/archive", (req, res) => { res.type("text/html"); - res.render("archive", { + res.render("archive.ejs", { cache: true, data: { mds: fs.readdirSync(path.join(__dirname, "mds"), "utf-8"), @@ -129,11 +137,19 @@ app.get("/robots.txt", (req, res) => { }); app.get("/rss/feed", (req, res) => { - const compiledFunction = pug.compileFile("./views/rss_feed.pug"); - const files = fs.readdirSync(path.join(__dirname, "mds")); - for (const file of files) { - res.send(compiledFunction(file)); - } + model.blogPost + .find({}) + .sort("-lastUpdatedAt") + .select("title slug lastUpdatedAt teaser") + .exec(function (err, posts) { + if (err) return err; + return res.render("rss_feed.pug", { cache: true, posts: posts }); + }); + // const compiledFunction = pug.compileFile("./views/rss_feed.pug"); + // const files = fs.readdirSync(path.join(__dirname, "mds")); + // for (const file of files) { + // res.send(compiledFunction(file)); + // } }); app.get("/$", (req, res) => { diff --git a/static/about.html b/static/about.html index b6bdfa9..a56ad24 100644 --- a/static/about.html +++ b/static/about.html @@ -25,5 +25,11 @@ here .

+
+
+

+
+ +
diff --git a/views/index.ejs b/views/index.ejs index 6cc3a45..0e47f53 100644 --- a/views/index.ejs +++ b/views/index.ejs @@ -6,7 +6,7 @@ Blog - + @@ -15,6 +15,12 @@

+ + <%- data.Keywords %> +
+
+

+
diff --git a/views/rss_feed.pug b/views/rss_feed.pug index 9bdd9bd..0ae2b74 100644 --- a/views/rss_feed.pug +++ b/views/rss_feed.pug @@ -1,21 +1,21 @@ doctype xml rss(version='2.0', xmlns:atom='http://www.w3.org/2005/Atom') channel - title DevSmash - link http://devsmash.com - atom:link(href='http://devsmash.com/feed/rss', rel='self', type='application/rss+xml') - description Developers talking about stuff that developers like to talk about. + title deviblog + link https://blog.terminaldweller.com + atom:link(href='https://blog.terminaldweller.com/feed/rss', rel='self', type='application/rss+xml') + description I talk about software here. language en-US if posts.length - lastBuildDate= new Date(posts[0].publishedAt).toUTCString() + lastBuildDate= new Date(posts[0].lastUpdatedAt).toUTCString() each post in posts item title= post.title - link http://devsmash.com/blog/#{post.slug} + link https://terminaldweller.com/blog/#{post.slug} description | http://devsmash.com/blog/#{post.slug}')!= 'Read more »' + p: a(href='https://blog.terminaldweller.com/blog/#{post.slug}') 'Read more »' | ]]> - pubDate= new Date(post.publishedAt).toUTCString() - guid(isPermaLink='false') Date: Wed, 6 Jul 2022 14:31:50 +0430 Subject: now the blog uses the db for everything. now need to decide on how to populate the DB and prevent duplication --- model.js | 4 +-- server.js | 93 +++++++++++++++++++++++++++++++------------------------ views/archive.ejs | 4 +-- views/index.ejs | 3 +- 4 files changed, 59 insertions(+), 45 deletions(-) diff --git a/model.js b/model.js index d4bfc83..5df1270 100644 --- a/model.js +++ b/model.js @@ -46,9 +46,9 @@ function populateDB(model) { .toString(); let newBlogPost = new model({ title: fileName, - slug: "slug", + slug: fileName, body: fileContent, - teaser: "teaser", + teaser: fileName, keywords: ["kw1", "kw2"], }); newBlogPost.save(); diff --git a/server.js b/server.js index bd23a1f..4c2be0c 100755 --- a/server.js +++ b/server.js @@ -22,7 +22,6 @@ const mit = require("markdown-it")({ html: true }) const spdy = require("spdy"); const helmet = require("helmet"); const morgan = require("morgan"); -// const pug = require("pug"); const model = require("./model"); model.dbInit(); @@ -33,10 +32,6 @@ app.disable("x-powered-by"); app.use(express.static(path.join(__dirname, "css"))); app.use(express.static(path.join(__dirname, "static"))); app.set("views", path.join(__dirname, "views")); -// app.set("view engine", "ejs"); -// app.engine("ejs", require("ejs").__express); -// app.engine("pug", require("pug").renderFilej); -// app.engine("pug", "pug"); app.set("view engine", "ejs"); app.set("view engine", "pug"); @@ -79,31 +74,29 @@ async function enumerateDir() { return await fs.readdirSync(path.join(__dirname, "mds")); } -function renderAndSend(req, res) { - try { - let viewPath; - if (req.path == "/") { - viewPath = "mds/cstruct2luatable.md"; - } else { - viewPath = req.path; - } - let readStream = fs.createReadStream( - path.join(__dirname, viewPath), - "utf-8" - ); - //FIXME-this can obviously fail - readStream.on("data", (chunk) => { - res.render("index.ejs", { +function renderAndSend_v2(req, res) { + model.blogPost + .findOne( + { _slug: req.path }, + { + projection: { + _id: 0, + title: 0, + teaser: 0, + }, + } + ) + .exec(function (err, blogPost) { + if (err) return err; + return res.render("index.ejs", { cache: true, data: { - blogHttp: mit.render(chunk), - mds: fs.readdirSync(path.join(__dirname, "mds"), "utf-8"), + blogHttp: mit.render(blogPost.body), + lastUpdatedAt: blogPost.lastUpdatedAt, + keywords: blogPost.keywords, }, }); }); - } catch (err) { - console.log(err); - } } app.get("/health", (req, res) => { @@ -119,12 +112,23 @@ app.get("/about", (req, res) => { app.get("/archive", (req, res) => { res.type("text/html"); - res.render("archive.ejs", { - cache: true, - data: { - mds: fs.readdirSync(path.join(__dirname, "mds"), "utf-8"), - }, - }); + model.blogPost + .find({}, { _id: 0, body: 0, teaser: 0, keywords: 0, lastUpdatedAt: 0 }) + .exec(function (err, blogPosts) { + if (err) return err; + res.render("archive.ejs", { + cache: true, + data: { + blogPosts: blogPosts, + }, + }); + }); + // res.render("archive.ejs", { + // cache: true, + // data: { + // mds: fs.readdirSync(path.join(__dirname, "mds"), "utf-8"), + // }, + // }); }); app.get("/robots.txt", (req, res) => { @@ -145,22 +149,31 @@ app.get("/rss/feed", (req, res) => { if (err) return err; return res.render("rss_feed.pug", { cache: true, posts: posts }); }); - // const compiledFunction = pug.compileFile("./views/rss_feed.pug"); - // const files = fs.readdirSync(path.join(__dirname, "mds")); - // for (const file of files) { - // res.send(compiledFunction(file)); - // } }); app.get("/$", (req, res) => { - renderAndSend(req, res); + model.blogPost + .find({}, { projection: { _id: 0, title: 0, teaser: 0 } }) + .limit(1) + .sort({ $natural: -1 }) + .exec(function (err, blogPost) { + if (err) return err; + return res.render("index.ejs", { + cache: true, + data: { + blogHttp: mit.render(blogPost[0].body), + lastUpdatedAt: blogPost[0].lastUpdatedAt, + keywords: blogPost[0].keywords, + }, + }); + }); }); -app.get("/mds/:mdname$", (req, res) => { - if (req.params["mdname"] == "") { +app.get("/posts/:postName", (req, res) => { + if (req.params["postName"] == "") { res.write("nothing requested!"); } - renderAndSend(req, res); + renderAndSend_v2(req, res); }); app.use(sitemap(enumerateDir, "https://blog.terminaldweller.com")); diff --git a/views/archive.ejs b/views/archive.ejs index 36191de..72b963d 100644 --- a/views/archive.ejs +++ b/views/archive.ejs @@ -9,9 +9,9 @@

- <% data.mds.forEach(function(md) { %> + <% data.blogPosts.forEach(function(blogPost) { %>

<% }) %>

diff --git a/views/index.ejs b/views/index.ejs index 0e47f53..fdd49cc 100644 --- a/views/index.ejs +++ b/views/index.ejs @@ -16,7 +16,8 @@

- <%- data.Keywords %> + <%- data.keywords %> + <%- data.lastUpdated %>

-- cgit v1.2.3 From fc713bcbb320ff692cac6332f5aa587dc817305c Mon Sep 17 00:00:00 2001 From: terminaldweller Date: Wed, 6 Jul 2022 15:54:39 +0430 Subject: WIP, we now have to fix the pug template which is not working --- model.js | 1 + put_in_db.js | 26 ++++++++++++++++++++++++++ server.js | 6 ------ views/rss_feed.pug | 2 +- 4 files changed, 28 insertions(+), 7 deletions(-) create mode 100644 put_in_db.js diff --git a/model.js b/model.js index 5df1270..dde3913 100644 --- a/model.js +++ b/model.js @@ -54,6 +54,7 @@ function populateDB(model) { newBlogPost.save(); }); } + module.exports = { blogPost: mongoose.model("BlogPost", BlogPostSchema), dbInit: dbInit, diff --git a/put_in_db.js b/put_in_db.js new file mode 100644 index 0000000..da5a050 --- /dev/null +++ b/put_in_db.js @@ -0,0 +1,26 @@ +"use strict"; +// mongosh --host 127.0.0.1 --port 27117 -u mongo -p mongo -f put_in_db.js + +const fs = require("fs"); +const path = require("path"); +// db = connect("http://mongo:mongo@127.0.0.1:27117"); + +blog_entry_1 = { + title: "Turning C structs into Lua tables", + slug: "c_struct_lua_table", + body: fs.readFileSync(path.join(__dirname) + "/mds/cstruct2luatable.md"), + teaser: "Turning C structures into Lua tables", + keywords: "c,lua", + lastUpdatedAt: Date.now(), +}; + +blog_entry_2 = { + title: "Lazy Makefiles", + slug: "lazy_makefile", + body: fs.readFileSync(path.join(__dirname) + "/mds/lazymakefiles.md"), + teaser: "Lazy Makefiles", + keywords: "makefile,c,c++", + lastUpdatedAt: Date.now(), +}; + +db.blogposts.insertMany([blog_entry_1, blog_entry_2]); diff --git a/server.js b/server.js index 4c2be0c..6d51d1b 100755 --- a/server.js +++ b/server.js @@ -123,12 +123,6 @@ app.get("/archive", (req, res) => { }, }); }); - // res.render("archive.ejs", { - // cache: true, - // data: { - // mds: fs.readdirSync(path.join(__dirname, "mds"), "utf-8"), - // }, - // }); }); app.get("/robots.txt", (req, res) => { diff --git a/views/rss_feed.pug b/views/rss_feed.pug index 0ae2b74..e75225d 100644 --- a/views/rss_feed.pug +++ b/views/rss_feed.pug @@ -18,4 +18,4 @@ rss(version='2.0', xmlns:atom='https://blog.terminaldweller.com/blog/#{post.slug}') 'Read more »' | ]]> pubDate= new Date(post.lastUpdatedAt).toUTCString() - guid(isPermaLink='false') https://blog.terminaldweller.com/blog/#{post.slug} -- cgit v1.2.3 From c9f5b12ab281c8889364bfb2455dc97fdb92e9f9 Mon Sep 17 00:00:00 2001 From: terminaldweller Date: Wed, 6 Jul 2022 16:23:42 +0430 Subject: a newer simpler template for the rss feed --- server.js | 4 ++-- views/rss_feed_v2.pug | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 views/rss_feed_v2.pug diff --git a/server.js b/server.js index 6d51d1b..286932d 100755 --- a/server.js +++ b/server.js @@ -25,7 +25,7 @@ const morgan = require("morgan"); const model = require("./model"); model.dbInit(); -model.populateDB(model.blogPost); +// model.populateDB(model.blogPost); const app = express(); app.disable("x-powered-by"); @@ -141,7 +141,7 @@ app.get("/rss/feed", (req, res) => { .select("title slug lastUpdatedAt teaser") .exec(function (err, posts) { if (err) return err; - return res.render("rss_feed.pug", { cache: true, posts: posts }); + return res.render("rss_feed_v2.pug", { cache: true, posts: posts }); }); }); diff --git a/views/rss_feed_v2.pug b/views/rss_feed_v2.pug new file mode 100644 index 0000000..92c9a87 --- /dev/null +++ b/views/rss_feed_v2.pug @@ -0,0 +1,21 @@ +doctype xml +rss(version='2.0') + channel + title deviblog + link https://blog.terminaldweller.com + description I talk about software here. + managingEditro devi@terminaldweller.com + webMaster devi@terminaldweller.com + language en-US + if posts.length + lastBuildDate= new Date(posts[0].lastUpdatedAt).toUTCString() + each post in posts + item + title= post.title + link https://blog.terminaldweller.com/posts/#{post.slug} + description + | + pubDate= new Date(post.lastUpdatedAt).toUTCString() + guid(isPermaLink='false') https://blog.terminaldweller.com/blog/#{post.slug} -- cgit v1.2.3 From 4302411fb080456ba5047a2b98700ae52a0fad29 Mon Sep 17 00:00:00 2001 From: terminaldweller Date: Wed, 6 Jul 2022 16:58:04 +0430 Subject: fixed rss validator errors except atom error --- server.js | 19 ++++++++++--------- views/rss_feed_v2.pug | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/server.js b/server.js index 286932d..b609018 100755 --- a/server.js +++ b/server.js @@ -74,10 +74,10 @@ async function enumerateDir() { return await fs.readdirSync(path.join(__dirname, "mds")); } -function renderAndSend_v2(req, res) { +function renderAndSend_v2(req, res, slug) { model.blogPost .findOne( - { _slug: req.path }, + { slug: slug }, { projection: { _id: 0, @@ -135,6 +135,7 @@ app.get("/robots.txt", (req, res) => { }); app.get("/rss/feed", (req, res) => { + res.type("application/rss+xml"); model.blogPost .find({}) .sort("-lastUpdatedAt") @@ -145,6 +146,13 @@ app.get("/rss/feed", (req, res) => { }); }); +app.get("/posts/:postName", (req, res) => { + if (req.params["postName"] == "") { + res.write("nothing requested!"); + } + renderAndSend_v2(req, res, req.params.postName); +}); + app.get("/$", (req, res) => { model.blogPost .find({}, { projection: { _id: 0, title: 0, teaser: 0 } }) @@ -163,13 +171,6 @@ app.get("/$", (req, res) => { }); }); -app.get("/posts/:postName", (req, res) => { - if (req.params["postName"] == "") { - res.write("nothing requested!"); - } - renderAndSend_v2(req, res); -}); - app.use(sitemap(enumerateDir, "https://blog.terminaldweller.com")); app.use((req, res) => { diff --git a/views/rss_feed_v2.pug b/views/rss_feed_v2.pug index 92c9a87..b680cb9 100644 --- a/views/rss_feed_v2.pug +++ b/views/rss_feed_v2.pug @@ -4,7 +4,7 @@ rss(version='2.0') title deviblog link https://blog.terminaldweller.com description I talk about software here. - managingEditro devi@terminaldweller.com + managingEditor devi@terminaldweller.com webMaster devi@terminaldweller.com language en-US if posts.length -- cgit v1.2.3 From 2c437f4ca76e107ce3eb3c93ae2fc183caf6caab Mon Sep 17 00:00:00 2001 From: terminaldweller Date: Wed, 6 Jul 2022 17:05:17 +0430 Subject: more fixes for the rss feed --- server.js | 1 - views/rss_feed_v2.pug | 9 +++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server.js b/server.js index b609018..eea4695 100755 --- a/server.js +++ b/server.js @@ -25,7 +25,6 @@ const morgan = require("morgan"); const model = require("./model"); model.dbInit(); -// model.populateDB(model.blogPost); const app = express(); app.disable("x-powered-by"); diff --git a/views/rss_feed_v2.pug b/views/rss_feed_v2.pug index b680cb9..261f054 100644 --- a/views/rss_feed_v2.pug +++ b/views/rss_feed_v2.pug @@ -1,11 +1,12 @@ doctype xml -rss(version='2.0') +rss(version='2.0', xmlns:atom='http://www.w3.org/2005/Atom') channel title deviblog - link https://blog.terminaldweller.com + link https://blog.terminaldweller.com + atom:link(href='https://blog.terminaldweller.com/feed/rss', rel='self', type='application/rss+xml') description I talk about software here. - managingEditor devi@terminaldweller.com - webMaster devi@terminaldweller.com + managingEditor devi@terminaldweller.com (Farzad Sadeghi) + webMaster devi@terminaldweller.com (Farzad Sadeghi) language en-US if posts.length lastBuildDate= new Date(posts[0].lastUpdatedAt).toUTCString() -- cgit v1.2.3 From 07234ee01b79e5123a4718679da1467d1dc669ea Mon Sep 17 00:00:00 2001 From: terminaldweller Date: Wed, 6 Jul 2022 17:10:17 +0430 Subject: fixes for atom --- views/rss_feed_v2.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/rss_feed_v2.pug b/views/rss_feed_v2.pug index 261f054..76a928d 100644 --- a/views/rss_feed_v2.pug +++ b/views/rss_feed_v2.pug @@ -1,5 +1,5 @@ doctype xml -rss(version='2.0', xmlns:atom='http://www.w3.org/2005/Atom') +rss(version='2.0', xmlns:atom="http://www.w3.org/2005/Atom") channel title deviblog link https://blog.terminaldweller.com -- cgit v1.2.3 From b50e31f75ff62da85539dba72998853a34b9d6ae Mon Sep 17 00:00:00 2001 From: terminaldweller Date: Wed, 6 Jul 2022 17:44:19 +0430 Subject: fix for atom --- views/rss_feed_v2.pug | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/views/rss_feed_v2.pug b/views/rss_feed_v2.pug index 76a928d..d04297d 100644 --- a/views/rss_feed_v2.pug +++ b/views/rss_feed_v2.pug @@ -1,9 +1,9 @@ doctype xml -rss(version='2.0', xmlns:atom="http://www.w3.org/2005/Atom") +rss(version='2.0', xmlns:atom='http://www.w3.org/2005/Atom') channel title deviblog - link https://blog.terminaldweller.com - atom:link(href='https://blog.terminaldweller.com/feed/rss', rel='self', type='application/rss+xml') + link https://blog.terminaldweller.com + atom:link(href='https://blog.terminaldweller.com/rss/feed', rel='self', type='application/rss+xml') description I talk about software here. managingEditor devi@terminaldweller.com (Farzad Sadeghi) webMaster devi@terminaldweller.com (Farzad Sadeghi) -- cgit v1.2.3