Skip to content

Commit

Permalink
irc to discord
Browse files Browse the repository at this point in the history
  • Loading branch information
StevenVanAcker committed May 11, 2020
1 parent 4acf5ae commit 79177aa
Show file tree
Hide file tree
Showing 12 changed files with 38 additions and 43 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

The wargames offered by the OverTheWire community can help you to learn and practice security concepts in the form of fun-filled games.

If you have a problem, a question or a suggestion, you can join us on [IRC](http://overthewire.org/information/irc.html).
If you have a problem, a question or a suggestion, you can join us via [chat](http://overthewire.org/information/chat.html).

**!!! Do not file issues for game-related questions. This repository is for the website only !!!**

Expand Down
2 changes: 1 addition & 1 deletion _includes/information.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div id="sidemenu">
<ul>
{% include menu_item.html link="/information/donate.html" name="Donate!" %}
{% include menu_item.html link="/information/irc.html" name="Contact&nbsp;via&nbsp;IRC" %}
{% include menu_item.html link="/information/chat.html" name="Contact&nbsp;via&nbsp;Chat" %}
{% include menu_item.html link="/information/website.html" name="Edit website" %}
{% include menu_item.html link="/information/wechall.html" name="WeChall&nbsp;Scoreboard" %}

Expand Down
2 changes: 1 addition & 1 deletion _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@

<div id="shortcuts">
<a href="/information/donate.html"><div class="button">Donate!</div></a>
<a href="/information/irc.html"><div class="button">Help!?</div></a>
<a href="/information/chat.html"><div class="button">Help!?</div></a>
</div>

<script type="text/javascript">
Expand Down
49 changes: 21 additions & 28 deletions information/irc.md → information/chat.md
Original file line number Diff line number Diff line change
@@ -1,49 +1,42 @@
---
layout: default
listinformation: true
title: Contact via IRC
title: Contact via chat
---

Contact via IRC
===============
General chat rules
==================

If you have a problem, a question, a suggestion, or just want to hang
out with us, you can join us on our IRC servers:
If you don't know [how to use IRC][], use google to find out.
- **No spoilers** in chat
- Tell us the **game and level**, nothing more (salutations are accepted)
- **Be patient**, someone will offer you a PM

Encrypted IRC:
Host: ircs.overthewire.org
Port: 6697 (with SSL)
NOTE: You might want to read this [article] before asking for help :)

Non-encrypted IRC:
Host: irc.overthewire.org
Port: 6667
Discord
=======

You can find our Discord server at https://discord.gg/GtxAcrT

Channels:
#wargames (for talk related to the games)
#warzone (for talk related to the warzone)
#social (for general talk)

Please be aware of our rules! When you first connect, you will be reminded of them.

NOTE: You might want to read this [article] before asking for help :)
IRC
===

**Warning:**
--------------------
- **No spoilers** in #wargames
- Tell us the **game and level**, nothing more (salutations are accepted)
- **Be patient**, someone will offer you a PM


Web-based IRC client
--------------------

If you don't have access to an IRC client, you can use the web-based IRC client.

**Be aware that leaving this page will disconnect you from the chat!**
If you don't know [how to use IRC][], use google to find out.

Encrypted IRC:
Host: ircs.overthewire.org
Port: 6697 (with SSL)

<iframe id="ircframe" src="https://kiwiirc.com/client/irc.overthewire.org/?nick=WebVisitor?&theme=cli#wargames">
</iframe>
Non-encrypted IRC:
Host: irc.overthewire.org
Port: 6667

[how to use IRC]: https://en.wikipedia.org/wiki/Wikipedia:IRC/Tutorial
[article]: http://catb.org/~esr/faqs/smart-questions.html
2 changes: 1 addition & 1 deletion information/donate.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@ Huge Thanks to Our Patrons

{% include patreonlist.md %}

[contact us]: /information/irc.html
[contact us]: /information/chat.html

2 changes: 2 additions & 0 deletions information/news.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ title: News
News
====

