transversal: backport: replace remaining website references

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index a519959d10ecb7cfaa6696cf8d59cfd811805f14..d0dd2d23ce1765e22c458f84be4ad99decd62cde 100644 (file)
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -8,7 +8,7 @@ Contribution Agreement
 
 Before accepting your pull requests we need you or your organization to sign our contribution agreement.
 
-We do this to keep the ownership of Suricata in one hand: the Open Information Security Foundation. See https://suricata-ids.org/about/open-source/ and https://suricata-ids.org/about/contribution-agreement/
+We do this to keep the ownership of Suricata in one hand: the Open Information Security Foundation. See https://suricata.io/features/open-source/ and https://suricata.io/our-story/contribution-agreement/
 
 Contribution Process
 --------------------
@@ -34,5 +34,5 @@ On a high level, the steps are:
 Questions
 ---------
 
-If you have questions about contributing, please contact us via https://suricata-ids.org/support/
+If you have questions about contributing, please contact us via https://suricata.io/community/
 

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 7a203af6a64138f2cbbb07416150e03b05757e61..3ad93e422dda0b2f102a87921fac972d0568f64b 100644 (file)
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,7 +1,7 @@
 Make sure these boxes are signed before submitting your Pull Request -- thank you.
 
 - [ ] I have read the contributing guide lines at https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Contributing
