Make a unique program with all commands

3 files changed, 369 insertions, 246 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1dd9e41..80def86 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -10,7 +10,7 @@ src/scm/webid-oidc/errors.scm
 src/scm/webid-oidc/identity-provider.scm
 src/scm/webid-oidc/authorization-page-unsafe.scm
 src/scm/webid-oidc/resource-server.scm
-src/scm/webid-oidc/reverse-proxy.scm
 src/scm/webid-oidc/hello-world.scm
 src/scm/webid-oidc/client.scm
 src/scm/webid-oidc/example-app.scm
+src/scm/webid-oidc/program.scm
diff --git a/po/fr.po b/po/fr.po
index 595857a..cf787bf 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: webid-oidc 0.0.0\n"
 "Report-Msgid-Bugs-To: vivien@planete-kraus.eu\n"
-"POT-Creation-Date: 2021-06-27 00:20+0200\n"
-"PO-Revision-Date: 2021-06-27 00:21+0200\n"
+"POT-Creation-Date: 2021-06-27 21:10+0200\n"
+"PO-Revision-Date: 2021-06-27 21:22+0200\n"
 "Last-Translator: Vivien Kraus <vivien@planete-kraus.eu>\n"
 "Language-Team: French <vivien@planete-kraus.eu>\n"
 "Language: fr\n"
@@ -828,9 +828,8 @@ msgid "Warning: generating a new key pair."
 msgstr "Attention : génération d'une nouvelle paire de clé."
 
 #: src/scm/webid-oidc/identity-provider.scm:148
-#: src/scm/webid-oidc/reverse-proxy.scm:124
 #: src/scm/webid-oidc/hello-world.scm:31 src/scm/webid-oidc/client.scm:619
-#: src/scm/webid-oidc/example-app.scm:100
+#: src/scm/webid-oidc/example-app.scm:100 src/scm/webid-oidc/program.scm:50
 msgid "command-line|version"
 msgstr "version"
 
@@ -874,12 +873,12 @@ msgid "comand-line|port"
 msgstr "port"
 
 #: src/scm/webid-oidc/identity-provider.scm:168
-#: src/scm/webid-oidc/reverse-proxy.scm:136 src/scm/webid-oidc/client.scm:633
+#: src/scm/webid-oidc/client.scm:633 src/scm/webid-oidc/program.scm:62
 msgid "comand-line|log-file"
 msgstr "fichier-journal"
 
 #: src/scm/webid-oidc/identity-provider.scm:170
-#: src/scm/webid-oidc/reverse-proxy.scm:138 src/scm/webid-oidc/client.scm:635
+#: src/scm/webid-oidc/client.scm:635 src/scm/webid-oidc/program.scm:64
 msgid "comand-line|error-file"
 msgstr "fichier-erreur"
 
@@ -1030,9 +1029,8 @@ msgstr ""
 "Si vous trouvez une erreur dans le programme, envoyez-en un rapport à ~a.\n"
 
 #: src/scm/webid-oidc/identity-provider.scm:267
-#: src/scm/webid-oidc/reverse-proxy.scm:210
 #: src/scm/webid-oidc/hello-world.scm:61 src/scm/webid-oidc/client.scm:700
-#: src/scm/webid-oidc/example-app.scm:143
+#: src/scm/webid-oidc/example-app.scm:143 src/scm/webid-oidc/program.scm:177
 #, scheme-format
 msgid "~a version ~a\n"
 msgstr "~a version ~a\n"
@@ -1066,7 +1064,6 @@ msgid "You need to set the token endpoint URI.\n"
 msgstr "Vous devez définir l'URI du terminal de jeton.\n"
 
 #: src/scm/webid-oidc/identity-provider.scm:327
-#: src/scm/webid-oidc/reverse-proxy.scm:238
 #: src/scm/webid-oidc/hello-world.scm:72 src/scm/webid-oidc/client.scm:738
 msgid "The port should be a number between 0 and 65535.\n"
 msgstr "Le port doit être un nombre entre 0 et 65535.\n"