**The news section of this site is no longer maintained**

2019-01-06 Happy newyear!! Advent Bonanza CTF in the warzone
------------------------------------------------------------

Expand Down
4 changes: 2 additions & 2 deletions information/staff.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ money maintaining the infrastructure and creating new games.
- Steven "Steven" Van Acker
- morla

If you need to, you may [contact us through IRC].
If you need to, you may [contact us through chat].

[contact us through IRC]: /information/irc.html
[contact us through chat]: /information/chat.html
4 changes: 2 additions & 2 deletions wargames/bandit/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ continue:
cd
- Also, your favorite **search-engine** is your friend. Learn how to
use it! I recommend [Google][].
- Lastly, if you are still stuck, you can [join us on IRC][]
- Lastly, if you are still stuck, you can [join us via chat][]

You're ready to start! Begin with [Level 0][], linked at the left of
this page. Good luck!
Expand All @@ -53,4 +53,4 @@ this page. Good luck!
[Level 0]: /wargames/bandit/bandit0.html
[man page]: http://en.wikipedia.org/wiki/Man_page
[Google]: http://www.google.com
[join us on IRC]: /information/irc.html
[join us via chat]: /information/chat.html
3 changes: 1 addition & 2 deletions wargames/drifter/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ Drifter
{% include beginNote.html title="2014-12-29 - online with a caveat" %}

Drifter is online but individual levels are untested and may have unintended
bugs. If you encounter these unintended bugs, let me know (Steven on
ircs://ircs.overthewire.org channel #wargames).
bugs. If you encounter these unintended bugs, let us know via chat.

{% include endNote.html %}

Expand Down
4 changes: 2 additions & 2 deletions wargames/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Wargames
The wargames offered by the OverTheWire community can help you to learn and practice security concepts in the form of fun-filled games.<br/>
To find out more about a certain wargame, just visit its page linked from the menu on the left.

If you have a problem, a question or a suggestion, you can [join us on IRC][contactus].
If you have a problem, a question or a suggestion, you can [join us via chat][contactus].

Suggested order to play the games in
------------------------------------
Expand All @@ -28,4 +28,4 @@ Each shell game has its own SSH port
Information about how to connect to each game using SSH, is provided in the top left corner of the page.
Keep in mind that every game uses a different SSH port.

[contactus]: /information/irc.html
[contactus]: /information/chat.html
4 changes: 2 additions & 2 deletions wargames/semtex/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Semtex
{% include beginNote.html title="2012-04-18 - some semtex levels verified" %}
The semtex wargame has been migrated to a new server. Because of this
move, some levels might no longer work as intended. If you run into
trouble, [contact us on IRC][].
trouble, [contact us via chat][].

We have verified that level 0 up to and including 4 work fine.

Expand Down Expand Up @@ -44,5 +44,5 @@ combinatorial analysis.**

**Contact : [aton at packetdropped dot org][]**

[contact us on IRC]: /information/irc.html
[contact us via chat]: /information/chat.html
[aton at packetdropped dot org]: mailto:[email protected]
3 changes: 2 additions & 1 deletion warzone/tsutomu.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ now hosted on the warzone too.
After connecting to the warzone, tsutomu can be found at <http://172.30.30.30>.

To avoid interfering with others working on tsutomu, you may find it helpful to
coordinate in the #warzone channel on our IRC server.
coordinate in the #warzone channel on our [chat].

[Tsutomu Shimomura]: https://en.wikipedia.org/wiki/Tsutomu_Shimomura
[Kevin Mitnick]: https://en.wikipedia.org/wiki/Kevin_Mitnick
Expand All @@ -51,4 +51,5 @@ coordinate in the #warzone channel on our IRC server.
[RFC 1984]: https://tools.ietf.org/html/rfc1948
[Takedown]: https://www.imdb.com/title/tt0159784/
[OverTheWire Advent Bonanza 2018 CTF]: /warzone/advent2018
[chat]: /information/chat.html

0 comments on commit 79177aa

Please sign in to comment.