Skip to content

Commit 602c7ee

Browse files
Updates & improves the User documentation (#440)
* docs(quick-start): Fixes version links An version `v2.2.1` does not - or no longer - exist, making all links point to a 404 Not Found. * docs(config-file-glossary): Fixes settings docu Various improvements to the Config file glossary documentation: - Adds missing environment variables - Highlights the minimum required settings - Adjusts to show the effective "Default" values - Moves `IRC_PREFIX` & `IRC_SUFFIX` to Telegram section - Fixes some reStructure formatting
1 parent aa21ae2 commit 602c7ee

File tree

2 files changed

+51
-29
lines changed

2 files changed

+51
-29
lines changed

docs/user/config-file-glossary.rst

Lines changed: 44 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ Server connection settings
2424
``IRC_SERVER=chat.freenode.net``
2525
IRC server to connect to
2626

27+
.. CAUTION:: Required setting (cannot be empty)
28+
2729
``IRC_SERVER_PASSWORD=""``
2830
IRC server password
2931

@@ -33,13 +35,13 @@ Server connection settings
3335
Encryption options
3436
------------------
3537

36-
``IRC_USE_SSL=true``
37-
Connect to the IRC server with SSL
38+
``IRC_USE_SSL=false``
39+
Connect to the IRC server with SSL when set to `true`
3840

39-
``IRC_CERT_ALLOW_EXPIRED=false``
41+
``IRC_CERT_ALLOW_EXPIRED=true``
4042
Allow connecting to IRC server with an expired TLS/SSL certificate
4143

42-
``IRC_CERT_ALLOW_SELFSIGNED=false``
44+
``IRC_CERT_ALLOW_SELFSIGNED=true``
4345
Allows TeleIRC to accept TLS/SSL certificates from non-trusted/unknown Certificate Authorities (CA)
4446

4547
Channel settings
@@ -48,6 +50,8 @@ Channel settings
4850
``IRC_CHANNEL="#channel"``
4951
IRC channel for bot to join
5052

53+
.. CAUTION:: Required setting (cannot be empty)
54+
5155
``IRC_CHANNEL_KEY=""``
5256
IRC channel key, for password-protected channels
5357

@@ -61,6 +65,8 @@ Bot settings
6165
IRC nickname for bot.
6266
Most IRC clients and bridges show this nickname.
6367

68+
.. CAUTION:: Required setting (cannot be empty)
69+
6470
``IRC_BOT_REALNAME="Powered by TeleIRC <github.com/RITlug/teleirc>"``
6571
IRC ``REALNAME`` for bot.
6672
Often visible in IRC ``/whois`` reports, but most clients do not show this information by default.
@@ -85,19 +91,19 @@ NickServ options
8591
Message settings
8692
================
8793

88-
``IRC_PREFIX="<"``
94+
``TELEGRAM_MESSAGE_PREFIX="<"``
8995
Text displayed before Telegram name in IRC
9096

91-
``IRC_SUFFIX=">"``
97+
``TELEGRAM_MESSAGE_SUFFIX=">"``
9298
Text displayed after Telegram name in IRC
9399

94100
``IRC_SEND_STICKER_EMOJI=true``
95101
Send emojis associated with a sticker to IRC (when a Telegram user sends a sticker)
96102

97-
``IRC_SEND_DOCUMENT=false``
98-
Send documents and files from Telegram to IRC (`why is this false by default? <https://github.com/RITlug/teleirc/issues/115>`_)
103+
``IRC_SEND_DOCUMENT=true``
104+
Send documents and files from Telegram to IRC (`why is this true by default? <https://github.com/RITlug/teleirc/issues/115>`_)
99105

100-
``IRC_EDITED_PREFIX="(edited) "``
106+
``IRC_EDITED_PREFIX="[EDIT] "``
101107
Prefix to prepend to messages when a user edits a Telegram message and it is resent to IRC
102108

103109
``IRC_MAX_MESSAGE_LENGTH=400``
@@ -107,8 +113,14 @@ Message settings
107113
``IRC_SHOW_ZWSP=true``
108114
Prevents users with the same Telegram and IRC username from pinging themselves across platforms.
109115

116+
``IRC_SHOW_JOIN_MESSAGE=true``
117+
Show in IRC when someone joins the Telegram chat.
118+
119+
``IRC_SHOW_LEAVE_MESSAGE=true``
120+
Show in IRC when someone leaves the Telegram chat.
121+
110122
``IRC_SHOW_LOCATION_MESSAGE=false``
111-
If a user shares their location on Telegram, this will forward the GPS coordinates of their location to IRC if set to true.
123+
If a user shares their location on Telegram, this will forward the GPS coordinates of their location to IRC if set to true.
112124

113125
``IRC_NO_FORWARD_PREFIX="[off]"``
114126
A string users can prefix their message with to prevent it from being relayed across the bridge.
@@ -124,25 +136,35 @@ If a user shares their location on Telegram, this will forward the GPS coordinat
124136
Telegram settings
125137
*****************
126138

127-
``TELEGRAM_CHAT_ID=-0000000000000``
128-
Telegram chat ID of bridged group (:ref:`how do I get this? <chat-id>`).
139+
``TELEGRAM_CHAT_ID=``
140+
Telegram chat ID of bridged group (:ref:`how do I get this? <chat-id>`). Like: `-0000000000000`
129141

130-
``TELEIRC_TOKEN=000000000:AAAAAAaAAa2AaAAaoAAAA-a_aaAAaAaaaAA``
131-
Private API token for Telegram bot.
142+
.. CAUTION:: Required setting (cannot be empty)
132143

133-
``MAX_MESSAGES_PER_MINUTE=20``
134-
Maximum number of messages sent to Telegram from IRC per minute.
144+
``TELEIRC_TOKEN=``
145+
Private API token for Telegram bot. Like: `000000000:AAAAAAaAAa2AaAAaoAAAA-a_aaAAaAaaaAA`
146+
147+
.. CAUTION:: Required setting (cannot be empty)
148+
149+
``MAX_MESSAGE_PER_MINUTE=20``
150+
Maximum number of messages sent per minute from IRC to Telegram.
151+
152+
``IRC_PREFIX="<"``
153+
Text displayed before IRC nickname in messages sent to Telegram
154+
155+
``IRC_SUFFIX=">"``
156+
Text displayed after IRC nickname in messages sent to Telegram
135157

136-
``TELEGRAM_MESSAGE_REPLY_PREFIX="["
158+
``TELEGRAM_MESSAGE_REPLY_PREFIX="["``
137159
Prefix separator for Telegram reply
138160

139-
``TELEGRAM_MESSAGE_REPLY_SUFFIX="]"
161+
``TELEGRAM_MESSAGE_REPLY_SUFFIX="]"``
140162
Suffix separator for Telegram reply
141163

142-
``TELEGRAM_MESSAGE_REPLY_LENGTH=15
164+
``TELEGRAM_MESSAGE_REPLY_LENGTH=15``
143165
Length of quoted reply message before truncation
144166

145-
``SHOW_TOPIC_MESSAGE=true``
167+
``SHOW_TOPIC_MESSAGE=false``
146168
Send Telegram message when the topic in the IRC channel is changed.
147169

148170
``SHOW_ACTION_MESSAGE=true``
@@ -155,7 +177,7 @@ Telegram settings
155177
List of users (separated by a space character) whose IRC leave messages will be sent to Telegram, even if SHOW_JOIN_MESSAGE is false.
156178
This is ignored if SHOW_JOIN_MESSAGE is set to true.
157179

158-
``SHOW_KICK_MESSAGE=true``
180+
``SHOW_KICK_MESSAGE=false``
159181
Send Telegram message when someone is kicked from IRC channel.
160182

161183
``SHOW_NICK_MESSAGE=false``
@@ -168,7 +190,7 @@ Telegram settings
168190
List of users (separated by a space character) whose IRC leave messages will be sent to Telegram, even if SHOW_LEAVE_MESSAGE is false.
169191
This is ignored if SHOW_LEAVE_MESSAGE is set to true.
170192

171-
``SHOW_DISCONNECT_MESSAGE=true``
193+
``SHOW_DISCONNECT_MESSAGE=false``
172194
Sends a message to Telegram when the bot disconnects from the IRC side.
173195

174196
**************

docs/user/quick-start.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ There are two ways to deploy TeleIRC persistently:
130130
### Run container
131131

132132
Containers are the easiest way to deploy TeleIRC.
133-
Dockerfiles and other deployment resources are available in ``deployments/``.
133+
[Dockerfiles][13] and other deployment resources are available in ``deployments/``.
134134

135135
#### Build TeleIRC
136136

@@ -200,15 +200,15 @@ Upstream offers a [systemd unit file][15] to automate TeleIRC on a Linux system
200200
This example uses the upstream systemd unit file to automatically run TeleIRC on a Linux system.
201201

202202
This example was tested on a CentOS 8 system and is easily adaptable for other `*NIX` distributions.
203-
It uses `v2.2.1` as a default:
203+
It uses `v2.3.0` as a default:
204204

205205
```sh
206206
# Download TeleIRC deployment assets from GitHub.
207-
$ curl --location --output ~/teleirc https://github.com/RITlug/teleirc/releases/download/v2.2.1/teleirc-2.2.1-linux-x86_64
208-
$ curl --location --output ~/teleirc.sysusers https://raw.githubusercontent.com/RITlug/teleirc/v2.2.1/deployments/systemd/teleirc.sysusers
209-
$ curl --location --output ~/teleirc.tmpfiles https://raw.githubusercontent.com/RITlug/teleirc/v2.2.1/deployments/systemd/teleirc.tmpfiles
210-
$ curl --location --output ~/teleirc@.service https://raw.githubusercontent.com/RITlug/teleirc/v2.2.1/deployments/systemd/teleirc@.service
211-
$ curl --location --output ~/teleirc.env https://raw.githubusercontent.com/RITlug/teleirc/v2.2.1/env.example
207+
$ curl --location --output ~/teleirc https://github.com/RITlug/teleirc/releases/download/v2.3.0/teleirc-2.3.0-linux-x86_64
208+
$ curl --location --output ~/teleirc.sysusers https://raw.githubusercontent.com/RITlug/teleirc/v2.3.0/deployments/systemd/teleirc.sysusers
209+
$ curl --location --output ~/teleirc.tmpfiles https://raw.githubusercontent.com/RITlug/teleirc/v2.3.0/deployments/systemd/teleirc.tmpfiles
210+
$ curl --location --output ~/teleirc@.service https://raw.githubusercontent.com/RITlug/teleirc/v2.3.0/deployments/systemd/teleirc@.service
211+
$ curl --location --output ~/teleirc.env https://raw.githubusercontent.com/RITlug/teleirc/v2.3.0/env.example
212212

213213
# Install TeleIRC files and user
214214
$ sudo install -Dm755 -o root -g root ~/teleirc /usr/local/bin/teleirc

0 commit comments

Comments
 (0)