From 3c66938027b0809378434ab33d4487ca4cf0b9a3 Mon Sep 17 00:00:00 2001 From: ac2ie Date: Sun, 9 Feb 2014 12:26:56 -0500 Subject: [PATCH] updated ircddb servers and Makefile --- BUILDING | 16 +++++++--------- Makefile | 51 ++++++++++++++++++++++++++++++++++++++++++++------- g2_ircddb.cfg | 12 ++++++------ 3 files changed, 57 insertions(+), 22 deletions(-) diff --git a/BUILDING b/BUILDING index 65f9670..be19154 100644 --- a/BUILDING +++ b/BUILDING @@ -56,11 +56,9 @@ the changes will be available. If you plan on using DTMFS, you can also edit proc_g2_ircddb_dtmfs.sh to add new dtmfs commands. -Then install your system, g2_ircddb, g2_link and either dvap_rptr or dvrptr. Start by -typing "sudo make installg2". This will install g2_ircddb and g2_link and all the -files they require. Then intstall either dvap_rptr or dvrptr by typing "sudo make -installdvap" or "sudo make installdvrptr", respectively. Finally, if you want/need -DTMFS, type "sudo make installdtmfs". +Then install your system. you have two choices, either dvap_rptr or dvrptr by typing +"sudo make installdvap" or "sudo make installdvrptr", respectively. Finally, if you +want/need DTMFS, type "sudo make installdtmfs". This will install the service scripts and symbolic links in /etc/init.d and everything else in /usr/local. The executables will be in /usr/local/bin and the *.cfg files and @@ -75,9 +73,9 @@ manually with the "service" command. (See the man page for service.) You can clean up the build directory of intermediate *.o files with "make clean" or, you can remove the intermediate *.o files and binary executables with "make realclean". -If you want to uninstall everything return to the build directory and type -"sudo make uninstallg2" and either "sudo make unistalldvap" or "sudo make -uninstalldvrptr" and possibly "sudo make uninstalldtmfs". This will shutdown the and -remove the service scripts and links and remove most everything from /usr/local. +If you want to uninstall everything return to the build directory and type either "sudo +make unistalldvap" or "sudo make uninstalldvrptr" and possibly "sudo make uninstalldtmfs". +This will shutdown the and remove the service scripts and links and remove most everything +from /usr/local. Tom Early, ac2ie@arrl.net diff --git a/Makefile b/Makefile index 46f8508..90fd670 100644 --- a/Makefile +++ b/Makefile @@ -87,7 +87,7 @@ clean : realclean : /bin/rm -f *.o $(PROGRAMS) g2link_test -installg2 : g2_ircddb g2_link +installdvap : dvap_rptr g2_link g2_ircddb ######### g2_ircddb ######### /bin/cp -f g2_ircddb $(BINDIR) /bin/cp -f g2_ircddb.cfg $(CFGDIR) @@ -103,8 +103,7 @@ installg2 : g2_ircddb g2_link /bin/cp -f service.g2_link /etc/init.d/g2_link /usr/sbin/update-rc.d g2_link defaults /usr/sbin/update-rc.d g2_link enable - -installdvap : dvap_rptr + ######### dvap_rptr ######### /bin/cp -f dvap_rptr $(BINDIR) /bin/cp -f dvap_rptr.sh $(BINDIR) /bin/cp -f dvap_rptr.cfg $(CFGDIR) @@ -112,7 +111,23 @@ installdvap : dvap_rptr /usr/sbin/update-rc.d dvap_rptr defaults /usr/sbin/update-rc.d dvap_rptr enable -installdvrptr : dvrptr +installdvrptr : dvrptr g2_link g2_ircddb + ######### g2_ircddb ######### + /bin/cp -f g2_ircddb $(BINDIR) + /bin/cp -f g2_ircddb.cfg $(CFGDIR) + /bin/cp -f service.g2_ircddb /etc/init.d/g2_ircddb + /usr/sbin/update-rc.d g2_ircddb defaults + /usr/sbin/update-rc.d g2_ircddb enable + ######### g2_link ######### + /bin/cp -f g2_link $(BINDIR) + /bin/cp -f g2_link.cfg $(CFGDIR) + /bin/cp -f announce/*.dat $(CFGDIR) + /bin/cp -f gwys.txt $(CFGDIR) + /bin/cp -f exec_?.sh $(CFGDIR) + /bin/cp -f service.g2_link /etc/init.d/g2_link + /usr/sbin/update-rc.d g2_link defaults + /usr/sbin/update-rc.d g2_link enable + ######### dvrptr ########## /bin/cp -f dvrptr $(BINDIR) /bin/cp -f dvrptr.sh $(BINDIR) /bin/cp -f dvrptr.cfg $(CFGDIR) @@ -134,7 +149,7 @@ uninstalldtmfs: /bin/rm -f $(BINDIR)/proc_g2_ircddb_dtmfs.sh /bin/rm -f $(BINDIR)/g2link_test -uninstallg2 : +uninstalldvap : ######### g2_ircddb ######### /usr/sbin/service g2_ircddb stop /bin/rm -f /etc/init.d/g2_ircddb @@ -157,8 +172,7 @@ uninstallg2 : /bin/rm -f $(CFGDIR)/gwys.txt /bin/rm -f $(CFGDIR)/exec_?.sh /bin/rm -f /var/log/g2_link.log - -uninstalldvap : + ######### dvap_rptr ######### /usr/sbin/service dvap_rptr stop /bin/rm -f /etc/init.d/dvap_rptr /usr/sbin/update-rc.d dvap_rptr remove @@ -167,6 +181,29 @@ uninstalldvap : /bin/rm -r $(CFGDIR)/dvap_rptr.cfg uninstalldvrptr: + ######### g2_ircddb ######### + /usr/sbin/service g2_ircddb stop + /bin/rm -f /etc/init.d/g2_ircddb + /usr/sbin/update-rc.d g2_ircddb remove + /bin/rm -f $(BINDIR)/g2_ircddb + /bin/rm -f $(CFGDIR)/g2_ircddb.cfg + ######### g2_link ######### + /usr/sbin/service g2_link stop + /bin/rm -f /etc/init.d/g2_link + /usr/sbin/update-rc.d g2_link remove + /bin/rm -f $(BINDIR)/g2_link + /bin/rm -f $(CFGDIR)/g2_link.cfg + /bin/rm -f $(CFGDIR)/already_linked.dat + /bin/rm -f $(CFGDIR)/already_unlinked.dat + /bin/rm -f $(CFGDIR)/failed_linked.dat + /bin/rm -f $(CFGDIR)/id.dat + /bin/rm -f $(CFGDIR)/linked.dat + /bin/rm -f $(CFGDIR)/unlinked.dat + /bin/rm -f $(CFGDIR)/RPT_STATUS.txt + /bin/rm -f $(CFGDIR)/gwys.txt + /bin/rm -f $(CFGDIR)/exec_?.sh + /bin/rm -f /var/log/g2_link.log + ######### dvrptr ########## /usr/sbin/service dvrptr stop /bin/rm -f /etc/init.d/dvrptr /usr/sbin/update-rc.d dvrtpr remove diff --git a/g2_ircddb.cfg b/g2_ircddb.cfg index ebdbe43..74266af 100644 --- a/g2_ircddb.cfg +++ b/g2_ircddb.cfg @@ -169,12 +169,12 @@ IRC_DDB_HOST= # For the German and EU # IRC_DDB_HOST=group1-irc.ircddb.net # For the US you can also chose the closest of: -# itsn-s1.no-ip.org is in Huntsville, AL -# stn570.dyndns.org is in Stroudsburg, PA -# itsns3.no-ip.org is in Jackson, MS -# itsn-s4.no-ip.org is in Tucoma, WA -# k0atm.dyndns.org in in Pilot Knob, MO -# ozquadnet.sytes.net is in Queensland, Australia +# irc1.openquad.net is in Huntsville, AL +# irc2.openquad.net is in Jackson, MS +# irc3.openquad.net is in Spanaway, WA +# irc4.openquad.net in in Pilot Knob, MO +# irc5.openquad.net is in Queensland, Australia +# irc6.openquad.net is in Chicago, IL # The remote ircDDB port IRC_DDB_PORT=9007