Skip to content

Commit 4694f21

Browse files
authored
Merge pull request #1025 from ix5/docs-misc
docs: Misc changes for dropped IRC bridge, dbpath in docker, distro packaging
2 parents 33ad1fb + c155e1c commit 4694f21

8 files changed

Lines changed: 25 additions & 12 deletions

File tree

contrib/isso-dev.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
[general]
77

8+
# Change dbpath to /db/comments.db if running in docker!
89
dbpath = comments.db
910
host =
1011
http://isso-dev.local/

contrib/isso.sample.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
[general]
55

6+
# Change dbpath to /db/comments.db if running in docker!
67
dbpath = comments.db
78
host =
89
http://localhost:80/

docs/community.rst

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@ Getting in contact
1111
The main place of interaction for the Isso community is the
1212
`GitHub issue tracker <https://github.com/isso-comments/isso/issues>`_.
1313

14-
A few people - including the lead developers and maintainers - frequent the
15-
``#isso`` channel, which you can join via
16-
`Matrix <https://matrix.to/#/#isso:libera.chat">`_ or via IRC on
17-
`Libera.Chat <https://libera.chat/>`_
14+
A few people - including some of the lead developers and maintainers -
15+
sometimes participate in the ``#isso`` channel, which you can join via IRC on
16+
`Libera.Chat <https://libera.chat/>`_.
1817

1918
You may also ask questions or suggest improvements on
2019
`GitHub Discussions <https://github.com/isso-comments/isso/discussions>`_.

docs/docs/contributing/infrastructure.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ maintainer review before merging.
7474
Packaging
7575
---------
7676

77-
Isso is released "officially" to as an installable Python package on `PyPI`_
77+
Isso is released "officially" as an installable Python package on `PyPI`_
7878
and as a docker image. Other distributors may package releases of Isso natively
7979
for operating systems (e.g. for the Arch User repository or formerly Debian),
8080
but support for these releases should be given by the packager.
@@ -96,8 +96,9 @@ The `ghcr.io/isso-comments/isso docker image`_ is rebuilt on every push to
9696
inherited from the main ``isso-comments/isso`` GitHub repository (toggle
9797
``Inherit access from source repository`` turned on).
9898

99-
The `ghcr.io/isso-comments/isso-js-testbed`_ image for running ``Jest``-based
100-
unit and integration tests is built and pushed manually by @ix5 so far.
99+
The `ghcr.io/isso-comments/isso-js-testbed`_ image for running ``Jest``- and
100+
``puppet``-based unit and integration tests is rebuilt and pushed every week by
101+
a GitHub Action.
101102

102103
.. _ghcr.io/isso-comments/isso docker image: https://github.com/isso-comments/isso/pkgs/container/isso
103104
.. _ghcr.io/isso-comments/isso-js-testbed: https://github.com/orgs/isso-comments/packages/container/package/isso-js-testbed

docs/docs/guides/quickstart.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ sane defaults.
2222
; database location, check permissions, automatically created if it
2323
; does not exist
2424
dbpath = /var/lib/isso/comments.db
25+
; for docker image: dbpath = /db/comments.db
26+
;
2527
; your website or blog (not the location of Isso!)
2628
host = http://example.tld/
2729
; you can add multiple hosts for local development

docs/docs/reference/client-config.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ data-isso-max-comments-nested
143143
data-isso-reveal-on-click
144144
Number of comments to reveal on clicking the "X Hidden" link.
145145

146-
Default: ``true``
146+
Default: ``5``
147147

148148
.. _data-isso-avatar:
149149

docs/docs/reference/installation.rst

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,16 @@ To upgrade Isso, activate your virtual environment again, and run
133133
Prebuilt Packages
134134
-----------------
135135

136-
* Debian (since Buster): https://packages.debian.org/search?keywords=isso
136+
* Arch Linux: The `isso`_ AUR package (maintained by `@HLFH`_) follows the
137+
latest stable release, while the `isso-git`_ package (maintained by
138+
`@AlphaJack`_) always builds the latest commit from ``git``.
139+
* Debian: The package was `dropped in 2021`_ from the Debian repositories.
137140

138-
* Arch Linux: https://aur.archlinux.org/packages/isso/
141+
.. _isso: https://aur.archlinux.org/packages/isso
142+
.. _@HLFH: https://github.com/HLFH
143+
.. _isso-git: https://aur.archlinux.org/packages/isso-git
144+
.. _@AlphaJack: https://github.com/AlphaJack
145+
.. _dropped in 2021: https://tracker.debian.org/pkg/isso
139146

140147
.. _using-docker:
141148

@@ -167,6 +174,9 @@ The maintainers recommend pinning the image to a `release tag`_, e.g.
167174
.. code-block:: console
168175
169176
$ docker pull ghcr.io/isso-comments/isso:release
177+
$ mkdir -p config/ db/
178+
$ cp contrib/isso.sample.cfg config/isso.cfg
179+
# Set 'dbpath' to '/db/comments.db' and adjust 'host'
170180
$ docker run -d --rm --name isso -p 127.0.0.1:8080:8080 \
171181
-v /var/lib/isso:/config -v /var/lib/isso:/db \
172182
ghcr.io/isso-comments/isso:release

docs/index.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ <h2>Links</h2>
4646
</ul>
4747
<h2>Help</h2>
4848
<p>
49-
Join <code>#isso</code> via <a href="https://matrix.to/#/#isso:libera.chat">Matrix</a>
50-
or via IRC on <a href="https://libera.chat/">Libera.Chat</a>,
49+
Join <code>#isso</code> via IRC on <a href="https://libera.chat/">Libera.Chat</a>,
5150
or ask a question on <a href="https://github.com/isso-comments/isso/discussions">GitHub&nbsp;Discussions</a>.
5251
</p>
5352
<h2>Contribute</h2>

0 commit comments

Comments
 (0)