@@ -1229,148 +1226,6 @@ msgstr ""
 msgid "~a: authentication failure: ~a\n"
 msgstr "~a : échec d’authentificationn : ~a\n"
 
-#: src/scm/webid-oidc/reverse-proxy.scm:126
-msgid "command-line|help"
-msgstr "aide"
-
-#: src/scm/webid-oidc/reverse-proxy.scm:128
-msgid "command-line|port"
-msgstr "port"
-
-#: src/scm/webid-oidc/reverse-proxy.scm:130
-msgid "command-line|inbound-uri"
-msgstr "uri-entrant"
-
-#: src/scm/webid-oidc/reverse-proxy.scm:132
-msgid "command-line|outbound-uri"
-msgstr "uri-sortant"
-
-#: src/scm/webid-oidc/reverse-proxy.scm:134
-msgid "command-line|header"
-msgstr "en-tête"
-
-#: src/scm/webid-oidc/reverse-proxy.scm:152
-#, scheme-format
-msgid ""
-"Usage: ~a [OPTIONS]...\n"
-"\n"
-"Run a reverse proxy, taking requests with webid-oidc authentication\n"
-"and passing them to the outbound URI with an additional header\n"
-"containing the webid of the agent.\n"
-"\n"
-"Options:\n"
-"  -h, --~a:\n"
-"      display this help message and exit.\n"
-"  -v, --~a:\n"
-"      display the version information (~a) and exit.\n"
-"  -p PORT, --~a=8080:\n"
-"      set the port to bind.\n"
-"  -i URI, --~a=URI: \n"
-"      set the public URI of the reverse proxy.\n"
-"  -o URI, --~a=URI:\n"
-"      pass the requests to the server running at URI.\n"
-"  -H HEADER, --~a=HEADER:\n"
-"      pass request with optional HEADER set to the webid, XXX-Agent by "
-"default.\n"
-"  -l FILE.log, --~a=FILE.log:\n"
-"      dump the standard output to that file.\n"
-"  -e FILE.err, --~a=FILE.err:\n"
-"      dump the standard error to that file.\n"
-"\n"
-"Environment variables:\n"
-"\n"
-"  LANG: set the locale of the sysadmin-facing interface. It is\n"
-"currently ~a.\n"
-"\n"
-"Example:\n"
-"\n"
-"Suppose that you operate data.provider.com. Since everything is behind\n"
-"a big global reverse proxy, the authenticated proxy listens on\n"
-"http://localhost:8080. You have the data server running at\n"
-"https://private.data.provider.com, set up so that only you can query\n"
-"it.  The private server needs the XXX-Agent header to contain the\n"
-"authenticated webid of the user, if the user is authenticated.  That’s\n"
-"why you don’t want anyone to query it. You would run:\n"
-"\n"
-"    export LANG=C\n"
-"    webid-oidc-reverse-proxy \\\n"
-"      --port 8080 \\\n"
-"      --inbound-uri https://data.provider.com \\\n"
-"      --outbound-uri https://private.data.provider.com \\\n"
-"      --header XXX-Agent \\\n"
-"      --log-file /var/log/proxy.log \\\n"
-"      --error-file /var/log/proxy.err\n"
-"\n"
-"If you find a bug, send a report to ~a.\n"
-msgstr ""
-"Utilisation : ~a [OPTIONS]...\n"
-"\n"
-"Exécute un proxy inversé, prenant des requêtes avec authentification\n"
-"webid-oidc et les passant à un URI sortant avec un en-tête\n"
-"additionel contenant le webid de l’agent.\n"
-"\n"
-"Options :\n"
-"  -h, --~a :\n"
-"      affiche ce message d’aide et quitte.\n"
-"  -v, --~a :\n"
-"      affiche le numéro de version (~a) et quitte.\n"
-"  -p PORT, --~a=PORT :\n"
-"      définit le port à lier.\n"
-"  -i URI, --~a=URI :\n"
-"      définit le nom public du proxy inversé.\n"
-"  -o URI, --~a=URI :\n"
-"      passe les requêtes au serveur exécuté à URI.\n"
-"  -h ENTÊTE, --~a=ENTÊTE :\n"
-"      passe les requêtes avec un ENTÊTE optionnel défini par la valeur\n"
-"      du webid, XXX-Agent par défaut.\n"
-"  -l FICHIER.log, --~a=FICHIER.log :\n"
-"      déverser la sortie standard vers ce fichier.\n"
-"  -e FICHIER.err, --~a=FICHIER.err :\n"
-"      déverser la sortie d’erreur vers ce fichier.\n"
-"\n"
-"Variables d’environnement :\n"
-"\n"
-"  LANG : définit la locale de l’interface de l’administrateur système\n"
-"Elle vaut actuellement ~a.\n"
-"\n"
-"Exemple :\n"
-"\n"
-"Supposons que vous opérez donnees.fournisseur.com. Puisque tout est\n"
-"derrière un grand proxy inversé global, le proxy d’authentification\n"
-"écoute sur http://localhost:8080. Vous avez le serveur de données sur\n"
-"https://prive.donnees.fournisseur.com, configuré de sorte à ce que\n"
-"vous seul puissiez le requêter. Le serveur privé nécessite que la\n"
-"valeur de l’en-tête XXX-Agent contienne le webid de l’utilisateur\n"
-"authentifié, si c’est le cas. C’est pourquoi vous ne voulez pas que\n"
-"n’importe qui puisse le requêter. Vous exécuteriez :\n"
-"\n"
-"    export LANG=fr_FR.UTF-8\n"
-"    webid-oidc-reverse-proxy \\\n"
-"      --port 8080 \\\n"
-"      --uri-entrant https://donnees.fournisseur.com \\\n"
-"      --uri-sortant https://prive.donnees.fournisseur.com \\\n"
-"      --en-tête XXX-Agent \\\n"
-"      --fichier-journal /var/log/proxy.log \\\n"
-"      --fichier-erreur /var/log/proxy.err\n"
-"\n"
-"Si vous trouvez une erreur dans le programme, envoyez-en un rapport à\n"
-"~a.\n"
-
-#: src/scm/webid-oidc/reverse-proxy.scm:243
-msgid ""
-"The public name of the server must be present (with scheme) as --inbound-"
-"uri.\n"
-msgstr ""
-"Le nom public du serveur doit être présent (avec protocole) avec\n"
-"--uri-entrant.\n"
-
-#: src/scm/webid-oidc/reverse-proxy.scm:248
-msgid ""
-"The address of the proxy must be present (with scheme) as --outbound-uri.\n"
-msgstr ""
-"L’adresse du serveur doit être présent (avec protocole) avec\n"
-"--uri-sortant.\n"
-
 #: src/scm/webid-oidc/hello-world.scm:44
 #, scheme-format
 msgid ""
