From f0cd8a996764c7838cbf86cb3d96885845bbb61e Mon Sep 17 00:00:00 2001 From: Matthew Wiggins Date: Mon, 7 Mar 2005 20:31:43 +0000 Subject: [PATCH] misc release updates --- Makefile.in | 22 +++++---- doc/template.conf | 58 +++++++++++------------- doc/template.conf.old | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 160 insertions(+), 40 deletions(-) create mode 100644 doc/template.conf.old diff --git a/Makefile.in b/Makefile.in index 128aa5c..c2ef91e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -15,13 +15,16 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # -# $Id: Makefile.in,v 1.3 2005/03/07 19:42:03 mwiggins Exp $ +# $Id: Makefile.in,v 1.4 2005/03/07 20:31:43 mwiggins Exp $ RM=@RM@ MV=@MV@ +CHMOD=chmod +INSTALL_BIN=@INSTALL@ ENGINE=@SENGINE@ + SHELL=/bin/sh SUBDIRS=zlib src doc tools INSTDIRS=src doc tools @@ -31,6 +34,8 @@ CC=@CC@ CFLAGS=@CFLAGS@ LIBS=@LIBS@ +SSL_FILES=ircd.crt ircd.key + INSTALL_DIR=@INSTALL_DIR@ all: build @@ -111,13 +116,14 @@ install: all cd ..; \ done - @if test -f $(PWD)/ircd.crt; then - $(INSTALL_BIN) ircd.crt $(INSTALL_DIR); - fi - - @if test -f $(PWD)/ircd.key; then - $(INSTALL_BIN) ircd.key $(INSTALL_DIR); - fi + @for i in $(SSL_FILES); do \ + if test ! -f $(INSTALL_DIR)/$$i; then \ + echo $(MV) $$i $(INSTALL_DIR); \ + $(MV) $$i $(INSTALL_DIR); \ + echo $(CHMOD) 0600 $(INSTALL_DIR)/$$i; \ + $(CHMOD) 0600 $(INSTALL_DIR)/$$i; \ + fi; \ + done @echo "" @echo "Now edit $(INSTALL_DIR)/template.conf" diff --git a/doc/template.conf b/doc/template.conf index 10f2ce4..def84de 100644 --- a/doc/template.conf +++ b/doc/template.conf @@ -1,5 +1,5 @@ # ========================================================================= -# QUICKSTART: server configuration (see reference.conf for details) +# QUICKSTART: rubiks server configuration (see reference.conf for details) # ========================================================================= /* server name and administration info */ @@ -17,18 +17,11 @@ global { options { network_name unconfigured; # A name is needed even if not linked local_kline admin@server; # Contact email for server bans - show_links; # Show servers in LINKS + show_links; # Show server in LINKS allow_split_ops; # Give ops in empty channels - staff_address staff.unconfigured; #default operhost mask (if connect to port with name:pass as password) + staff_address staff.unconfigured; #default operhost mask (if connect to port with opername:pass as password) - - // use these options when services is on the network - services_name services.name; # Name of services (NS/CS/MS/RS) server - stats_name stats.name; # Name of stats (OS/SS/HS) server - network_kline admin@net; # Contact email for network bans - nshelpurl "http://help"; # Nick registration help page - - // if you need to link more than 1 server, uncomment the following line + # if you need to link more than 1 server, uncomment the following line # servtype hub; }; @@ -39,12 +32,14 @@ port { }; /* more listening ports */ port { port 7029; }; + port { port 9999; type SSL}; /* note that allow blocks are matched in order listed */ /* anyone who knows the secret password will get their host masked */ +/* allow { port 7029; passwd secret; @@ -53,6 +48,7 @@ allow { flags m; class opers; }; +*/ /* allow clients to connect */ allow { @@ -62,6 +58,21 @@ allow { class users; # Place them in the users class }; + +/* the server administrator */ +oper { + name admin; + passwd secret; + access OARD; # Server Administrator + host *@192.168.0.*; + host *@10.64.64.*; + class opers; + mask "witty.host"; # +}; + + + + /* connection class for users */ class { name users; # Class name @@ -77,19 +88,6 @@ class { maxsendq 500000; # 500KB limit for opers }; -/* the server administrator */ -oper { - name admin; # Username - passwd secret; # Password - access OARD; # Server Administrator - host *@192.168.0.*; # Must be connecting from here - host *@10.64.64.*; # Or from here - // insert other other hostmasks here - class opers; # Belongs in the opers class -}; - -/* === these next two blocks are for linking to a hub === */ - /* class for uplink hub */ class { name hub; @@ -99,7 +97,10 @@ class { maxlinks 1; # Autoconnect to only 1 hub at a time }; + + /* our uplink hub */ +/* connect { name hub.name; # Hub's IRC name host 172.16.4.2; # Hub's IP address @@ -110,11 +111,4 @@ connect { flags H; # It is a hub class hub; # Use hub class }; - - -/* dynamic modules to load */ - -modules { - path "/usr/IRCd/modules"; # Directory to search for modules in - autoload auth; # Authload auth module by default -}; +*/ diff --git a/doc/template.conf.old b/doc/template.conf.old new file mode 100644 index 0000000..10f2ce4 --- /dev/null +++ b/doc/template.conf.old @@ -0,0 +1,120 @@ +# ========================================================================= +# QUICKSTART: server configuration (see reference.conf for details) +# ========================================================================= + +/* server name and administration info */ +global { + name not.configured; # IRC name of the server + info "located on earth"; # A short info line + admin { + "An unconfigured server"; # Three information lines sent + "An unknown administrator"; # in reply to ADMIN command + "email@somewhere.earth"; + }; +}; + +/* server options */ +options { + network_name unconfigured; # A name is needed even if not linked + local_kline admin@server; # Contact email for server bans + show_links; # Show servers in LINKS + allow_split_ops; # Give ops in empty channels + staff_address staff.unconfigured; #default operhost mask (if connect to port with name:pass as password) + + + // use these options when services is on the network + services_name services.name; # Name of services (NS/CS/MS/RS) server + stats_name stats.name; # Name of stats (OS/SS/HS) server + network_kline admin@net; # Contact email for network bans + nshelpurl "http://help"; # Nick registration help page + + // if you need to link more than 1 server, uncomment the following line + # servtype hub; +}; + +/* where to listen for connections */ +port { + port 6667; # Port to listen on + #bind 127.0.0.1; # IP address to listen on +}; +/* more listening ports */ +port { port 7029; }; +port { port 9999; type SSL}; + + +/* note that allow blocks are matched in order listed */ + +/* anyone who knows the secret password will get their host masked */ +allow { + port 7029; + passwd secret; + host *@*; + mask this.servers.fakehost; + flags m; + class opers; +}; + +/* allow clients to connect */ +allow { + port 6667; + flags m; # Let oper's who connect to this port get their opermask + host *@*; # Allow anyone + class users; # Place them in the users class +}; + +/* connection class for users */ +class { + name users; # Class name + maxusers 100; # Maximum connections + pingfreq 90; # Check idle connections every N seconds + maxsendq 100000; # 100KB send buffer limit +}; + +/* connection class for server operators */ +class { + name opers; + pingfreq 90; + maxsendq 500000; # 500KB limit for opers +}; + +/* the server administrator */ +oper { + name admin; # Username + passwd secret; # Password + access OARD; # Server Administrator + host *@192.168.0.*; # Must be connecting from here + host *@10.64.64.*; # Or from here + // insert other other hostmasks here + class opers; # Belongs in the opers class +}; + +/* === these next two blocks are for linking to a hub === */ + +/* class for uplink hub */ +class { + name hub; + pingfreq 120; # Idle check every 2 minutes + connfreq 300; # Try autoconnect every 5 minutes + maxsendq 1000000; # 1MB send queue + maxlinks 1; # Autoconnect to only 1 hub at a time +}; + +/* our uplink hub */ +connect { + name hub.name; # Hub's IRC name + host 172.16.4.2; # Hub's IP address + port 7325; # Autoconnect to hub's port 7325 + bind 127.0.0.1; # We connect from this IP + apasswd secret; # We accept this password from hub + cpasswd secret; # We send this password to hub + flags H; # It is a hub + class hub; # Use hub class +}; + + +/* dynamic modules to load */ + +modules { + path "/usr/IRCd/modules"; # Directory to search for modules in + autoload auth; # Authload auth module by default +}; -- 2.9.0