README | 29 +++++++++++++++++++++++------ cmd/sgblog-comment-add/mail.go | 2 +- cmd/sgblog-comment-add/main.go | 4 ++-- cmd/sgblog/gopher.go | 3 +-- cmd/sgblog/http.go | 3 +-- cmd/sgblog/main.go | 4 ++-- common.go | 2 +- diff --git a/README b/README index 6f4c193f979580204d18aa32e51022d95670b1a738af731e71d6261c91ee3993..a74e6c501a6c566f22853987122c3b3484892c426f60b1b6bd768d50a00451da 100644 --- a/README +++ b/README @@ -1,12 +1,12 @@ - SGBlog -- Git-based CGI blogging engine - ======================================= + SGBlog -- Git-based CGI/inetd blogging/phlogging engine + ======================================================= DESCRIPTION -SGBlog is a simple blogging engine with a Git-based storage and CGI -interface with HTTP-server. It can be used as a cgit replacement for -readonly Git repository viewing and Atom feed generation. But it has -better features: +SGBlog is a simple blogging engine with a Git-based storage, CGI +interface for HTTP-server, inetd interface for serving as Gopher server. +It can be used as a cgit replacement for readonly Git repository viewing +and Atom feed generation. But it has better features: * URLs are tried to be converted to clickable links * SHA1 hashes are tried to be converted to blog links itself @@ -14,6 +14,7 @@ * Relative links are included for easy navigation * Each page has ETag and it is checked against the request for client-side caching * Pages can be gzip-compressed, depending on Accept-Encoding header +* Gopher protocol support for phlog creation * Commenting support CONFIGURATION @@ -47,6 +48,22 @@ # If that ref is set, then comments will be loaded from it CommentsNotesRef: refs/notes/comments # Display link for comment writing, if email is set CommentsEmail: something@example.com + } + +Gopher mode can use the same configuration file, but it requires much +less options: + + { + GitPath: /home/git/pub/stargrave-blog.git + Branch: refs/heads/english + Title: "English Stargrave's blog" + + AboutURL: http://blog.stargrave.org/ + + CommentsNotesRef: refs/notes/comments + CommentsEmail: something@example.com + + GopherDomain: phlog.stargrave.org } COMMENTS diff --git a/cmd/sgblog-comment-add/mail.go b/cmd/sgblog-comment-add/mail.go index 53fd3ea6b3ea7e923eda4b4a6ed38bca9db4d51af5dfdfd7376d8d93581bc274..cc35b4f5a28b9e28c572dfd693f243a05a5462c4f0ae4b484aef5d468a675a7e 100644 --- a/cmd/sgblog-comment-add/mail.go +++ b/cmd/sgblog-comment-add/mail.go @@ -1,5 +1,5 @@ /* -SGBlog -- Git-based CGI blogging engine +SGBlog -- Git-based CGI/inetd blogging/phlogging engine Copyright (C) 2020 Sergey Matveev This program is free software: you can redistribute it and/or modify diff --git a/cmd/sgblog-comment-add/main.go b/cmd/sgblog-comment-add/main.go index 06972461ce00eccb465aa5a175b6ef80a72043d1c9aa4b074f8e638166041ef8..277f848e1665b533c7fed8cf450ea0b991d96764d509802bcbbd3b70959db92a 100644 --- a/cmd/sgblog-comment-add/main.go +++ b/cmd/sgblog-comment-add/main.go @@ -1,5 +1,5 @@ /* -SGBlog -- Git-based CGI blogging engine +SGBlog -- Git-based CGI/inetd blogging/phlogging engine Copyright (C) 2020 Sergey Matveev This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . */ -// Git-based CGI blogging engine email to comments adder +// Git-based CGI/inetd blogging/phlogging engine package main import ( diff --git a/cmd/sgblog/gopher.go b/cmd/sgblog/gopher.go index 47fc4eb632dc0e7b35a85debe2f9880f32d7771bdf2b607b84549e311a44e7ab..ae8efd8e2231a696887c789e4296dd37a2b16bc3ebb3e912841466e1aa096d70 100644 --- a/cmd/sgblog/gopher.go +++ b/cmd/sgblog/gopher.go @@ -1,5 +1,5 @@ /* -SGBlog -- Git-based CGI blogging engine +SGBlog -- Git-based CGI/inetd blogging/phlogging engine Copyright (C) 2020 Sergey Matveev This program is free software: you can redistribute it and/or modify @@ -15,7 +15,6 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . */ -// Git-based CGI blogging engine package main import ( diff --git a/cmd/sgblog/http.go b/cmd/sgblog/http.go index 4d6b47221a2396682d1eb24e73383994bd1e502d7d5f8b80fbee2f8c825e89b9..f2db3d85527b816452cb68ddb65ccb30692d41d632692141273a5ab2f3ab7ae7 100644 --- a/cmd/sgblog/http.go +++ b/cmd/sgblog/http.go @@ -1,5 +1,5 @@ /* -SGBlog -- Git-based CGI blogging engine +SGBlog -- Git-based CGI/inetd blogging/phlogging engine Copyright (C) 2020 Sergey Matveev This program is free software: you can redistribute it and/or modify @@ -15,7 +15,6 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . */ -// Git-based CGI blogging engine package main import ( diff --git a/cmd/sgblog/main.go b/cmd/sgblog/main.go index 3274b36e0e268e149ec2c18b3ad093b0f4ebeb0343017ffcf28de3b08d583af6..32f834257f9becd01fd9de8a07bf82e9cf6349bf430492924e7b416eabc9d0f4 100644 --- a/cmd/sgblog/main.go +++ b/cmd/sgblog/main.go @@ -1,5 +1,5 @@ /* -SGBlog -- Git-based CGI blogging engine +SGBlog -- Git-based CGI/inetd blogging/phlogging engine Copyright (C) 2020 Sergey Matveev This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . */ -// Git-based CGI blogging engine +// Git-based CGI/inetd blogging/phlogging engine package main import ( diff --git a/common.go b/common.go index 4c68325391df2dc65c5b65c87fc35716fcd4a1ee0b8c6927cb90ead8f17e8620..ca197e2a7db225582e1aac92a7a2fc92b716dc45bdba46358522960e72c392a7 100644 --- a/common.go +++ b/common.go @@ -1,4 +1,4 @@ -// SGBlog -- Git-based CGI blogging engine +// SGBlog -- Git-based CGI/inetd blogging/phlogging engine package sgblog const (