@@ -1668,6 +1523,225 @@ msgstr ""
 msgid "There was an error: ~a\n"
 msgstr "Il y a eu une erreur : ~a\n"
 
+#: src/scm/webid-oidc/program.scm:52
+msgid "command-line|help"
+msgstr "aide"
+
+#: src/scm/webid-oidc/program.scm:54
+msgid "command-line|server|port"
+msgstr "port"
+
+#: src/scm/webid-oidc/program.scm:56
+msgid "command-line|server|server-name"
+msgstr "nom-du-serveur"
+
+#: src/scm/webid-oidc/program.scm:58
+msgid "command-line|server|reverse-proxy|backend-uri"
+msgstr "uri-arrière-plan"
+
+#: src/scm/webid-oidc/program.scm:60
+msgid "command-line|server|reverse-proxy|header"
+msgstr "en-tête"
+
+#: src/scm/webid-oidc/program.scm:78
+#, scheme-format
+msgid ""
+"Usage: ~a COMMAND [OPTIONS]...\n"
+"\n"
+"Run the webid-oidc COMMAND.\n"
+"\n"
+"Available commands:\n"
+"  ~a: \n"
+"    run an authenticating reverse proxy.\n"
+"\n"
+"General options:\n"
+"  -h, --~a:\n"
+"    display a short help message and exit.\n"
+"  -v, --~a:\n"
+"    display the version information (~a) and exit.\n"
+"  -l FILE.log, --~a=FILE.log:\n"
+"    redirect the program standard output to FILE.log.\n"
+"  -e FILE.err, --~a=FILE.err:\n"
+"    redirect the program errors to FILE.err.\n"
+"\n"
+"General server-side options:\n"
+"  -p PORT, --~a=PORT:\n"
+"    set the server port to bind, 8080 by default.\n"
+"  -n URI, --~a=URI:\n"
+"    set the public server URI (scheme, userinfo, host, and port).\n"
+"\n"
+"Options for the reverse proxy:\n"
+"  -H HEADER, --~a=HEADER:\n"
+"    the HEADER field contains the webid of the authenticated user,\n"
+"    XXX-Agent by default.\n"
+"  -b URI, --~a=URI:\n"
+"    set the backend URI for the reverse proxy, only for the\n"
+"    reverse-proxy command.\n"
+"\n"
+"Environment variables:\n"
+"\n"
+"  LANG: set the locale of the user interface (for the server commands,\n"
+"the user is the system administrator).~a\n"
+"\n"
+"Running a reverse proxy\n"
+"\n"
+"Suppose that you operate data.provider.com. You want to run an\n"
+"authenticating reverse proxy, that will receive incoming requests\n"
+"through http://localhost:8080, and forward them to\n"
+"https://private.data.provider.com. The backend will look for the\n"
+"XXX-Agent header, and if it is found, then its value will be\n"
+"considered the webid of the authenticated\n"
+"user. https://private.data.provider.com should only accept requests\n"
+"from this reverse proxy.\n"
+"\n"
+"    ~a ~a \\\n"
+"      --~a 8080 \\\n"
+"      --~a 'https://data.provider.com' \\\n"
+"      --~a 'https://private.data.provider.com' \\\n"
+"      --~a 'XXX-Agent' \\\n"
+"      --~a '/var/log/proxy.log' \\\n"
+"      --~a '/var/log/proxy.err'\n"
+"\n"
+"If you find a bug, then please send a report to ~a.\n"
+msgstr ""
+"Utilisation : ~a COMMANDE [OPTIONS]...\n"
+"\n"
+"Exécute la COMMANDE de webid-oidc.\n"
+"\n"
+"Commandes disponibles :\n"
+"  ~a :\n"
+"    exécute le proxy inverse authentifiant.\n"
+"\n"
+"Options générales :\n"
+"  -h, --~a :\n"
+"      affiche un court message d’aide et quitte.\n"
+"  -v, --~a :\n"
+"      affiche le numéro de version (~a) et quitte.\n"
+"  -l FICHIER.log, --~a=FICHIER.log :\n"
+"      redirige la sortie standard du programme vers ce fichier.\n"
+"  -e FICHIER.err, --~a=FICHIER.err :\n"
+"      redirige la sortie d’erreur du programme vers ce fichier.\n"
+"\n"
+"Options générales pour le serveur :\n"
+"  -p PORT, --~a=PORT :\n"
+"      définit le port à lier, par défaut 8080.\n"
+"  -n URI, --~a=URI :\n"
+"      définit le nom public du serveur (schéma, userinfo, hôte, et port).\n"
+"\n"
+"Options pour le proxy inverse :\n"
+"  -h ENTÊTE, --~a=ENTÊTE :\n"
+"      passe les requêtes avec un ENTÊTE optionnel défini par la valeur\n"
+"      du webid, XXX-Agent par défaut.\n"
+"  -b URI, --~a=URI :\n"
+"      définit l’URI d’arrière-plan pour le proxy inverse, uniquement\n"
+"      pour la commande proxy-inversé.\n"
+"\n"
+"Variables d’environnement :\n"
+"\n"
+"  LANG : définit la locale de l’interface utilisateur (pour les\n"
+"commandes serveur, l’utilisateur est l’administrateur système).~a\n"
+"\n"
+"Exécution d’un proxy inverse\n"
+"\n"
+"Supposons que vous opérez donnees.fournisseur.com. Vous voulez\n"
+"exécuter un proxy inverse authentifiant, qui reçoit des requêtes\n"
+"entrantes à travers http://localhost:8080, et les transmet à\n"
+"https://prive.donnees.fournisseur.com. Le service d’arrière-plan\n"
+"recherchera l’en-tête XXX-Agent, et s’il est trouvé, alors sa valeur\n"
+"sera considérée comme le webid de l’utilisateur\n"
+"authentifié. https://prive.donnees.fournisseur.com doit uniquement\n"
+"accepter les requêtes de ce proxy inverse.\n"
+"\n"
+"    export LANG=fr_FR.UTF-8\n"
+"    ~a ~a \\\n"
+"      --~a 8080 \\\n"
+"      --~a 'https://donnees.fournisseur.com' \\\n"
+"      --~a 'https://prive.donnees.fournisseur.com' \\\n"
+"      --~a 'XXX-Agent' \\\n"
+"      --~a '/var/log/proxy.log' \\\n"
+"      --~a '/var/log/proxy.err'\n"
+"\n"
+"Si vous trouvez une erreur dans le programme, envoyez-en un rapport à\n"
+"~a.\n"
+
+#: src/scm/webid-oidc/program.scm:139 src/scm/webid-oidc/program.scm:170
+#: src/scm/webid-oidc/program.scm:236
+msgid "command-line|command|reverse-proxy"
+msgstr "proxy-inversé"
+
+#: src/scm/webid-oidc/program.scm:163
+#, scheme-format
+msgid "an environment variable| It is currently set to ~s."
+msgstr " Elle vaut actuellement ~s."
+
+#: src/scm/webid-oidc/program.scm:165
+msgid "an environment variable| It is currently unset."
+msgstr " Elle n’est actuellement pas définie."
+
+#: src/scm/webid-oidc/program.scm:185
+#, scheme-format
+msgid "The --~a argument must be a number, not ~s.\n"
+msgstr "L’argument de --~a doit être un nombre, pas ~s.\n"
+
+#: src/scm/webid-oidc/program.scm:191
+#, scheme-format
+msgid "The --~a argument must be an integer, not ~s.\n"
+msgstr "L’argument de --~a doit être un entier, pas ~s.\n"
+
+#: src/scm/webid-oidc/program.scm:197
+#, scheme-format
+msgid "The --~a argument must be positive, ~s is invalid.\n"
+msgstr "L’argument de --~a doit être positif, ~s est invalide.\n"
+
+#: src/scm/webid-oidc/program.scm:202
+#, scheme-format
+msgid "The --~a argument must be less than 65536, ~s is invalid.\n"
+msgstr "L’argument de --~a doit être inférieur à 65536, ~s est invalide.\n"
+
+#: src/scm/webid-oidc/program.scm:220
+#, scheme-format
+msgid ""
+"Usage: ~a COMMAND [OPTIONS]...\n"
+"See --~a (-h).\n"
+msgstr ""
+"Utilisation : ~a COMMANDE [OPTIONS]...\n"
+"Voir --~a (-h).\n"
+
+#: src/scm/webid-oidc/program.scm:239
+#, scheme-format
+msgid "You must pass --~a to set the server name.\n"
+msgstr "Vous devez passer --~a pour définir le nom du serveur.\n"
+
+#: src/scm/webid-oidc/program.scm:243
+#, scheme-format
+msgid "You must pass --~a to set the backend URI.\n"
+msgstr "Vous devez passer --~a pour définir l'URI du service d’arrière-plan.\n"
+
+#: src/scm/webid-oidc/program.scm:255
+#, scheme-format
+msgid "Unknown command ~s\n"
+msgstr "Commande inconnue ~s\n"
+
+#~ msgid "command-line|inbound-uri"
+#~ msgstr "uri-entrant"
+
+#~ msgid "command-line|outbound-uri"
+#~ msgstr "uri-sortant"
+
+#~ msgid ""
+#~ "The public name of the server must be present (with scheme) as --inbound-"
+#~ "uri.\n"
+#~ msgstr ""
+#~ "Le nom public du serveur doit être présent (avec protocole) avec\n"
+#~ "--uri-entrant.\n"
+
+#~ msgid ""
+#~ "The address of the proxy must be present (with scheme) as --outbound-"
+#~ "uri.\n"
+#~ msgstr ""
+#~ "L’adresse du serveur doit être présent (avec protocole) avec\n"
+#~ "--uri-sortant.\n"
+
 #, scheme-format
 #~ msgid "the resource ~s could not be found (because ~a)"
 #~ msgstr "la ressource ~s n’a pas été trouvée (parce que ~a)"
