docs: replace redmine links and enforce https on oisf urls

diff --git a/Makefile.am b/Makefile.am
index 078f0e2ed166b21b1d417781e363f9abab8dd13c..a980335174440ddb4e14084ce30c228d1df4d2da 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -55,5 +55,5 @@ endif
        @echo "'LD_LIBRARY_PATH="$(DESTDIR)$(prefix)/lib" "$(DESTDIR)$(bindir)/suricata" -c "$(DESTDIR)$(e_sysconfdir)/suricata.yaml" -i eth0'."
        @echo ""
        @echo "While rules are installed now, it's highly recommended to use a rule manager for maintaining rules."
-       @echo "The two most common are Oinkmaster and Pulledpork. For a guide see:"
-       @echo "https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Rule_Management_with_Oinkmaster"
+       @echo "The three most common are Suricata-Update, Oinkmaster and Pulledpork. For a guide see:"
+       @echo "https://suricata.readthedocs.io/en/latest/rule-management/index.html"

diff --git a/README.md b/README.md
index 9fc5d03a2256190fc05d60da19ea39f718bab551..8585034f8ee136ee8b366b2d258d5800720b32dd 100644 (file)
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Suricata_Instal
 User Guide
 ----------
 
-You can follow the [Suricata user guide](http://suricata.readthedocs.io/en/latest/) to get started.
+You can follow the [Suricata user guide](https://suricata.readthedocs.io/en/latest/) to get started.
 
 Our deprecated (but still useful) user guide is also [available](https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Suricata_User_Guide).
 

diff --git a/configure.ac b/configure.ac
index 5c51a9963cf1852bc2b64ed9b385fe8a52841922..6c3380ab711a94ccda8478adbe2f0fd2ffb316b8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1132,7 +1132,7 @@
             fi
 
             # see if we have the patched libnet 1.1
-            # http://www.inliniac.net/blog/2007/10/16/libnet-11-ipv6-fixes-and-additions.html
+            # https://www.inliniac.net/blog/2007/10/16/libnet-11-ipv6-fixes-and-additions.html
             #
             # To prevent duping the lib link we reset LIBS after this check. Setting action-if-found to NULL doesn't seem to work
             # see: http://blog.flameeyes.eu/2008/04/29/i-consider-ac_check_lib-harmful

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

diff --git a/doc/INSTALL b/doc/INSTALL
index cb7f513c3d3049aa7545595f7003e290d9420eb4..f89f23e91c03df29327bb96d67fb36bf7638a441 100644 (file)
--- a/doc/INSTALL
+++ b/doc/INSTALL
@@ -2,7 +2,7 @@ About
 =====
 Suricata is a multi-threaded intrusion detection/prevention engine.
 engine available from the Open Information Security Foundation 
-(http://www.openinfosecfoundation.org).
+(https://www.openinfosecfoundation.org).
 
 Suricata and the HTP library are licensed under the GPLv2. A copy of this
 license is available in this tarball, or at:

diff --git a/doc/INSTALL.PF_RING b/doc/INSTALL.PF_RING
index 3c7fe732b80871f78e7c43fe514a789bc73c3e43..a5ce8c81b92afa08b8b00d7a7e311911862aed5f 100644 (file)
--- a/doc/INSTALL.PF_RING
+++ b/doc/INSTALL.PF_RING
@@ -124,7 +124,7 @@ cd oisfnew
 ./configure --enable-pfring --with-libpfring-libraries=/opt/PF_RING/lib --with-libpfring-includes=/opt/PF_RING/include --with-libpcap-libraries=/opt/PF_RING/lib --with-libpcap-includes=/opt/PF_RING/include LD_RUN_PATH="/opt/PF_RING/lib:/usr/lib:/usr/local/lib" --prefix=/opt/PF_RING/
 make && make install
 
-#Make config and log directories for a more complete getting started see http://www.inliniac.net/blog/2010/05/10/setting-up-suricata-0-9-0-for-initial-use-on-ubuntu-lucid-10-04.html
+#Make config and log directories for a more complete getting started see https://www.inliniac.net/blog/2010/05/10/setting-up-suricata-0-9-0-for-initial-use-on-ubuntu-lucid-10-04.html
 mkdir /etc/suricata
 cp suricata.yaml /etc/suricata/
 cp classification.config /etc/suricata/

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

diff --git a/doc/Setting_up_IPSinline_for_Linux.txt b/doc/Setting_up_IPSinline_for_Linux.txt
index 68eaceaccea5da53265892df8e90a696d4b9936a..f499a8994c782de2e13a46df20ea8b75d1f52d7d 100644 (file)
--- a/doc/Setting_up_IPSinline_for_Linux.txt
+++ b/doc/Setting_up_IPSinline_for_Linux.txt
@@ -1,5 +1,5 @@
 Autogenerated on 2012-11-29
-from - https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Setting_up_IPSinline_for_Linux
+from - https://suricata.readthedocs.io/en/latest/setting-up-ipsinline-for-linux.html
 
 
 Setting up IPS/inline for Linux

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

diff --git a/doc/userguide/capture-hardware/myricom.rst b/doc/userguide/capture-hardware/myricom.rst
index 680e2fb85ca28134f55d1d299e8e16beb5fbfd70..c6fd03245d619af4d93cabed00c861836f30fd7a 100644 (file)
--- a/doc/userguide/capture-hardware/myricom.rst
+++ b/doc/userguide/capture-hardware/myricom.rst
@@ -1,7 +1,7 @@
 Myricom
 =======
 
-From: http://blog.inliniac.net/2012/07/10/suricata-on-myricom-capture-cards/
+From: https://blog.inliniac.net/2012/07/10/suricata-on-myricom-capture-cards/
 
 In this guide I’ll describe using the Myricom libpcap support. I’m going to assume you installed the card properly, installed the Sniffer driver and made sure that all works. Make sure that in your dmesg you see that the card is in sniffer mode:
 

diff --git a/doc/userguide/rule-management/suricata-update.rst b/doc/userguide/rule-management/suricata-update.rst
index bd4e496b47d5a19de7c30ee97fad6b93983b8a00..13e055a6843dc8dc73546c766a06ddf08090d6bc 100644 (file)
--- a/doc/userguide/rule-management/suricata-update.rst
+++ b/doc/userguide/rule-management/suricata-update.rst
@@ -114,4 +114,4 @@ Finally restart Suricata.
 Further reading
 ~~~~~~~~~~~~~~~
 
-See http://suricata-update.readthedocs.io/en/latest/
+See https://suricata-update.readthedocs.io/en/latest/

diff --git a/doc/userguide/rules/differences-from-snort.rst b/doc/userguide/rules/differences-from-snort.rst
index 2b1c41f7a44a4115f41ccf3436290de5c7bc866c..af3dd6dd570c5f58b0678e427cebfa6a3ca93450 100644 (file)
--- a/doc/userguide/rules/differences-from-snort.rst
+++ b/doc/userguide/rules/differences-from-snort.rst
@@ -387,7 +387,7 @@ IP Reputation and ``iprep`` Keyword
 -  :doc:`../reputation/ipreputation/ip-reputation-config`
 -  :doc:`ip-reputation-rules`
 -  :doc:`../reputation/ipreputation/ip-reputation-format`
--  `http://blog.inliniac.net/2012/11/21/ip-reputation-in-suricata/ <http://blog.inliniac.net/2012/11/21/ip-reputation-in-suricata/>`_
+-  `https://blog.inliniac.net/2012/11/21/ip-reputation-in-suricata/ <https://blog.inliniac.net/2012/11/21/ip-reputation-in-suricata/>`_
 
 Flowbits
 --------
@@ -482,8 +482,8 @@ File Extraction
 
 -  :doc:`file-keywords`
 -  :doc:`../file-extraction/file-extraction`
--  `http://blog.inliniac.net/2011/11/29/file-extraction-in-suricata/ <http://blog.inliniac.net/2011/11/29/file-extraction-in-suricata/>`_
--  `http://blog.inliniac.net/2014/11/11/smtp-file-extraction-in-suricata/ <http://blog.inliniac.net/2014/11/11/smtp-file-extraction-in-suricata/>`_
+-  `https://blog.inliniac.net/2011/11/29/file-extraction-in-suricata/ <https://blog.inliniac.net/2011/11/29/file-extraction-in-suricata/>`_
+-  `https://blog.inliniac.net/2014/11/11/smtp-file-extraction-in-suricata/ <https://blog.inliniac.net/2014/11/11/smtp-file-extraction-in-suricata/>`_
 
 Lua Scripting
 -------------

diff --git a/doc/userguide/rules/file-keywords.rst b/doc/userguide/rules/file-keywords.rst
index c59740186d50524ece1dc025931fb65684e4e87c..f6d9258630a39466344157916682beed1b7cf74c 100644 (file)
--- a/doc/userguide/rules/file-keywords.rst
+++ b/doc/userguide/rules/file-keywords.rst
@@ -113,7 +113,7 @@ Just MD5's are good as well::
 
 Each MD5 uses 16 bytes of memory. 20 Million MD5's use about 310 MiB of memory.
 
-See also: http://blog.inliniac.net/2012/06/09/suricata-md5-blacklisting/
+See also: https://blog.inliniac.net/2012/06/09/suricata-md5-blacklisting/
 
 filesha1
 --------

diff --git a/doc/userguide/rules/http-keywords.rst b/doc/userguide/rules/http-keywords.rst
index 56ba0200950ff04247e129c401655d5bb7a9fc2c..e7fdae68a86ada5206bdc851fe0ca255b339ef26 100644 (file)
--- a/doc/userguide/rules/http-keywords.rst
+++ b/doc/userguide/rules/http-keywords.rst
@@ -265,7 +265,7 @@ modifiers, like ``depth``, ``distance``, ``offset``, ``nocase`` and
 
     **Note**: the header buffer is *normalized*. Any trailing
     whitespace and tab characters are removed. See:
-    http://lists.openinfosecfoundation.org/pipermail/oisf-users/2011-October/000935.html.
+    https://lists.openinfosecfoundation.org/pipermail/oisf-users/2011-October/000935.html.
     To avoid that, use the ``http_raw_header`` keyword.
 
 Example of a header in a HTTP request:
@@ -353,7 +353,7 @@ Notes
    comes to performance than using the ``http_header`` buffer (~10%
    better).
 
--  `http://blog.inliniac.net/2012/07/09/suricata-http\_user\_agent-vs-http\_header/ <http://blog.inliniac.net/2012/07/09/suricata-http_user_agent-vs-http_header/>`_
+-  `https://blog.inliniac.net/2012/07/09/suricata-http\_user\_agent-vs-http\_header/ <https://blog.inliniac.net/2012/07/09/suricata-http_user_agent-vs-http_header/>`_
 
 http_accept
 -----------

diff --git a/src/detect-filemagic.c b/src/detect-filemagic.c
index 09d19bb3bac51bbe042f183cc69362411a28581f..205156c4ea187cb8644bbcc8c1f76dc1ba2d7650 100644 (file)
--- a/src/detect-filemagic.c
+++ b/src/detect-filemagic.c
@@ -69,7 +69,7 @@ void DetectFilemagicRegister(void)
 {
     sigmatch_table[DETECT_FILEMAGIC].name = "filemagic";
     sigmatch_table[DETECT_FILEMAGIC].desc = "match on the information libmagic returns about a file";
-    sigmatch_table[DETECT_FILEMAGIC].url = "https://redmine.openinfosecfoundation.org/projects/suricata/wiki/File-keywords#filemagic";
+    sigmatch_table[DETECT_FILEMAGIC].url = "https://suricata.readthedocs.io/en/latest/rules/file-keywords.html#filemagic";
     sigmatch_table[DETECT_FILEMAGIC].Setup = DetectFilemagicSetupNoSupport;
     sigmatch_table[DETECT_FILEMAGIC].flags = SIGMATCH_QUOTES_MANDATORY|SIGMATCH_HANDLE_NEGATION;
 }

diff --git a/src/detect-lua.c b/src/detect-lua.c
index 1e3c4c6c7cc014162c079e9a062d0ccd161bb7b9..487ade7f4ec2c1c12c7f51012bf43a7bf6c2b8c7 100644 (file)
--- a/src/detect-lua.c
+++ b/src/detect-lua.c
@@ -112,7 +112,7 @@ void DetectLuaRegister(void)
     sigmatch_table[DETECT_LUA].name = "lua";
     sigmatch_table[DETECT_LUA].alias = "luajit";
     sigmatch_table[DETECT_LUA].desc = "match via a lua script";
-    sigmatch_table[DETECT_LUA].url = "https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Lua_scripting";
+    sigmatch_table[DETECT_LUA].url = "https://suricata.readthedocs.io/en/latest/rules/rule-lua-scripting.html";
     sigmatch_table[DETECT_LUA].Match = DetectLuaMatch;
     sigmatch_table[DETECT_LUA].AppLayerTxMatch = DetectLuaAppTxMatch;
     sigmatch_table[DETECT_LUA].Setup = DetectLuaSetup;

diff --git a/src/suricata.h b/src/suricata.h
index 4a5ffdafc825e92427d89320b248bc4037933a29..99e48aacadfae19c7c697bba63a9eb3c5e766665 100644 (file)
--- a/src/suricata.h
+++ b/src/suricata.h
@@ -83,7 +83,7 @@
 #define DEFAULT_PID_BASENAME "suricata.pid"
 #define DEFAULT_PID_FILENAME DEFAULT_PID_DIR DEFAULT_PID_BASENAME
 
-#define DOC_URL "http://suricata.readthedocs.io/en/"
+#define DOC_URL "https://suricata.readthedocs.io/en/"
 
 #if defined RELEASE
 #define DOC_VERSION PROG_VER

diff --git a/suricata.yaml.in b/suricata.yaml.in
index 5d2498a33c4126b2a6aebd9ae777c45683a78c9d..6d6f6b5b1362a2ce87be71cb0daae905bebdb639 100644 (file)
--- a/suricata.yaml.in
+++ b/suricata.yaml.in
@@ -3,7 +3,7 @@
 
 # Suricata configuration file. In addition to the comments describing all
 # options in this file, full documentation can be found at:
-# https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Suricatayaml
+# https://suricata.readthedocs.io/en/latest/configuration/suricata-yaml.html
 
 ##
 ## Step 1: inform Suricata about your network
@@ -546,7 +546,7 @@ outputs:
   # Lua Output Support - execute lua script to generate alert and event
   # output.
   # Documented at:
-  # https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Lua_Output
+  # https://suricata.readthedocs.io/en/latest/output/lua-output.html
   - lua:
       enabled: no
       #scripts-dir: /etc/suricata/lua-output/

diff --git a/threshold.config b/threshold.config
index 9f498bffe1d89a45b70c2001c69c94d53b49cd4b..bde364fd036621830ab0694b8ca5de1185b78f6f 100644 (file)
--- a/threshold.config
+++ b/threshold.config
@@ -26,7 +26,7 @@
 #threshold gen_id 1, sig_id 2404000, type threshold, track by_dst, count 1, seconds 10
 
 # Avoid to alert on f-secure update
-# Example taken from http://blog.inliniac.net/2012/03/07/f-secure-av-updates-and-suricata-ips/
+# Example taken from https://blog.inliniac.net/2012/03/07/f-secure-av-updates-and-suricata-ips/
 #suppress gen_id 1, sig_id 2009557, track by_src, ip 217.110.97.128/25
 #suppress gen_id 1, sig_id 2012086, track by_src, ip 217.110.97.128/25
 #suppress gen_id 1, sig_id 2003614, track by_src, ip 217.110.97.128/25