saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 09:40:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Update documentation to avoid reference to freenode.

Browse source 
Freenode staff have now rolled out two waves of hostile channel
takeovers on the Freenode network. The ``#salt`` channel that served as
SaltStack'ss/SaltProject's primary IRC channel for many years is one
such channel that was taken over.

We have largely already migrated to the new LiberaChat network.
This commit is contained in:
Michael Lustfield 2021-05-26 19:41:20 -05:00 • committed by Gareth J. Greenaway
parent 5f66dce4a9
commit e06ed408c5
11 changed files with 37 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/ISSUE_TEMPLATE/config.yml vendored
View file

@ -6,8 +6,8 @@ contact_links:
- name: Salt-Users Forum
url: https://groups.google.com/forum/#!forum/salt-users
about: Please ask and answer questions here.
- name: Salt on Freenode
url: http://webchat.freenode.net/?channels=salt&uio=Mj10cnVlJjk9dHJ1ZSYxMD10cnVl83
- name: Salt on LiberaChat
url: https://web.libera.chat/#salt
about: Please ask and answer questions here.
- name: Security vulnerabilities
email: security@saltstack.com

4
.github/config.yml vendored
View file

@ -14,7 +14,7 @@ newIssueWelcomeComment: >
- [Community Wiki](https://github.com/saltstack/community/wiki)
- [Salt’s Contributor Guide](https://docs.saltproject.io/en/master/topics/development/contributing.html)
- [Join our Community Slack](https://join.slack.com/t/saltstackcommunity/shared_invite/zt-3av8jjyf-oBQ2M0vhXOhJpNpRkPWBvg)
- [IRC on Freenode](https://webchat.freenode.net/#salt)
- [IRC on LiberaChat](https://web.libera.chat/#salt)
- [Salt Project YouTube channel](https://www.youtube.com/channel/UCpveTIucFx9ljGelW63-BWg)
- [Salt Project Twitch channel](https://www.twitch.tv/saltprojectoss)
@ -40,7 +40,7 @@ newPRWelcomeComment: >
- [Community Wiki](https://github.com/saltstack/community/wiki)
- [Salt’s Contributor Guide](https://docs.saltproject.io/en/master/topics/development/contributing.html)
- [Join our Community Slack](https://join.slack.com/t/saltstackcommunity/shared_invite/zt-3av8jjyf-oBQ2M0vhXOhJpNpRkPWBvg)
- [IRC on Freenode](https://webchat.freenode.net/#salt)
- [IRC on LiberaChat](https://web.libera.chat/#salt)
- [Salt Project YouTube channel](https://www.youtube.com/channel/UCpveTIucFx9ljGelW63-BWg)
- [Salt Project Twitch channel](https://www.twitch.tv/saltprojectoss)

5
CONTRIBUTING.rst
View file

@ -8,7 +8,7 @@ in a number of ways:
- Using Salt and opening well-written bug reports.
- Joining a `working group <https://github.com/saltstack/community>`__.
- Answering questions on `irc <https://webchat.freenode.net/#salt>`__,
- Answering questions on `irc <https://web.libera.chat/#salt>`__,
the `community Slack <https://join.slack.com/t/saltstackcommunity/shared_invite/zt-3av8jjyf-oBQ2M0vhXOhJpNpRkPWBvg>`__,
the `salt-users mailing
list <https://groups.google.com/forum/#!forum/salt-users>`__,
@ -507,8 +507,7 @@ your PR is submitted during the week you should be able to expect some
kind of communication within that business day. If your tests are
passing and we’re not in a code freeze, ideally your code will be merged
that day. If you haven’t heard from your assigned reviewer, ping them on
GitHub, `irc <https://webchat.freenode.net/#salt>`__, or Community
Slack.
GitHub, `irc <https://web.libera.chat/#salt>`__, or Community Slack.
It’s likely that your reviewer will leave some comments that need
addressing - it may be a style change, or you forgot a changelog entry,

2
README.rst
View file

@ -104,7 +104,7 @@ Also, check out some of our community resources including:
* `Salt Project Community Wiki <https://github.com/saltstack/community/wiki>`_
* `Salt Project Community Slack`_
* `Salt Project: IRC on Freenode <https://webchat.freenode.net/#salt>`_
* `Salt Project: IRC on LiberaChat <https://web.libera.chat/#salt>`_
* `Salt Project YouTube channel <https://www.youtube.com/channel/UCpveTIucFx9ljGelW63-BWg>`_
* `Salt Project Twitch channel <https://www.twitch.tv/saltprojectoss>`_

8
SUPPORT.rst
View file

@ -2,11 +2,11 @@ Get SaltStack Support and Help
==============================
**IRC Chat** - Join the vibrant, helpful and positive SaltStack chat room in
Freenode at #salt. There is no need to introduce yourself, or ask permission to
join in, just help and be helped! Make sure to wait for an answer, sometimes it
may take a few moments for someone to reply.
LiberaChat at #salt. There is no need to introduce yourself, or ask permission
to join in, just help and be helped! Make sure to wait for an answer, sometimes
it may take a few moments for someone to reply.
`<http://webchat.freenode.net/?channels=salt&uio=Mj10cnVlJjk9dHJ1ZSYxMD10cnVl83>`_
`<https://web.libera.chat/#salt>`_
**SaltStack Slack** - Alongside IRC is our SaltStack Community Slack for the
SaltStack Working groups. Use the following link to request an invitation.

2
doc/_incl/requisite_incl.rst
View file

@ -6,4 +6,4 @@ following the :ref:`installation` and the
There are many ways to :ref:`salt-community` including our
`mailing list <https://groups.google.com/forum/#!forum/salt-users>`_
and our `IRC channel <https://webchat.freenode.net/#salt>`_ #salt.
and our `IRC channel <https://web.libera.chat/#salt>`_ #salt.

2
doc/_themes/saltstack2/layout.html vendored
View file

@ -351,7 +351,7 @@
<li><a data-container="body" data-delay='{ "show": 500, "hide": 100 }' data-toggle="tooltip" data-placement="top" title="view the latest saltstack tweets" href="https://twitter.com/Salt_Project_OS" target="_blank"><img class="nolightbox" width="24" src="{{ pathto('_static/images/twitter.png', 1) }}" ></a></li>
<li><a data-container="body" data-delay='{ "show": 500, "hide": 100 }' data-toggle="tooltip" data-placement="top" title="subscribe to the salt users mailing list" href="https://groups.google.com/forum/#!forum/salt-users" target="_blank"><img class="nolightbox" width="24" src="{{ pathto('_static/images/email.png', 1) }}" ></a></li>
<li><a data-container="body" data-delay='{ "show": 500, "hide": 100 }' data-toggle="tooltip" data-placement="top" title="download saltstack code from github" href="https://github.com/saltstack/salt" target="_blank"><img class="nolightbox" width="24" src="{{ pathto('_static/images/github.png', 1) }}" ></a></li>
<li><a data-container="body" data-delay='{ "show": 500, "hide": 100 }' data-toggle="tooltip" data-placement="top" title="chat in #salt on freenode irc" href="https://webchat.freenode.net/#salt" target="_blank"><img class="nolightbox" width="24" src="{{ pathto('_static/images/messenger-generic.png', 1) }}" ></a></li>
<li><a data-container="body" data-delay='{ "show": 500, "hide": 100 }' data-toggle="tooltip" data-placement="top" title="chat in #salt on liberachat irc" href="https://web.libera.chat/#salt" target="_blank"><img class="nolightbox" width="24" src="{{ pathto('_static/images/messenger-generic.png', 1) }}" ></a></li>
<li><a data-container="body" data-delay='{ "show": 500, "hide": 100 }' data-toggle="tooltip" data-placement="top" title="/r/saltstack" href="http://www.reddit.com/r/saltstack/" target="_blank"><img class="nolightbox" width="24" src="{{ pathto('_static/images/reddit.png', 1) }}" ></a></li>
<li><a data-container="body" data-delay='{ "show": 500, "hide": 100 }' data-toggle="tooltip" data-placement="top" title="ask a saltstack question on stackoverflow" href="https://stackoverflow.com/questions/tagged/salt-stack+or+salt-cloud+or+salt-creation" target="_blank"><img class="nolightbox" width="24" src="{{ pathto('_static/images/stackoverflow.png', 1) }}" ></a></li>
<li><a data-container="body" data-delay='{ "show": 500, "hide": 100 }' data-toggle="tooltip" data-placement="top" title="join or start a saltstack meetup" href="http://www.meetup.com/find/?keywords=saltstack" target="_blank"><img class="nolightbox" width="24" src="{{ pathto('_static/images/meetup.png', 1) }}" ></a></li>

19
doc/man/salt.7
View file

@ -108,7 +108,7 @@ Also, check out some of our community resources including:
.IP \(bu 2
\fI\%Salt Project Community Slack\fP
.IP \(bu 2
\fI\%Salt Project: IRC on Freenode\fP
\fI\%Salt Project: IRC on LiberaChat\fP
.IP \(bu 2
\fI\%Salt Project YouTube channel\fP
.IP \(bu 2
@ -236,8 +236,8 @@ list which contains important updates about Salt, such as new releaes and
security\-related announcements. This list is low\-traffic.
.SS IRC
.sp
The \fB#salt\fP IRC channel is hosted on the popular \fI\%Freenode\fP network. You
can use the \fI\%Freenode webchat client\fP right from your browser. \fI\%Logs of the
The \fB#salt\fP IRC channel is hosted on the popular \fI\%LiberaChat\fP network. You
can use the \fI\%LiberaChat webchat client\fP right from your browser. \fI\%Logs of the
IRC channel activity\fP are also available.
.sp
If you wish to discuss the development of Salt itself join us in
@ -106770,7 +106770,7 @@ engines:
nick: <nick>
username: <username>
password: <password>
host: chat.freenode.net
host: irc.oftc.net
port: 7000
channels:
\- salt\-test
@ -106924,7 +106924,7 @@ IRC Bot for interacting with salt.
Nickname of the connected Bot.
.TP
.B host
irc server (example \- chat.freenode.net).
irc server (example \- irc.oftc.net).
.TP
.B port
irc port. Default: 6667
@ -456445,11 +456445,12 @@ The best way to create new Formula repositories for now is to create a
repository in your own account on GitHub and notify a SaltStack employee when
it is ready. We will add you to the Contributors team on the
\fI\%saltstack\-formulas\fP organization and help you transfer the repository over.
Ping a SaltStack employee on IRC (\fB#salt\fP on Freenode), join the
Ping a SaltStack employee on IRC (\fB#salt\fP on LiberaChat), join the
\fB#formulas\fP channel on the \fI\%salt\-slack\fP (bridged to \fB#saltstack\-formulas\fP
on Freenode) or send an email to the \fI\%salt\-users\fP mailing list. Note that the
IRC logs are available at \fI\%https://freenode.logbot.info/salt\fP and
\fI\%https://freenode.logbot.info/saltstack\-formulas\fP respectively.
on LiberaChat) or send an email to the \fI\%salt\-users\fP mailing list. Note that the
IRC logs are available at \fI\%http://ngxbot.nginx.org/logs/%23salt/\fP,
\fI\%https://freenode.logbot.info/saltstack\-formulas\fP, and
\fI\%http://ngxbot.nginx.org/logs/%23salt/\fP.
.sp
There are a lot of repositories in that organization! Team members can manage
which repositories they are subscribed to on GitHub\(aqs watching page:

10
doc/topics/development/conventions/formulas.rst
View file

@ -221,11 +221,12 @@ The best way to create new Formula repositories for now is to create a
repository in your own account on GitHub and notify a SaltStack employee when
it is ready. We will add you to the Contributors team on the
`saltstack-formulas`_ organization and help you transfer the repository over.
Ping a SaltStack employee on IRC (``#salt`` on Freenode), join the
Ping a SaltStack employee on IRC (`#salt`_ on LiberaChat), join the
``#formulas`` channel on the `salt-slack`_ (bridged to ``#saltstack-formulas``
on Freenode) or send an email to the `salt-users`_ mailing list. Note that the
IRC logs are available at https://freenode.logbot.info/salt and
https://freenode.logbot.info/saltstack-formulas respectively.
on LiberaChat) or send an email to the `salt-users`_ mailing list. Note that
IRC logs are available at https://freenode.logbot.info/salt,
https://freenode.logbot.info/saltstack-formulas, and
http://ngxbot.nginx.org/logs/%23salt/.
There are a lot of repositories in that organization! Team members can manage
which repositories they are subscribed to on GitHub's watching page:
@ -245,6 +246,7 @@ your pull request has stayed open for more than a couple days feel free to
"selfie-merge" your own pull request.
.. _`at-mention`: https://help.github.com/en/github/writing-on-github/basic-writing-and-formatting-syntax#mentioning-people-and-teams
.. _`#salt`: https://web.libera.chat/#salt
Style
-----

13
doc/topics/index.rst
View file

@ -122,16 +122,15 @@ security-related announcements. This list is low-traffic.
IRC
===
The ``#salt`` IRC channel is hosted on the popular `Freenode`_ network. You
can use the `Freenode webchat client`_ right from your browser. `Logs of the
The ``#salt`` IRC channel is hosted on the popular `LiberaChat`_ network. You
can use the `LiberaChat webchat client`_ right from your browser. `Logs of the
IRC channel activity`_ are also available.
.. _Freenode: http://freenode.net/irc_servers.shtml
.. _`Freenode webchat client`: https://webchat.freenode.net/#salt
.. _`Logs of the IRC channel activity`: https://freenode.logbot.info/salt/
.. _LiberaChat: https://libera.chat/
.. _`LiberaChat webchat client`: https://web.libera.chat/#salt
.. _`Logs of the IRC channel activity`: http://ngxbot.nginx.org/logs/%23salt/
If you wish to discuss the development of Salt itself join us in
``#salt-devel``.
If you wish to discuss the development of Salt itself join us in ``#salt-devel``.
Follow on Github

4
salt/engines/ircbot.py
View file

@ -12,7 +12,7 @@ Example Configuration
nick: <nick>
username: <username>
password: <password>
host: chat.freenode.net
host: irc.oftc.net
port: 7000
channels:
- salt-test
@ -287,7 +287,7 @@ def start(
Nickname of the connected Bot.
host
irc server (example - chat.freenode.net).
irc server (example - irc.oftc.net).
port
irc port. Default: 6667