diff --git a/po/webid-oidc.pot b/po/webid-oidc.pot
index ae6f474..84850fc 100644
--- a/po/webid-oidc.pot
+++ b/po/webid-oidc.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: webid-oidc SNAPSHOT\n"
 "Report-Msgid-Bugs-To: vivien@planete-kraus.eu\n"
-"POT-Creation-Date: 2021-06-27 00:20+0200\n"
+"POT-Creation-Date: 2021-06-27 21:10+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -795,9 +795,8 @@ msgid "Warning: generating a new key pair."
 msgstr ""
 
 #: src/scm/webid-oidc/identity-provider.scm:148
-#: src/scm/webid-oidc/reverse-proxy.scm:124
 #: src/scm/webid-oidc/hello-world.scm:31 src/scm/webid-oidc/client.scm:619
-#: src/scm/webid-oidc/example-app.scm:100
+#: src/scm/webid-oidc/example-app.scm:100 src/scm/webid-oidc/program.scm:50
 msgid "command-line|version"
 msgstr ""
 
@@ -841,12 +840,12 @@ msgid "comand-line|port"
 msgstr ""
 
 #: src/scm/webid-oidc/identity-provider.scm:168
-#: src/scm/webid-oidc/reverse-proxy.scm:136 src/scm/webid-oidc/client.scm:633
+#: src/scm/webid-oidc/client.scm:633 src/scm/webid-oidc/program.scm:62
 msgid "comand-line|log-file"
 msgstr ""
 
 #: src/scm/webid-oidc/identity-provider.scm:170
