diff --git a/.github/workflows/ci-irctest.yml b/.github/workflows/ci-irctest.yml index 59f583e50..c05a26462 100644 --- a/.github/workflows/ci-irctest.yml +++ b/.github/workflows/ci-irctest.yml @@ -40,6 +40,11 @@ jobs: CXXFLAGS: -DINSPIRCD_UNLIMITED_MAINLOOP run: make install --jobs $(($(getconf _NPROCESSORS_ONLN) + 1)) + - name: Work around an issue with irctest + env: + CXXFLAGS: -DINSPIRCD_UNLIMITED_MAINLOOP + run: cp ~/.local/conf/examples/help.example.conf ~/.local/conf/examples/help.conf.example + - name: Make artifact tarball run: |- cd ~ diff --git a/docs/conf/codepages/ascii.conf.example b/docs/conf/codepages/ascii.example.conf similarity index 100% rename from docs/conf/codepages/ascii.conf.example rename to docs/conf/codepages/ascii.example.conf diff --git a/docs/conf/codepages/iso-8859-1.conf.example b/docs/conf/codepages/iso-8859-1.example.conf similarity index 97% rename from docs/conf/codepages/iso-8859-1.conf.example rename to docs/conf/codepages/iso-8859-1.example.conf index a5217cf73..a9943878b 100644 --- a/docs/conf/codepages/iso-8859-1.conf.example +++ b/docs/conf/codepages/iso-8859-1.example.conf @@ -39,4 +39,4 @@ # þ => Þ # Include the ASCII rules to avoid duplication. - + diff --git a/docs/conf/codepages/iso-8859-2.conf.example b/docs/conf/codepages/iso-8859-2.example.conf similarity index 97% rename from docs/conf/codepages/iso-8859-2.conf.example rename to docs/conf/codepages/iso-8859-2.example.conf index 61dd78230..9b5457456 100644 --- a/docs/conf/codepages/iso-8859-2.conf.example +++ b/docs/conf/codepages/iso-8859-2.example.conf @@ -57,4 +57,4 @@ # ţ => Ţ # Include the ASCII rules to avoid duplication. - + diff --git a/docs/conf/codepages/rfc1459.conf.example b/docs/conf/codepages/rfc1459.example.conf similarity index 100% rename from docs/conf/codepages/rfc1459.conf.example rename to docs/conf/codepages/rfc1459.example.conf diff --git a/docs/conf/codepages/strict-rfc1459.conf.example b/docs/conf/codepages/strict-rfc1459.example.conf similarity index 100% rename from docs/conf/codepages/strict-rfc1459.conf.example rename to docs/conf/codepages/strict-rfc1459.example.conf diff --git a/docs/conf/filter.conf.example b/docs/conf/filter.example.conf similarity index 100% rename from docs/conf/filter.conf.example rename to docs/conf/filter.example.conf diff --git a/docs/conf/help.conf.example b/docs/conf/help.example.conf similarity index 100% rename from docs/conf/help.conf.example rename to docs/conf/help.example.conf diff --git a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.example.conf similarity index 99% rename from docs/conf/inspircd.conf.example rename to docs/conf/inspircd.example.conf index e54596785..4e49c960e 100644 --- a/docs/conf/inspircd.conf.example +++ b/docs/conf/inspircd.example.conf @@ -227,7 +227,7 @@ # can be done by using # # To enable IRCCloud on your network uncomment this: -# +# # A connect class with set denies connections from the specified host/IP range. +# #-#-#-#-#-#-#-#-#-#- MISCELLANEOUS CONFIGURATION -#-#-#-#-#-#-#-#-#-# # # @@ -495,7 +495,7 @@ # # motd - displayed on connect and when a user executes /MOTD # Modules can also define their own files - + # Example of an executable file include. Note this will be read on rehash, # not when the command is run. @@ -703,7 +703,7 @@ # - topiclock Channel mode +t - limits changing the topic to (half)ops # You can also configure this on a per-channel basis with a channel mode and # even negate the configured exemptions below. - # See exemptchanops in modules.conf.example for more details. + # See exemptchanops in modules.example.conf for more details. exemptchanops="filter:o nickflood:o nonick:v regmoderated:o" # invitebypassmodes: This allows /INVITE to bypass other channel modes. @@ -1037,7 +1037,7 @@ # provide almost all the features of InspIRCd. :) # # # # The default does nothing -- we include it for simplicity for you. # -# +# #-#-#-#-#-#-#-#-#-#-#-# SERVICES CONFIGURATION #-#-#-#-#-#-#-#-#-#-#-# # # @@ -1046,13 +1046,13 @@ # exemptions for services pseudoclients: # # # Anope users should uncomment this: -# +# # # Atheme users should uncomment this: -# +# # # Users of other services should uncomment this: -# +# ######################################################################### # # diff --git a/docs/conf/links.conf.example b/docs/conf/links.example.conf similarity index 97% rename from docs/conf/links.conf.example rename to docs/conf/links.example.conf index 0694a261b..78eb9f4ac 100644 --- a/docs/conf/links.conf.example +++ b/docs/conf/links.example.conf @@ -2,7 +2,7 @@ # # # Configure the port and address bindings for linking here. # # # -# Refer to the port configuration section in inspircd.conf.example # +# Refer to the port configuration section in inspircd.example.conf # # for more information about the available options. # # # @@ -142,4 +142,4 @@ # Once you have edited this file you can remove this line. This is just to # ensure that you don't hastily include the file without reading it. - + diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.example.conf similarity index 99% rename from docs/conf/modules.conf.example rename to docs/conf/modules.example.conf index 6462088bf..655735706 100644 --- a/docs/conf/modules.conf.example +++ b/docs/conf/modules.example.conf @@ -653,11 +653,11 @@ # # # You should include one of the following files to set your codepage: -# -# -# -# -# +# +# +# +# +# # # You can also define a custom codepage. For details on how to do this # please refer to the docs site: @@ -939,13 +939,13 @@ # more of the following example configs for popular DNSBLs: # # # # DroneBL (https://dronebl.org) # -# +# # # # EFnet RBL (https://rbl.efnetrbl.org) # -# +# # # # dan.me.uk Tor exit node DNSBL (https://www.dan.me.uk/dnsbl) # -# +# #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# # Exempt channel operators module: Provides support for allowing # @@ -954,7 +954,7 @@ # anticaps, auditorium-see, auditorium-vis, blockcaps, blockcolor, # # filter, flood, nickflood, noctcp, nonick, nonotice, regmoderated, # # stripcolor, and topiclock. # -# See in inspircd.conf.example for a more # +# See in inspircd.example.conf for a more # # detailed list of the restriction modes that can be exempted. # # These are settable using: /MODE #chan +X : # # Furthermore, the exemptions configured in # @@ -991,7 +991,7 @@ # Your choice of regex engine must match on all servers network-wide. # # # # To learn more about the configuration of this module, read # -# examples/filter.conf.example, which covers the various types of # +# examples/filter.example.conf, which covers the various types of # # filters and shows how to add exemptions. # # # #-#-#-#-#-#-#-#-#-#-#- FILTER CONFIGURATION -#-#-#-#-#-#-#-#-#-#-#-# @@ -1000,7 +1000,7 @@ # specify below the path to the filter.conf file, or define some # # tags. # # # -# +# #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# # Gateway module: Enables forwarding the real IP address of a user from @@ -1138,7 +1138,7 @@ # If you specify to use the help module, then specify below the path # # to the help.conf file. # # # -# +# #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# # Help mode module: Provides oper-only user mode `h` (helpop) which @@ -2431,7 +2431,7 @@ # # This file has all the information about server links and services servers. # You *MUST* edit it if you intend to link servers. -# +# #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# # SQL authentication module: Allows IRCd connections to be tied into @@ -2518,7 +2518,7 @@ # connections in order to oper up. It is highly recommended to load # this module if you use TLS on your network. # For how to use the oper features, please see the first -# example tag in opers.conf.example. +# example tag in opers.example.conf. # # # diff --git a/docs/conf/motd.txt.example b/docs/conf/motd.example.txt similarity index 96% rename from docs/conf/motd.txt.example rename to docs/conf/motd.example.txt index cd993e9a3..834cf234d 100644 --- a/docs/conf/motd.txt.example +++ b/docs/conf/motd.example.txt @@ -21,7 +21,7 @@ \__/ /(_/ \__/ (__/ - +---- To change this see \bmotd.txt.example\x ----+ + +---- To change this see \bmotd.example.txt\x ----+ | | | * \bWeb:\x https://www.inspircd.org | | * \bIRC:\x irc.inspircd.org #inspircd | diff --git a/docs/conf/opermotd.txt.example b/docs/conf/opermotd.example.txt similarity index 96% rename from docs/conf/opermotd.txt.example rename to docs/conf/opermotd.example.txt index b0d9b4816..46c696c92 100644 --- a/docs/conf/opermotd.txt.example +++ b/docs/conf/opermotd.example.txt @@ -21,7 +21,7 @@ \__/ /(_/ \__/ (__/ - +-- To change this see \bopermotd.txt.example\x --+ + +-- To change this see \bopermotd.example.txt\x --+ | | | * \bWeb:\x https://www.inspircd.org | | * \bIRC:\x irc.inspircd.org #inspircd | diff --git a/docs/conf/opers.conf.example b/docs/conf/opers.example.conf similarity index 99% rename from docs/conf/opers.conf.example rename to docs/conf/opers.example.conf index 744ee2baa..b848a4cd6 100644 --- a/docs/conf/opers.conf.example +++ b/docs/conf/opers.example.conf @@ -92,7 +92,7 @@ # operator type. This can be viewed with /OPERMOTD or automatically # on login if automotd (see below) is enabled. # Requires the opermotd module to be loaded. - motd="examples/opermotd.txt.example" + motd="examples/opermotd.example.txt" # automotd: Whether to send the server operator MOTD (see above) # to operators of this type when they log in. @@ -219,4 +219,4 @@ # Once you have edited this file you can remove this line. This is just to # ensure that you don't hastily include the file without reading it. - + diff --git a/docs/conf/providers/dronebl.conf.example b/docs/conf/providers/dronebl.example.conf similarity index 100% rename from docs/conf/providers/dronebl.conf.example rename to docs/conf/providers/dronebl.example.conf diff --git a/docs/conf/providers/efnet-rbl.conf.example b/docs/conf/providers/efnet-rbl.example.conf similarity index 100% rename from docs/conf/providers/efnet-rbl.conf.example rename to docs/conf/providers/efnet-rbl.example.conf diff --git a/docs/conf/providers/irccloud.conf.example b/docs/conf/providers/irccloud.example.conf similarity index 100% rename from docs/conf/providers/irccloud.conf.example rename to docs/conf/providers/irccloud.example.conf diff --git a/docs/conf/providers/torexit.conf.example b/docs/conf/providers/torexit.example.conf similarity index 100% rename from docs/conf/providers/torexit.conf.example rename to docs/conf/providers/torexit.example.conf diff --git a/docs/conf/quotes.txt.example b/docs/conf/quotes.example.txt similarity index 100% rename from docs/conf/quotes.txt.example rename to docs/conf/quotes.example.txt diff --git a/docs/conf/services/anope.conf.example b/docs/conf/services/anope.example.conf similarity index 78% rename from docs/conf/services/anope.conf.example rename to docs/conf/services/anope.example.conf index b1406e431..e4f003466 100644 --- a/docs/conf/services/anope.conf.example +++ b/docs/conf/services/anope.example.conf @@ -2,4 +2,4 @@ # by Anope. See https://www.anope.org for more information on Anope. # This file inherits from the generic config to avoid repetition. - + diff --git a/docs/conf/services/atheme.conf.example b/docs/conf/services/atheme.example.conf similarity index 98% rename from docs/conf/services/atheme.conf.example rename to docs/conf/services/atheme.example.conf index c2e569a48..35ac7b0a3 100644 --- a/docs/conf/services/atheme.conf.example +++ b/docs/conf/services/atheme.example.conf @@ -3,7 +3,7 @@ # information on Atheme. # This file inherits from the generic config to avoid repetition. - + # Long hand aliases for services pseudoclients. diff --git a/docs/conf/services/generic.conf.example b/docs/conf/services/generic.example.conf similarity index 100% rename from docs/conf/services/generic.conf.example rename to docs/conf/services/generic.example.conf diff --git a/make/template/main.mk b/make/template/main.mk index 388abbdff..c3fc680d4 100644 --- a/make/template/main.mk +++ b/make/template/main.mk @@ -279,10 +279,10 @@ endif -$(INSTALL) $(INSTFLAGS) -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd.1 $(MANPATH) 2>/dev/null -$(INSTALL) $(INSTFLAGS) -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd-testssl.1 $(MANPATH) 2>/dev/null -$(INSTALL) $(INSTFLAGS) -m $(INSTMODE_BIN) tools/testssl $(BINPATH)/inspircd-testssl 2>/dev/null - -$(INSTALL) $(INSTFLAGS) -m $(INSTMODE_TXT) docs/conf/*.example $(EXAPATH) - -$(INSTALL) $(INSTFLAGS) -m $(INSTMODE_TXT) docs/conf/codepages/*.example $(EXAPATH)/codepages - -$(INSTALL) $(INSTFLAGS) -m $(INSTMODE_TXT) docs/conf/providers/*.example $(EXAPATH)/providers - -$(INSTALL) $(INSTFLAGS) -m $(INSTMODE_TXT) docs/conf/services/*.example $(EXAPATH)/services + -$(INSTALL) $(INSTFLAGS) -m $(INSTMODE_TXT) docs/conf/*.example.* $(EXAPATH) + -$(INSTALL) $(INSTFLAGS) -m $(INSTMODE_TXT) docs/conf/codepages/*.example.* $(EXAPATH)/codepages + -$(INSTALL) $(INSTFLAGS) -m $(INSTMODE_TXT) docs/conf/providers/*.example.* $(EXAPATH)/providers + -$(INSTALL) $(INSTFLAGS) -m $(INSTMODE_TXT) docs/conf/services/*.example.* $(EXAPATH)/services -$(INSTALL) $(INSTFLAGS) -m $(INSTMODE_TXT) docs/sql/log_sql/*.sql $(EXAPATH)/sql/log_sql -$(INSTALL) $(INSTFLAGS) -m $(INSTMODE_TXT) docs/sql/sqloper/*.sql $(EXAPATH)/sql/sqloper -$(INSTALL) $(INSTFLAGS) -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/help.txt $(CONPATH) @@ -314,10 +314,10 @@ deinstall: -rm -f $(BINPATH)/inspircd -rm -f $(BINPATH)/inspircd-testssl -rm -f $(CONPATH)/help.txt - -rm -f $(EXAPATH)/*.example - -rm -f $(EXAPATH)/codepages/*.example - -rm -f $(EXAPATH)/providers/*.example - -rm -f $(EXAPATH)/services/*.example + -rm -f $(EXAPATH)/*.example.* + -rm -f $(EXAPATH)/codepages/*.example.* + -rm -f $(EXAPATH)/providers/*.example.* + -rm -f $(EXAPATH)/services/*.example.* -rm -f $(EXAPATH)/sql/*.sql -rm -f $(MANPATH)/inspircd-testssl.1 -rm -f $(MANPATH)/inspircd.1