* [PATCH 0/4] doc updates and simplifications
@ 2022-08-11 20:13 7% Eric Wong
2022-08-11 20:13 4% ` [PATCH 1/4] doc: drop ancient Apache and WEBrick examples Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2022-08-11 20:13 UTC (permalink / raw)
To: meta
I should've done -netd in 2016 when I did -httpd :x
Eric Wong (4):
doc: drop ancient Apache and WEBrick examples
examples: consolidate systemd socket examples
examples: add systemd files for -netd
doc: spell out "PROTOCOL" in examples
Documentation/lei-blob.pod | 2 +-
Documentation/lei-convert.pod | 2 +-
Documentation/lei-import.pod | 2 +-
Documentation/lei-lcat.pod | 2 +-
Documentation/lei-q.pod | 2 +-
Documentation/lei-rediff.pod | 2 +-
Documentation/public-inbox-daemon.pod | 4 +-
Documentation/public-inbox-imapd.pod | 6 +--
Documentation/public-inbox-netd.pod | 4 +-
Documentation/public-inbox-nntpd.pod | 4 +-
Documentation/public-inbox-pop3d.pod | 6 +--
MANIFEST | 9 +---
examples/README | 4 --
examples/apache2_cgi.conf | 34 --------------
examples/apache2_perl.conf | 25 -----------
examples/apache2_perl_old.conf | 38 ----------------
examples/cgi-webrick.rb | 25 -----------
examples/public-inbox-httpd.socket | 3 ++
examples/public-inbox-httpd@.service | 3 ++
examples/public-inbox-imap-onion.socket | 12 -----
examples/public-inbox-imapd.socket | 17 ++++++-
examples/public-inbox-imapd@.service | 12 ++---
examples/public-inbox-imaps.socket | 12 -----
examples/public-inbox-netd.socket | 45 +++++++++++++++++++
examples/public-inbox-netd@.service | 60 +++++++++++++++++++++++++
examples/public-inbox-nntpd.socket | 21 ++++++++-
examples/public-inbox-nntpd@.service | 9 ++--
examples/public-inbox-nntps.socket | 12 -----
28 files changed, 178 insertions(+), 199 deletions(-)
delete mode 100644 examples/apache2_cgi.conf
delete mode 100644 examples/apache2_perl.conf
delete mode 100644 examples/apache2_perl_old.conf
delete mode 100644 examples/cgi-webrick.rb
delete mode 100644 examples/public-inbox-imap-onion.socket
delete mode 100644 examples/public-inbox-imaps.socket
create mode 100644 examples/public-inbox-netd.socket
create mode 100644 examples/public-inbox-netd@.service
delete mode 100644 examples/public-inbox-nntps.socket
^ permalink raw reply [relevance 7%]
* [PATCH 1/4] doc: drop ancient Apache and WEBrick examples
2022-08-11 20:13 7% [PATCH 0/4] doc updates and simplifications Eric Wong
@ 2022-08-11 20:13 4% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2022-08-11 20:13 UTC (permalink / raw)
To: meta
Having old, unmaintained docs for other HTTP servers is likely
harmful at this point. public-inbox-httpd is specifically
designed to handle git repos on slow storage and stream giant
mbox.gz files fairly to slow clients.
---
MANIFEST | 4 ----
examples/README | 4 ----
examples/apache2_cgi.conf | 34 ------------------------------
examples/apache2_perl.conf | 25 ----------------------
examples/apache2_perl_old.conf | 38 ----------------------------------
examples/cgi-webrick.rb | 25 ----------------------
6 files changed, 130 deletions(-)
delete mode 100644 examples/apache2_cgi.conf
delete mode 100644 examples/apache2_perl.conf
delete mode 100644 examples/apache2_perl_old.conf
delete mode 100644 examples/cgi-webrick.rb
diff --git a/MANIFEST b/MANIFEST
index d37ba0ab..196b9627 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -122,10 +122,6 @@ devel/README
devel/syscall-list
examples/README
examples/README.unsubscribe
-examples/apache2_cgi.conf
-examples/apache2_perl.conf
-examples/apache2_perl_old.conf
-examples/cgi-webrick.rb
examples/cgit-commit-filter.lua
examples/cgit-wwwhighlight-filter.lua
examples/cgit.psgi
diff --git a/examples/README b/examples/README
index 1d5dcd34..5674d7ed 100644
--- a/examples/README
+++ b/examples/README
@@ -9,10 +9,6 @@ For PSGI/Plack (HTTP) servers
-----------------------------
public-inbox.psgi - starting point for PSGI/Plack users in production and dev
-For Apache2 users
------------------
-apache2_perl.conf - intended to be the basis of a production config
-
Contact
-------
Please send any related feedback to public-inbox: meta@public-inbox.org
diff --git a/examples/apache2_cgi.conf b/examples/apache2_cgi.conf
deleted file mode 100644
index 5ec64d72..00000000
--- a/examples/apache2_cgi.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-# Example Apache2 configuration using CGI mod_cgi
-# If possible, use mod_perl (see apache2_perl.conf) or
-# a standalone PSGI/Plack # server instead of this.
-# Adjust paths to your installation.
-
-ServerName "public-inbox"
-ServerRoot "/var/www/cgi-bin"
-DocumentRoot "/var/www/cgi-bin"
-ErrorLog "/tmp/public-inbox-error.log"
-PidFile "/tmp/public-inbox.pid"
-Listen 127.0.0.1:8080
-LoadModule cgi_module /usr/lib/apache2/modules/mod_cgi.so
-LoadModule env_module /usr/lib/apache2/modules/mod_env.so
-LoadModule rewrite_module /usr/lib/apache2/modules/mod_rewrite.so
-LoadModule dir_module /usr/lib/apache2/modules/mod_dir.so
-LoadModule mime_module /usr/lib/apache2/modules/mod_mime.so
-TypesConfig "/dev/null"
-
-<Directory /var/www/cgi-bin>
- Options +ExecCGI
- AddHandler cgi-script .cgi
-
- # we use this hack to ensure "public-inbox.cgi" doesn't show up
- # in any of our redirects:
- SetEnv NO_SCRIPT_NAME 1
-
- # our public-inbox.cgi requires PATH_INFO-based URLs with minimal
- # use of query parameters
- DirectoryIndex public-inbox.cgi
- RewriteEngine On
- RewriteCond %{REQUEST_FILENAME} !-f
- RewriteCond %{REQUEST_FILENAME} !-d
- RewriteRule ^.* /public-inbox.cgi/$0 [L,PT]
-</Directory>
diff --git a/examples/apache2_perl.conf b/examples/apache2_perl.conf
deleted file mode 100644
index a4721b5b..00000000
--- a/examples/apache2_perl.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# Example Apache2 configuration using Plack::Handler::Apache2
-# Adjust paths to your installation
-
-ServerName "public-inbox"
-ServerRoot "/var/www"
-DocumentRoot "/var/www"
-ErrorLog "/tmp/public-inbox-error.log"
-PidFile "/tmp/public-inbox.pid"
-Listen 127.0.0.1:8080
-LoadModule perl_module /usr/lib/apache2/modules/mod_perl.so
-
-# no need to set no rely on HOME if using this:
-PerlSetEnv PI_CONFIG /home/pi/.public-inbox/config
-
-<Location />
- SetHandler perl-script
- PerlResponseHandler Plack::Handler::Apache2
- PerlSetVar psgi_app /path/to/public-inbox.psgi
-</Location>
-
-# Optional, preload the application in the parent like startup.pl
-<Perl>
- use Plack::Handler::Apache2;
- Plack::Handler::Apache2->preload("/path/to/public-inbox.psgi");
-</Perl>
diff --git a/examples/apache2_perl_old.conf b/examples/apache2_perl_old.conf
deleted file mode 100644
index a6de2304..00000000
--- a/examples/apache2_perl_old.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-# Example legacy Apache2 configuration using CGI + mod_perl2
-# Consider using Plack::Handler::Apache2 instead (see apache2_perl.conf)
-# Adjust paths to your installation
-
-ServerName "public-inbox"
-ServerRoot "/var/www/cgi-bin"
-DocumentRoot "/var/www/cgi-bin"
-ErrorLog "/tmp/public-inbox-error.log"
-PidFile "/tmp/public-inbox.pid"
-Listen 127.0.0.1:8080
-LoadModule perl_module /usr/lib/apache2/modules/mod_perl.so
-LoadModule rewrite_module /usr/lib/apache2/modules/mod_rewrite.so
-LoadModule dir_module /usr/lib/apache2/modules/mod_dir.so
-LoadModule mime_module /usr/lib/apache2/modules/mod_mime.so
-TypesConfig "/dev/null"
-
-# PerlPassEnv PATH # this is implicit
-<Directory /var/www/cgi-bin>
- Options +ExecCGI
- AddHandler perl-script .cgi
- PerlResponseHandler ModPerl::Registry
- PerlOptions +ParseHeaders
-
- # we use this hack to ensure "public-inbox.cgi" doesn't show up
- # in any of our redirects:
- PerlSetEnv NO_SCRIPT_NAME 1
-
- # no need to set no rely on HOME if using this:
- PerlSetEnv PI_CONFIG /home/pi/.public-inbox/config
-
- # our public-inbox.cgi requires PATH_INFO-based URLs with minimal
- # use of query parameters
- DirectoryIndex public-inbox.cgi
- RewriteEngine On
- RewriteCond %{REQUEST_FILENAME} !-f
- RewriteCond %{REQUEST_FILENAME} !-d
- RewriteRule ^.* /public-inbox.cgi/$0 [L,PT]
-</Directory>
diff --git a/examples/cgi-webrick.rb b/examples/cgi-webrick.rb
deleted file mode 100644
index 5554a012..00000000
--- a/examples/cgi-webrick.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env ruby
-# Sample configuration using WEBrick, mainly intended dev/testing
-# for folks familiar with Ruby and not various Perl webserver
-# deployment options. For those familiar with Perl web servers,
-# plackup(1) is recommended for development and public-inbox-httpd(1)
-# is our production deployment server.
-require 'webrick'
-require 'logger'
-options = {
- :BindAddress => '127.0.0.1',
- :Port => 8080,
- :Logger => Logger.new($stderr),
- :CGIPathEnv => ENV['PATH'], # need to run 'git' commands
- :AccessLog => [
- [ Logger.new($stdout), WEBrick::AccessLog::COMBINED_LOG_FORMAT ]
- ],
-}
-server = WEBrick::HTTPServer.new(options)
-server.mount("/",
- WEBrick::HTTPServlet::CGIHandler,
- "/var/www/cgi-bin/public-inbox.cgi")
-['INT', 'TERM'].each do |signal|
- trap(signal) {exit!(0)}
-end
-server.start
^ permalink raw reply related [relevance 4%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2022-08-11 20:13 7% [PATCH 0/4] doc updates and simplifications Eric Wong
2022-08-11 20:13 4% ` [PATCH 1/4] doc: drop ancient Apache and WEBrick examples Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).