-#: src/scm/webid-oidc/reverse-proxy.scm:138 src/scm/webid-oidc/client.scm:635
+#: src/scm/webid-oidc/client.scm:635 src/scm/webid-oidc/program.scm:64
 msgid "comand-line|error-file"
 msgstr ""
 
@@ -924,9 +923,8 @@ msgid ""
 msgstr ""
 
 #: src/scm/webid-oidc/identity-provider.scm:267
-#: src/scm/webid-oidc/reverse-proxy.scm:210
 #: src/scm/webid-oidc/hello-world.scm:61 src/scm/webid-oidc/client.scm:700
-#: src/scm/webid-oidc/example-app.scm:143
+#: src/scm/webid-oidc/example-app.scm:143 src/scm/webid-oidc/program.scm:177
 #, scheme-format
 msgid "~a version ~a\n"
 msgstr ""
@@ -960,7 +958,6 @@ msgid "You need to set the token endpoint URI.\n"
 msgstr ""
 
 #: src/scm/webid-oidc/identity-provider.scm:327
-#: src/scm/webid-oidc/reverse-proxy.scm:238
 #: src/scm/webid-oidc/hello-world.scm:72 src/scm/webid-oidc/client.scm:738
 msgid "The port should be a number between 0 and 65535.\n"
 msgstr ""
