diff options
| -rw-r--r-- | docs/conf/censor.conf.example (renamed from docs/conf/inspircd.censor.example) | 0 | ||||
| -rw-r--r-- | docs/conf/filter.conf.example (renamed from docs/conf/inspircd.filter.example) | 0 | ||||
| -rw-r--r-- | docs/conf/helpop-full.conf.example (renamed from docs/conf/inspircd.helpop-full.example) | 0 | ||||
| -rw-r--r-- | docs/conf/helpop.conf.example (renamed from docs/conf/inspircd.helpop.example) | 0 | ||||
| -rw-r--r-- | docs/conf/inspircd.conf.example | 12 | ||||
| -rw-r--r-- | docs/conf/modules.conf.example | 8 | ||||
| -rw-r--r-- | docs/conf/modules/charybdis.conf.example (renamed from docs/conf/modules/modules.conf.charybdis) | 0 | ||||
| -rw-r--r-- | docs/conf/modules/unrealircd.conf.example (renamed from docs/conf/modules/modules.conf.unreal) | 0 | ||||
| -rw-r--r-- | docs/conf/motd.txt.example (renamed from docs/conf/inspircd.motd.example) | 10 | ||||
| -rw-r--r-- | docs/conf/opermotd.txt.example | 41 | ||||
| -rw-r--r-- | docs/conf/quotes.txt.example (renamed from docs/conf/inspircd.quotes.example) | 0 | ||||
| -rw-r--r-- | docs/conf/rules.txt.example (renamed from docs/conf/inspircd.rules.example) | 0 | ||||
| -rw-r--r-- | make/template/main.mk | 2 | ||||
| -rw-r--r-- | win/inspircd.nsi | 2 |
14 files changed, 58 insertions, 17 deletions
diff --git a/docs/conf/inspircd.censor.example b/docs/conf/censor.conf.example index 342ccd875..342ccd875 100644 --- a/docs/conf/inspircd.censor.example +++ b/docs/conf/censor.conf.example diff --git a/docs/conf/inspircd.filter.example b/docs/conf/filter.conf.example index 922f55fb6..922f55fb6 100644 --- a/docs/conf/inspircd.filter.example +++ b/docs/conf/filter.conf.example diff --git a/docs/conf/inspircd.helpop-full.example b/docs/conf/helpop-full.conf.example index bc9326e62..bc9326e62 100644 --- a/docs/conf/inspircd.helpop-full.example +++ b/docs/conf/helpop-full.conf.example diff --git a/docs/conf/inspircd.helpop.example b/docs/conf/helpop.conf.example index 02ddff8a2..02ddff8a2 100644 --- a/docs/conf/inspircd.helpop.example +++ b/docs/conf/helpop.conf.example diff --git a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example index fea9d5d5c..83ac59acb 100644 --- a/docs/conf/inspircd.conf.example +++ b/docs/conf/inspircd.conf.example @@ -416,11 +416,11 @@ # This file has all the information about oper classes, types and o:lines. # You *MUST* edit it. -<include file="conf/opers.conf.example"> +<include file="conf/examples/opers.conf.example"> # This file has all the information about server links and ulined servers. # You *MUST* edit it if you intend to link servers. -<include file="conf/links.conf.example"> +<include file="conf/examples/links.conf.example"> #-#-#-#-#-#-#-#-#-#- MISCELLANEOUS CONFIGURATION -#-#-#-#-#-#-#-#-#-# # # @@ -430,7 +430,7 @@ # motd - displayed on connect and when a user executes /MOTD # rules - displayed when the user executes /RULES # Modules can also define their own files -<files motd="conf/inspircd.motd.example" rules="conf/inspircd.rules.example"> +<files motd="conf/examples/motd.txt.example" rules="conf/examples/rules.txt.example"> # Example of an executable file include. Note this will be read on rehash, # not when the command is run. @@ -954,7 +954,7 @@ # provide almost all the features of InspIRCd. :) # # # # The default does nothing -- we include it for simplicity for you. # -<include file="conf/modules.conf.example"> +<include file="conf/examples/modules.conf.example"> # Here are some pre-built modules.conf files that closely match the # default configurations of some popular IRCd's. You still may want to @@ -966,10 +966,10 @@ # recommended that you make your own modules file based on modules.conf.example. # Settings similar to UnrealIRCd defaults. -#<include file="conf/modules/modules.conf.unreal"> +#<include file="conf/examples/modules/unrealircd.conf.example"> # Settings similar to Charybdis IRCd defaults. -#<include file="conf/modules/modules.conf.charybdis"> +#<include file="conf/examples/modules/charybdis.conf.example"> ######################################################################### diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example index 5ddb21baa..bc76dfac3 100644 --- a/docs/conf/modules.conf.example +++ b/docs/conf/modules.conf.example @@ -314,7 +314,7 @@ # specify some censor tags. See also: # # http://wiki.inspircd.org/Modules/censor # # -#<include file="conf/censor.conf"> +#<include file="conf/examples/censor.conf.example"> #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# # CGI:IRC module: Adds support for automatic host changing in CGI:IRC @@ -770,7 +770,7 @@ # specfiy below the path to the filter.conf file, or define some # # <filter> tags. # # # -#<include file="conf/filter.conf"> +#<include file="conf/examples/filter.conf.example"> #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# # Gecosban: Implements extended ban r:, which stops anyone matching @@ -827,7 +827,7 @@ # specify below the path to the helpop.conf file, or if you like to # # make a mess, define your helpop tags in this conf. # # # -#<include file="conf/inspircd.helpop-full.example"> +#<include file="conf/examples/inspircd.helpop-full.example"> #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# # HIDECHANS module: Allows opers to hide their channels list from non- @@ -1268,7 +1268,7 @@ # Read the comment above <connect:allowmotdcolors> in # # inspircd.conf.example for details. # # # -#<opermotd file="conf/oper.motd" onoper="yes" processcolors="false"> +#<opermotd file="conf/examples/opermotd.txt.example" onoper="yes" processcolors="false"> #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# # Override module: Adds support for oper override diff --git a/docs/conf/modules/modules.conf.charybdis b/docs/conf/modules/charybdis.conf.example index 4490d5482..4490d5482 100644 --- a/docs/conf/modules/modules.conf.charybdis +++ b/docs/conf/modules/charybdis.conf.example diff --git a/docs/conf/modules/modules.conf.unreal b/docs/conf/modules/unrealircd.conf.example index fa5d652f1..fa5d652f1 100644 --- a/docs/conf/modules/modules.conf.unreal +++ b/docs/conf/modules/unrealircd.conf.example diff --git a/docs/conf/inspircd.motd.example b/docs/conf/motd.txt.example index 0a1260c0c..70830b8da 100644 --- a/docs/conf/inspircd.motd.example +++ b/docs/conf/motd.txt.example @@ -24,12 +24,12 @@ `-.__ `----""" __.-' `--..____..--' - -- To change, see inspircd.motd.example -- + ---- To change, see motd.txt.example ----- / \ - / * Web: http://www.inspircd.org \ - | * IRC: irc.inspircd.org #inspircd | - | * Docs: http://wiki.inspircd.org | - | * Bugs: http://inspircd.org/bugtrack/ | + / * Web: http://www.inspircd.org \ + | * IRC: irc.inspircd.org #inspircd | + | * Docs: http://wiki.inspircd.org | + | * Bugs: http://inspircd.github.com/bugs | | | | We hope you like this software. Please do | | make sure you put some effort into | diff --git a/docs/conf/opermotd.txt.example b/docs/conf/opermotd.txt.example new file mode 100644 index 000000000..c91b36a2b --- /dev/null +++ b/docs/conf/opermotd.txt.example @@ -0,0 +1,41 @@ + + _____ _____ _____ _____ _ +|_ _| |_ _| | __ \ / ____| | | + | | _ __ ___ _ __ | | | |__) || | __| | + | | | '_ \ / __| | '_ \ | | | _ / | | / _` | + _| |_ | | | | \__ \ | |_) | _| |_ | | \ \ | |____ | (_| | +|_____| |_| |_| |___/ | .__/ |_____| |_| \_\ \_____| \__,_| + __________________| |_______________________________ + |__________________|_|_______________________________| + + Putting the ricer in IRCer since 2007 + + //\ + V \ WELCOME TO AN INSPIRCD NETWORK + \ \_ If you see this, I am probably new. + \,'.`-. If I'm not new, my owner is lazy. + |\ `. `. + ( \ `. `-. _,.-:\ + \ \ `. `-._ __..--' ,-';/ + \ `. `-. `-..___..---' _.--' ,'/ + `. `. `-._ __..--' ,' / + `. `-_ ``--..'' _.-' ,' + `-_ `-.___ __,--' ,' + `-.__ `----""" __.-' + `--..____..--' + + -- To change, see opermotd.txt.example --- + / \ + / * Web: http://www.inspircd.org \ + | * IRC: irc.inspircd.org #inspircd | + | * Docs: http://wiki.inspircd.org | + | * Bugs: http://inspircd.github.com/bugs | + | | + | We hope you like this software. Please do | + | make sure you put some effort into | + | your configuration, though, so you love it.| + | Enjoy. | + | | + \ -- The InspIRCd Team / + ------------------------------------------- + diff --git a/docs/conf/inspircd.quotes.example b/docs/conf/quotes.txt.example index 56a580e33..56a580e33 100644 --- a/docs/conf/inspircd.quotes.example +++ b/docs/conf/quotes.txt.example diff --git a/docs/conf/inspircd.rules.example b/docs/conf/rules.txt.example index e51f0afd9..e51f0afd9 100644 --- a/docs/conf/inspircd.rules.example +++ b/docs/conf/rules.txt.example diff --git a/make/template/main.mk b/make/template/main.mk index 114122dd3..17e15f53a 100644 --- a/make/template/main.mk +++ b/make/template/main.mk @@ -233,7 +233,7 @@ install: target -$(INSTALL) -m $(INSTMODE_LIB) tools/gdbargs $(BASE)/.gdbargs 2>/dev/null -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)/examples -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/examples/aliases - -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.conf.* $(CONPATH)/examples/modules + -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example $(CONPATH)/examples/modules @echo "" @echo "*************************************" @echo "* INSTALL COMPLETE! *" diff --git a/win/inspircd.nsi b/win/inspircd.nsi index 4204ec29b..e1ce0159f 100644 --- a/win/inspircd.nsi +++ b/win/inspircd.nsi @@ -156,7 +156,7 @@ Section "Config Files" SEC02 SetOutPath "$INSTDIR\conf\aliases" File "..\docs\conf\aliases\*.example" SetOutPath "$INSTDIR\conf\modules" - File "..\docs\conf\modules\modules.*" + File "..\docs\conf\modules\*.example" SectionEnd Section "Command Handlers" SEC03 |