-- [ ] I have signed the Open Information Security Foundation contribution agreement at https://suricata-ids.org/about/contribution-agreement/
+- [ ] I have signed the Open Information Security Foundation contribution agreement at https://suricata.io/our-story/contribution-agreement/
 - [ ] I have updated the user guide (in doc/userguide/) to reflect the changes made (if applicable)
 
 Link to [redmine](https://redmine.openinfosecfoundation.org/projects/suricata/issues) ticket:

diff --git a/README.md b/README.md
index b3c8972b9d7c98a3c0a676152176dcd00f255895..5f7244d9d8bd9683396a28be3ce4fba580c8449e 100644 (file)
--- a/README.md
+++ b/README.md
@@ -114,4 +114,4 @@ A: If you really think it is, we can discuss how to improve it. But don't come t
 
 __Q: do you require signing of a contributor license agreement?__
 
-A: Yes, we do this to keep the ownership of Suricata in one hand: the Open Information Security Foundation. See http://suricata-ids.org/about/open-source/ and http://suricata-ids.org/about/contribution-agreement/
+A: Yes, we do this to keep the ownership of Suricata in one hand: the Open Information Security Foundation. See https://suricata.io/features/open-source/ and https://suricata.io/our-story/contribution-agreement/

diff --git a/doc/AUTHORS b/doc/AUTHORS
index a36d5e4657358494d3038104946deb8892ce6982..92082f925800027e560b2e84a0135dcfb0014835 100644 (file)
--- a/doc/AUTHORS
+++ b/doc/AUTHORS
@@ -1,5 +1,5 @@
 Team:
-https://suricata-ids.org/about/team/
+https://suricata.io/our-story/team/
 
 All contributors:
 https://www.ohloh.net/p/suricata-engine/contributors/summary

diff --git a/doc/NEWS b/doc/NEWS
index 84f7d024fa0a84b381b945daa21f625e20e4afd5..cee835fe1d02a6c3bbc64a35b5fad0f7ef1ebaef 100644 (file)
--- a/doc/NEWS
+++ b/doc/NEWS
@@ -1 +1 @@
-https://suricata-ids.org/news/
+https://suricata.io/news/

diff --git a/doc/TODO b/doc/TODO
index b6fdf2e17471508c578dc0ce424948a1c43fcade..e524ceaf581437e38336bde28acdb9273747a214 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,3 +1,3 @@
 Plenty, and you're welcome to help!
 
-https://suricata-ids.org/participate/
+https://suricata.io/join-our-community/

diff --git a/doc/userguide/configuration/suricata-yaml.rst b/doc/userguide/configuration/suricata-yaml.rst
index 44caf8b48d3b16f26fd5e811b5198616d5671ecd..ab4f9a29efedcbf456afec2092b4f391411c6d8d 100644 (file)
--- a/doc/userguide/configuration/suricata-yaml.rst
+++ b/doc/userguide/configuration/suricata-yaml.rst
@@ -2452,4 +2452,4 @@ States are allocated as follows: for each detect script a state is used per
 detect thread. For each output script, a single state is used. Keep in
 mind that a rule reload temporary doubles the states requirement.
 
-.. _deprecation policy: https://suricata-ids.org/about/deprecation-policy/
+.. _deprecation policy: https://suricata.io/our-story/deprecation-policy/

diff --git a/doc/userguide/manpages/suricata.rst b/doc/userguide/manpages/suricata.rst
index fe4a0fd1f2e0581db17ae2fb4e5029990103e088..239d7f9ee2f51d47305408f3d0c4fbf2e5e08010 100644 (file)
--- a/doc/userguide/manpages/suricata.rst
+++ b/doc/userguide/manpages/suricata.rst
@@ -84,8 +84,8 @@ NOTES
 
 * Suricata Home Page
 
-    https://suricata-ids.org/
+    https://suricata.io/
 
 * Suricata Support Page
 
-    https://suricata-ids.org/support/
+    https://suricata.io/community/

diff --git a/doc/userguide/manpages/suricatactl-filestore.rst b/doc/userguide/manpages/suricatactl-filestore.rst
index 0fa0b7af98471828c4e4f609577e5fcd61e9e8bb..f16010ec0f468f3f647cdfb6ed40fe847d213fa5 100644 (file)
--- a/doc/userguide/manpages/suricatactl-filestore.rst
+++ b/doc/userguide/manpages/suricatactl-filestore.rst
@@ -60,8 +60,8 @@ NOTES
 
 * Suricata Home Page
 
-    https://suricata-ids.org/
+    https://suricata.io/
 
 * Suricata Support Page
 
-    https://suricata-ids.org/support/
+    https://suricata.io/community/

diff --git a/doc/userguide/manpages/suricatactl.rst b/doc/userguide/manpages/suricatactl.rst
index ebaefe6007e269b56a9236c022ed7e8e5ac300e1..ac8681b205758588eb90a540d999b6c4e14a80f4 100644 (file)
--- a/doc/userguide/manpages/suricatactl.rst
+++ b/doc/userguide/manpages/suricatactl.rst
@@ -36,8 +36,8 @@ NOTES
 
 * Suricata Home Page
 
-    https://suricata-ids.org/
+    https://suricata.io/
 
 * Suricata Support Page
 
-    https://suricata-ids.org/support/
+    https://suricata.io/community/

diff --git a/doc/userguide/manpages/suricatasc.rst b/doc/userguide/manpages/suricatasc.rst
index eef7932f72f9eea4d18bc11e64f591acf326567e..186a7d989e24123aeae2a2ea9f262f84005207a4 100644 (file)
--- a/doc/userguide/manpages/suricatasc.rst
+++ b/doc/userguide/manpages/suricatasc.rst
@@ -33,8 +33,8 @@ NOTES
 
 * Suricata Home Page
 
-    https://suricata-ids.org/
+    https://suricata.io/
 
 * Suricata Support Page
 
-    https://suricata-ids.org/support/
+    https://suricata.io/community/

diff --git a/doc/userguide/performance/analysis.rst b/doc/userguide/performance/analysis.rst
index 28886f271f5906237e32f841c784038875c116f6..d0731a1f42e22041fde2359b80478845059e7591 100644 (file)
--- a/doc/userguide/performance/analysis.rst
+++ b/doc/userguide/performance/analysis.rst
@@ -118,7 +118,7 @@ https://en.wikipedia.org/wiki/IEEE_802.1ad) most implementations only add
 inner one has different VLAN tags it will still end up in the same queue in
 **cluster_qm** mode. This was observed with the i40e driver up to 2.8.20 and
 the firmare version up to 7.00, feel free to report if newer versions have
-fixed this (see https://suricata-ids.org/support/).
+fixed this (see https://suricata.io/community/).
 
 
 If you want to use **tshark** to get an overview of the traffic direction use
@@ -172,7 +172,7 @@ fair amount of load should still be seen. If the load is still very high and
 drops are seen and the hardware should be capable to deal with such traffic
 loads you should deep dive if there is any specific traffic issue (see above)
 or report the performance issue so it can be investigated (see
-https://suricata-ids.org/support/).
+https://suricata.io/community/).
 
 Suricata also provides several specific traffic related signatures in the rules
 folder that could be enabled for testing to spot specific traffic issues. Those

diff --git a/doc/userguide/rules/bypass-keyword.rst b/doc/userguide/rules/bypass-keyword.rst
index 787fe42361734de9c4e714cb99a65a8311f1cbec..070459de42e6bf08f7a131747d4310700e441446 100644 (file)
--- a/doc/userguide/rules/bypass-keyword.rst
+++ b/doc/userguide/rules/bypass-keyword.rst
@@ -15,5 +15,5 @@ Bypass a flow on matching http traffic.
 
 Example::
 
-  alert http any any -> any any (content:"suricata-ids.org"; \
+  alert http any any -> any any (content:"suricata.io"; \
       http_host; bypass; sid:10001; rev:1;)

diff --git a/doc/userguide/upgrade.rst b/doc/userguide/upgrade.rst
index bde23a853b93d5838c42529c1a7d094fedab8431..b7ee28ac22b47c6bc97ec797d6695431ee0e0680 100644 (file)
--- a/doc/userguide/upgrade.rst
+++ b/doc/userguide/upgrade.rst
@@ -81,4 +81,4 @@ Removals
 - ``file-log``, the non-EVE JSON file log. Use EVE.files instead.
 - ``drop-log``, the non-EVE JSON drop log.
 
-See https://suricata-ids.org/about/deprecation-policy/
+See https://suricata.io/our-story/deprecation-policy/

diff --git a/python/setup.py b/python/setup.py
index 7e644419147b137a7849fca88e94ffd2bf2da5de..2ee483b83e5cfd021ac16c64e18d9b43e3be641d 100644 (file)
--- a/python/setup.py
+++ b/python/setup.py
@@ -47,7 +47,7 @@ setup(
     version=version,
     author='OISF Developers, Eric Leblond',
     author_email='oisf-devel@lists.openinfosecfoundation.org, eric@regit.org',
-    url='https://www.suricata-ids.org/',
+    url='https://www.suricata.io/',
     packages=[
         "suricata",
         "suricata.config",