@@ -1115,92 +1112,6 @@ msgstr ""
 msgid "~a: authentication failure: ~a\n"
 msgstr ""
 
-#: src/scm/webid-oidc/reverse-proxy.scm:126
-msgid "command-line|help"
-msgstr ""
-
-#: src/scm/webid-oidc/reverse-proxy.scm:128
-msgid "command-line|port"
-msgstr ""
-
-#: src/scm/webid-oidc/reverse-proxy.scm:130
-msgid "command-line|inbound-uri"
-msgstr ""
-
-#: src/scm/webid-oidc/reverse-proxy.scm:132
-msgid "command-line|outbound-uri"
-msgstr ""
-
-#: src/scm/webid-oidc/reverse-proxy.scm:134
-msgid "command-line|header"
-msgstr ""
-
-#: src/scm/webid-oidc/reverse-proxy.scm:152
-#, scheme-format
-msgid ""
-"Usage: ~a [OPTIONS]...\n"
-"\n"
-"Run a reverse proxy, taking requests with webid-oidc authentication\n"
-"and passing them to the outbound URI with an additional header\n"
-"containing the webid of the agent.\n"
-"\n"
-"Options:\n"
-"  -h, --~a:\n"
-"      display this help message and exit.\n"
-"  -v, --~a:\n"
-"      display the version information (~a) and exit.\n"
-"  -p PORT, --~a=8080:\n"
-"      set the port to bind.\n"
-"  -i URI, --~a=URI: \n"
-"      set the public URI of the reverse proxy.\n"
-"  -o URI, --~a=URI:\n"
-"      pass the requests to the server running at URI.\n"
-"  -H HEADER, --~a=HEADER:\n"
-"      pass request with optional HEADER set to the webid, XXX-Agent by "
-"default.\n"
-"  -l FILE.log, --~a=FILE.log:\n"
-"      dump the standard output to that file.\n"
-"  -e FILE.err, --~a=FILE.err:\n"
-"      dump the standard error to that file.\n"
-"\n"
-"Environment variables:\n"
-"\n"
-"  LANG: set the locale of the sysadmin-facing interface. It is\n"
-"currently ~a.\n"
-"\n"
-"Example:\n"
-"\n"
-"Suppose that you operate data.provider.com. Since everything is behind\n"
-"a big global reverse proxy, the authenticated proxy listens on\n"
-"http://localhost:8080. You have the data server running at\n"
-"https://private.data.provider.com, set up so that only you can query\n"
-"it.  The private server needs the XXX-Agent header to contain the\n"
-"authenticated webid of the user, if the user is authenticated.  That’s\n"
-"why you don’t want anyone to query it. You would run:\n"
-"\n"
-"    export LANG=C\n"
-"    webid-oidc-reverse-proxy \\\n"
-"      --port 8080 \\\n"
-"      --inbound-uri https://data.provider.com \\\n"
-"      --outbound-uri https://private.data.provider.com \\\n"
-"      --header XXX-Agent \\\n"
-"      --log-file /var/log/proxy.log \\\n"
-"      --error-file /var/log/proxy.err\n"
-"\n"
-"If you find a bug, send a report to ~a.\n"
-msgstr ""
-
-#: src/scm/webid-oidc/reverse-proxy.scm:243
-msgid ""
-"The public name of the server must be present (with scheme) as --inbound-"
-"uri.\n"
-msgstr ""
-
-#: src/scm/webid-oidc/reverse-proxy.scm:248
-msgid ""
-"The address of the proxy must be present (with scheme) as --outbound-uri.\n"
-msgstr ""
-
 #: src/scm/webid-oidc/hello-world.scm:44
 #, scheme-format
 msgid ""
@@ -1399,3 +1310,141 @@ msgstr ""
 #, scheme-format
 msgid "There was an error: ~a\n"
 msgstr ""
+
+#: src/scm/webid-oidc/program.scm:52
+msgid "command-line|help"
+msgstr ""
+
+#: src/scm/webid-oidc/program.scm:54
+msgid "command-line|server|port"
+msgstr ""
+
+#: src/scm/webid-oidc/program.scm:56
+msgid "command-line|server|server-name"
+msgstr ""
+
+#: src/scm/webid-oidc/program.scm:58
+msgid "command-line|server|reverse-proxy|backend-uri"
+msgstr ""
+
+#: src/scm/webid-oidc/program.scm:60
+msgid "command-line|server|reverse-proxy|header"
+msgstr ""
+
+#: src/scm/webid-oidc/program.scm:78
+#, scheme-format
+msgid ""
+"Usage: ~a COMMAND [OPTIONS]...\n"
+"\n"
+"Run the webid-oidc COMMAND.\n"
+"\n"
+"Available commands:\n"
+"  ~a: \n"
+"    run an authenticating reverse proxy.\n"
+"\n"
+"General options:\n"
+"  -h, --~a:\n"
+"    display a short help message and exit.\n"
+"  -v, --~a:\n"
+"    display the version information (~a) and exit.\n"
+"  -l FILE.log, --~a=FILE.log:\n"
+"    redirect the program standard output to FILE.log.\n"
+"  -e FILE.err, --~a=FILE.err:\n"
+"    redirect the program errors to FILE.err.\n"
+"\n"
+"General server-side options:\n"
+"  -p PORT, --~a=PORT:\n"
+"    set the server port to bind, 8080 by default.\n"
+"  -n URI, --~a=URI:\n"
+"    set the public server URI (scheme, userinfo, host, and port).\n"
+"\n"
+"Options for the reverse proxy:\n"
+"  -H HEADER, --~a=HEADER:\n"
+"    the HEADER field contains the webid of the authenticated user,\n"
+"    XXX-Agent by default.\n"
+"  -b URI, --~a=URI:\n"
+"    set the backend URI for the reverse proxy, only for the\n"
+"    reverse-proxy command.\n"
+"\n"
+"Environment variables:\n"
+"\n"
+"  LANG: set the locale of the user interface (for the server commands,\n"
+"the user is the system administrator).~a\n"
+"\n"
+"Running a reverse proxy\n"
+"\n"
+"Suppose that you operate data.provider.com. You want to run an\n"
+"authenticating reverse proxy, that will receive incoming requests\n"
+"through http://localhost:8080, and forward them to\n"
+"https://private.data.provider.com. The backend will look for the\n"
+"XXX-Agent header, and if it is found, then its value will be\n"
+"considered the webid of the authenticated\n"
+"user. https://private.data.provider.com should only accept requests\n"
+"from this reverse proxy.\n"
+"\n"
+"    ~a ~a \\\n"
+"      --~a 8080 \\\n"
+"      --~a 'https://data.provider.com' \\\n"
+"      --~a 'https://private.data.provider.com' \\\n"
+"      --~a 'XXX-Agent' \\\n"
+"      --~a '/var/log/proxy.log' \\\n"
+"      --~a '/var/log/proxy.err'\n"
+"\n"
+"If you find a bug, then please send a report to ~a.\n"
+msgstr ""
+
+#: src/scm/webid-oidc/program.scm:139 src/scm/webid-oidc/program.scm:170
+#: src/scm/webid-oidc/program.scm:236
+msgid "command-line|command|reverse-proxy"
+msgstr ""
+
+#: src/scm/webid-oidc/program.scm:163
+#, scheme-format
+msgid "an environment variable| It is currently set to ~s."
+msgstr ""
+
+#: src/scm/webid-oidc/program.scm:165
+msgid "an environment variable| It is currently unset."
+msgstr ""
+
+#: src/scm/webid-oidc/program.scm:185
+#, scheme-format
+msgid "The --~a argument must be a number, not ~s.\n"
+msgstr ""
+
+#: src/scm/webid-oidc/program.scm:191
+#, scheme-format
+msgid "The --~a argument must be an integer, not ~s.\n"
+msgstr ""
+
+#: src/scm/webid-oidc/program.scm:197
+#, scheme-format
+msgid "The --~a argument must be positive, ~s is invalid.\n"
+msgstr ""
+
+#: src/scm/webid-oidc/program.scm:202
+#, scheme-format
+msgid "The --~a argument must be less than 65536, ~s is invalid.\n"
+msgstr ""
+
+#: src/scm/webid-oidc/program.scm:220
+#, scheme-format
+msgid ""
+"Usage: ~a COMMAND [OPTIONS]...\n"
+"See --~a (-h).\n"
+msgstr ""
+
+#: src/scm/webid-oidc/program.scm:239
+#, scheme-format
+msgid "You must pass --~a to set the server name.\n"
+msgstr ""
+
+#: src/scm/webid-oidc/program.scm:243
+#, scheme-format
+msgid "You must pass --~a to set the backend URI.\n"
+msgstr ""
+
+#: src/scm/webid-oidc/program.scm:255
+#, scheme-format
+msgid "Unknown command ~s\n"
+msgstr ""