From 581b1861781865373130893bc441f39379a29299 Mon Sep 17 00:00:00 2001 From: erickson Date: Tue, 22 Nov 2005 15:34:49 +0000 Subject: [PATCH] adding libs list and lib extractor code for posterity removed unnecessary log line from xmlbuilder got the Redirect code working git-svn-id: svn://svn.open-ils.org/ILS/trunk@2116 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Evergreen/Makefile | 9 +- Evergreen/conf/lib_ips.txt | 429 ++++++++++++++++++ Evergreen/conf/load_ips.pl | 30 ++ Open-ILS/src/apachemods/mod_xmlbuilder.c | 2 +- Open-ILS/src/perlmods/OpenILS/WWW/Redirect.pm | 19 +- install.sh | 1 + 6 files changed, 479 insertions(+), 11 deletions(-) create mode 100644 Evergreen/conf/lib_ips.txt create mode 100755 Evergreen/conf/load_ips.pl diff --git a/Evergreen/Makefile b/Evergreen/Makefile index 06c37734d3..cfe31c1622 100644 --- a/Evergreen/Makefile +++ b/Evergreen/Makefile @@ -10,9 +10,10 @@ NEW_XUL_PACKAGE_LABEL=OpenILS all: xul -install: circ-install +install: circ-install iplist-install xul: + @echo $@ cp -R staff_client local_staff_client find local_staff_client/ -type f -exec sed -i s/evergreen/${NEW_XUL_PACKAGE_NAME}/g {} \; find local_staff_client/ -type f -exec sed -i s/Evergreen/${NEW_XUL_PACKAGE_LABEL}/g {} \; @@ -26,9 +27,15 @@ xul: make -C local_staff_client package circ-install: + @echo $@ mkdir -p $(CIRCRULESDIR) cp circ_rules/*.rules $(CIRCRULESDIR)/ +iplist-install: + @echo $@ + mkdir -p $(ETCDIR) + cp conf/lib_ips.txt $(ETCDIR) + clean: if [ -d local_staff_client ]; then make -C local_staff_client clean; fi; diff --git a/Evergreen/conf/lib_ips.txt b/Evergreen/conf/lib_ips.txt new file mode 100644 index 0000000000..aea9473366 --- /dev/null +++ b/Evergreen/conf/lib_ips.txt @@ -0,0 +1,429 @@ +ARL-ATH 168.8.15.1 168.8.15.255 +ARL-ATH 168.12.0.1 168.12.0.255 +ARL-BOG 168.8.14.193 168.8.14.255 +ARL-DAN 168.8.20.2 168.8.20.127 +ARL-DAN 168.8.23.65 168.8.23.127 +ARL-LAV 168.8.22.129 168.8.22.191 +ARL-EAST 168.9.83.1 168.9.83.64 +ARL-LAY 168.9.83.65 168.9.83.128 +ARL-LEX 168.8.22.192 168.8.22.255 +ARL-ROY 168.8.23.1 168.8.23.63 +ARL-WAT 168.8.16.1 168.8.16.255 +ARL-WINT 168.8.23.65 168.8.23.127 +BROOK-HQ 168.10.0.0 168.10.0.128 +BTRL-MCD 168.11.134.1 168.11.134.63 +BTRL-MWL 168.8.197.129 168.8.197.255 +BTRL-TCL 168.8.202.129 168.8.202.191 +CHAT-SMRVL 168.8.0.0 168.8.0.128 +CHAT-TRION 168.8.2.0 168.8.2.64 +CHRL-CHICK 168.11.193.129 168.11.193.160 +CHRL-DADE 168.11.193.161 168.11.193.192 +CHRL-LW 168.11.193.0 168.11.193.128 +CHRL-ROSS 168.11.193.193 168.11.193.225 +CLAYTN-FOR 168.8.198.1 168.8.198.128 +CLAYTN-HQS 168.8.192.0 168.8.192.255 +CLAYTN-JON 168.8.198.129 168.8.198.254 +CLAYTN-MOR 168.8.199.1 168.8.199.128 +CLAYTN-RIV 168.8.199.129 168.8.199.254 +CPRL-A 168.10.17.1 168.10.17.72 +CPRL-B 168.10.16.1 168.10.16.63 +CPRL-C 168.10.16.129 168.10.16.191 +CPRL-L 168.10.16.193 168.10.16.255 +CPRL-R 168.10.16.69 168.10.16.127 +CPRL-T 168.10.15.1 168.10.15.128 +CRLS-DAWSN 168.8.0.129 168.8.0.255 +CRLS-LMPKN 168.8.1.0 168.8.1.128 +DCPL-CEN 168.13.15.0 168.13.15.255 +DCPL-NW 168.10.11.1 168.10.11.128 +DCPL-SS 168.10.11.129 168.10.11.254 +DCPL-TAL 168.10.12.1 168.10.12.128 +DCPL-WT 168.10.12.129 168.10.12.254 +DTRL-BLAK 168.10.0.193 168.10.0.255 +DTRL-CAMI 168.10.0.129 168.10.0.192 +DTRL-JAKN 168.10.21.193 168.10.21.255 +DTRL-PELH 168.10.1.65 168.10.1.128 +DTRL-SYLV 168.10.1.0 168.10.1.64 +ECGR-APPBY 168.11.129.193 168.11.129.255 +ECGR-AVTBC 168.11.131.1 168.11.131.63 +ECGR-BURKE 168.11.131.65 168.11.131.127 +ECGR-EUCHE 168.11.131.193 168.11.131.255 +ECGR-FRMAN 168.11.132.1 168.11.132.63 +ECGR-GIBBS 168.11.131.129 168.11.131.191 +ECGR-HARLM 168.11.132.65 168.11.132.127 +ECGR-LINCN 168.8.24.1 168.8.24.63 +ECGR-MAIN 168.11.130.1 168.11.130.255 +ECGR-MIDVL 168.11.132.193 168.11.132.255 +ECGR-MXWLL 168.11.132.129 168.11.132.191 +ECGR-SARDIS 168.11.133.1 168.11.133.63 +ECGR-WALLC 168.11.133.65 168.11.133.127 +ECGR-WARRN 168.11.133.129 168.11.133.191 +ECPL-ECPL 168.8.200.130 168.8.200.254 +ECPL-BWMN 168.9.33.1 168.9.33.62 +FBHCL-MAIN 168.10.1.129 168.10.1.255 +FRRLS-BA 168.8.2.65 168.8.2.128 +FRRLS-FA 168.8.3.0 168.8.3.255 +FRRLS-FY 168.10.128.0 168.10.128.128 +FRRLS-GR 168.8.4.0 168.8.4.255 +FRRLS-JA 168.8.2.193 168.8.2.255 +FRRLS-PT 168.12.211.1 168.12.211.254 +FRRLS-TY 168.8.5.0 168.8.5.64 +FRRLS-ZE 168.8.2.129 168.8.2.192 +HALL-BPL 168.8.202.193 168.8.202.255 +HALL-CL 168.8.203.1 168.8.203.63 +HALL-EH 168.8.203.65 168.8.203.127 +HALL-GVL 168.8.196.1 168.8.196.255 +HALL-MV 168.8.203.129 168.8.203.191 +HART-HQ 168.8.6.0 168.8.6.128 +HCLS-HA 168.8.5.129 168.8.5.192 +HCLS-LG 168.8.5.193 168.8.5.255 +HCLS-MD 168.8.6.129 168.8.6.255 +HCLS-ST 168.8.5.65 168.8.5.128 +HOU-CV 168.10.129.0 168.10.129.64 +HOU-PE 168.10.129.66 168.10.129.128 +HOU-WR 168.10.128.130 168.10.128.255 +JCL-LVILLE 168.11.128.0 168.11.128.128 +JCL-WADLEY 168.11.129.65 168.11.129.128 +JCL-WRENS 168.11.129.0 168.11.129.64 +KRLS-AR 168.10.3.0 168.10.3.64 +KRLS-CA 168.10.3.65 168.10.3.128 +KRLS-CL 168.10.3.129 168.10.3.192 +KRLS-RA 168.10.3.193 168.10.3.255 +KRLS-TE 168.10.2.0 168.10.2.255 +KRLS-WE 168.10.4.0 168.10.4.64 +LEE-LSB 168.10.5.0 168.10.5.255 +LEE-SMV 168.10.4.65 168.10.4.128 +MCCLS-HQ 168.10.6.0 168.10.6.255 +MGRL-EW 168.10.138.1 168.10.138.127 +MGRL-GH 168.13.143.180 168.13.143.200 +MGRL-GO 168.10.138.128 168.10.138.191 +MGRL-ID 168.10.138.192 168.10.138.255 +MGRL-JO 168.10.139.0 168.10.139.63 +MGRL-MA 168.10.139.64 168.10.139.127 +MGRL-MO 168.10.129.193 168.10.129.255 +MGRL-OG 168.10.139.128 168.10.139.191 +MGRL-RC 168.10.132.65 168.10.132.128 +MGRL-RV 168.10.132.0 168.10.132.64 +MGRL-SH 168.10.132.129 168.10.132.191 +MGRL-TW 168.10.139.192 168.10.139.255 +MGRL-WA 168.10.130.0 168.10.130.199 +MGRL-WA 168.10.130.221 168.10.130.254 +MGRL-WB 168.10.132.193 168.10.132.255 +MRGL-RO 168.10.138.0 168.10.138.63 +MRLS-FCPL 168.8.7.1 168.8.7.64 +MRLS-MRL 168.8.7.129 168.8.7.255 +MRLS-TCPL 168.8.7.65 168.8.7.128 +MRLS-UCPL 168.8.9.0 168.8.9.64 +NCLS-COVTN 168.8.193.1 168.8.193.255 +NEG-CLAYTN 168.8.9.129 168.8.9.192 +NEG-CLRKVL 168.8.8.0 168.8.8.255 +NEG-CLVLND 168.8.10.0 168.8.10.64 +NEG-CORNEL 168.8.9.65 168.8.9.128 +NEG-HELEN 168.8.10.65 168.8.10.128 +NEG-TOCCOA 168.8.9.193 168.8.9.255 +OCRL-DUBLN 168.10.136.1 168.10.136.255 +OCRL-SANDR 168.10.141.1 168.10.141.128 +OCRL-SOPER 168.11.10.193 168.11.10.255 +OCRL-WRIGH 168.10.140.1 168.10.140.63 +OHOOP-LADS 168.11.13.129 168.11.13.191 +OHOOP-LYON 168.11.0.65 168.11.0.128 +OHOOP-MONT 168.11.0.130 168.11.0.192 +OHOOP-TATG 168.11.0.1 168.11.0.64 +OHOOP-TATR 168.11.2.130 168.11.2.192 +OHOOP-VIDT 168.11.1.1 168.11.1.128 +OKRL-APPL 168.11.8.1 168.11.8.63 +OKRL-BACON 168.11.0.193 168.11.0.254 +OKRL-BLMEM 168.11.8.65 168.11.8.127 +OKRL-CLNCH 168.11.8.129 168.11.8.191 +OKRL-MA 168.11.8.193 168.11.8.255 +OKRL-WWC 168.11.7.1 168.11.7.255 +ORLS-HDQ 168.10.131.1 168.10.131.254 +ORLS-TEL 168.10.8.0 168.10.8.128 +ORLS-WIL 168.10.8.129 168.10.8.255 +PMRLS-BPL 168.10.135.65 168.10.135.128 +PMRLS-GPL 168.8.10.129 168.8.10.192 +PMRLS-HML 168.8.10.193 168.8.10.255 +PMRLS-MPL 168.8.11.0 168.8.11.255 +PMRLS-RCL 168.10.135.194 168.10.135.223 +PMRLS-TCL 168.8.12.0 168.8.12.64 +PMRLS-YPL 168.9.33.129 168.9.33.190 +PPL-BPL 168.10.135.0 168.10.135.64 +PPL-TPL 168.10.134.0 168.10.134.255 +ROCK-NG 168.8.200.1 168.8.200.128 +RML-MAIN 168.10.7.0 168.10.7.255 +SHRL-CD 168.8.201.193 168.8.201.255 +SHRL-CS 168.8.201.130 168.8.201.140 +SHRL-RK 168.8.205.1 168.8.205.63 +SHRL-RM 168.8.194.1 168.8.194.255 +SJRLS-JCML 168.11.128.129 168.11.128.192 +SJRLS-SCL 168.11.2.0 168.11.2.128 +SRL-AMBR 168.11.2.193 168.11.2.255 +SRL-AMBR 168.11.2.193 168.11.2.255 +SRL-BROX 168.11.3.0 168.11.3.64 +SRL-DOUG 168.11.1.129 168.11.1.255 +SRL-JDHAZ 168.11.3.65 168.11.3.128 +SRL-NICH 168.11.3.129 168.11.3.192 +SRL-PEAR 168.11.3.193 168.11.3.255 +SRL-WILLA 168.11.4.0 168.11.4.64 +STATELIB-L 168.28.72.0 168.28.72.254 +STRL-CLAX 168.11.11.1 168.11.11.63 +STRL-METT 168.11.11.64 168.11.11.129 +STRL-PEMB 168.11.11.130 168.11.11.191 +STRL-RHILL 168.11.11.193 168.11.11.255 +STRL-SBORO 168.11.9.1 168.11.9.255 +STRL-SWAIN 168.11.133.193 168.11.133.255 +SWGRL-DEC 168.10.9.0 168.10.9.255 +SWGRL-MIL 168.10.20.1 168.10.20.64 +SWGRL-SEM 168.10.20.64 168.10.20.127 +TLLS-LS 168.10.140.129 168.10.140.254 +TLLS-MV 168.10.129.130 168.10.129.190 +TRRL-BRANT 168.11.13.1 168.11.13.63 +TRRL-CAMDN 168.11.13.65 168.11.13.127 +TRRL-CHARL 168.11.4.65 168.11.4.127 +TRRL-GLYNN 168.11.58.0 168.11.58.254 +TRRL-LONG 168.11.4.193 168.11.4.255 +TRRL-MCINT 168.11.4.129 168.11.4.191 +TRRL-STMRY 168.11.10.1 168.11.10.63 +TRRL-WAYNE 168.11.10.65 168.11.10.127 +URRLS-GR 168.8.12.129 168.8.12.192 +URRLS-HA 168.11.129.129 168.11.129.192 +URRLS-JA 168.8.12.193 168.8.12.255 +URRLS-MA 168.8.13.0 168.8.13.255 +URRLS-MR 168.8.14.0 168.8.14.64 +URRLS-OK 168.8.14.65 168.8.14.128 +URRLS-PU 168.8.12.65 168.8.12.128 +URRLS-SC 168.8.14.129 168.8.14.192 +WGRL-BO 168.8.26.129 168.8.26.191 +WGRL-BR 168.8.26.193 168.8.26.255 +WGRL-BU 168.9.117.64 168.9.117.127 +WGRL-DC 168.8.21.1 168.8.21.128 +WGRL-FR 168.8.25.65 168.8.25.127 +WGRL-HQ 168.8.19.1 168.8.19.255 +WGRL-LS 168.8.25.129 168.8.25.191 +WGRL-MR 168.8.25.193 168.8.25.255 +WGRL-NG 168.8.21.129 168.8.21.254 +WGRL-PC 168.8.22.1 168.8.22.128 +WGRL-TA 168.8.26.1 168.8.26.63 +WGRL-VR 168.8.26.65 168.8.26.127 +PIED-WIN 168.8.201.1 168.8.201.127 +PIED-COM 168.8.204.1 168.8.204.63 +PIED-HOM 168.8.203.193 168.8.203.254 +PIED-JEF 168.8.204.129 168.8.204.191 +PIED-NIC 168.8.204.65 168.8.204.127 +PIED-AUB 168.9.33.66 168.9.33.126 +PIED-STA 168.8.234.2 168.8.234.12 +PIED-BRL 168.9.58.1 168.9.58.64 +PIED-MAY 168.8.204.192 168.8.204.254 +PIED-JEF 24.196.224.38 24.196.224.38 +STATELIB-L 168.28.68.256 168.28.68.257 +ARL-ATH 168.12.1.1 168.12.1.254 +ARL-ATH 168.28.68.1 168.28.68.254 +ARL-ATH 168.24.85.36 168.24.85.38 +ARL-ATH 192.168.100.1 192.168.100.254 +ARL-ATH 68.156.6.1 68.156.6.254 +ARL-BOG 168.12.3.1 168.12.3.254 +ARL-DAN 168.12.7.1 168.12.7.254 +ARL-EAST 168.12.4.1 168.12.4.254 +ARL-LAV 168.12.5.1 168.12.5.254 +ARL-LAY 168.12.6.1 168.12.6.254 +ARL-LEX 168.12.10.1 168.12.10.254 +ARL-ROY 168.12.11.1 168.12.11.254 +ARL-WAT 168.12.8.1 168.12.8.254 +ARL-WINT 168.12.12.1 168.12.12.254 +BROOK-HQ 168.13.1.1 168.13.1.254 +BTRL-MCD 168.12.51.1 168.12.51.254 +BTRL-MWL 168.12.49.1 168.12.49.254 +BTRL-TCL 168.12.50.1 168.12.50.254 +CHAT-SMRVL 168.12.63.1 168.12.63.254 +CHAT-TRION 168.12.64.1 168.12.64.254 +CHRL-CHICK 168.12.65.1 168.12.65.254 +CHRL-DADE 168.12.66.1 168.12.66.254 +CHRL-LW 168.12.67.1 168.12.67.254 +CHRL-ROSS 168.12.68.1 168.12.68.254 +CLAYTN-FOR 168.12.73.1 168.12.73.254 +CLAYTN-HQS 168.12.71.1 168.12.71.254 +CLAYTN-JON 168.12.74.1 168.12.74.254 +CLAYTN-MOR 168.12.75.1 168.12.75.254 +CLAYTN-RIV 168.12.76.1 168.12.76.254 +CPRL-A 168.13.7.1 168.13.7.254 +CPRL-B 168.13.2.1 168.13.2.254 +CPRL-C 168.13.4.1 168.13.4.254 +CPRL-L 168.13.5.1 168.13.5.254 +CPRL-R 168.13.3.1 168.13.3.254 +CPRL-T 168.13.6.1 168.13.6.254 +CRLS-DAWSN 168.12.69.1 168.12.69.254 +CRLS-LMPKN 168.12.70.1 168.12.70.254 +DCPL-CEN 168.13.14.1 168.13.14.254 +DCPL-NW 168.13.16.1 168.13.16.254 +DCPL-SS 168.13.17.1 168.13.17.254 +DCPL-TAL 168.13.18.1 168.13.18.254 +DCPL-WT 168.13.19.1 168.13.19.254 +DTRL-BAKR 168.13.8.1 168.13.8.254 +DTRL-BLAK 168.13.11.1 168.13.11.254 +DTRL-CAMI 168.13.9.1 168.13.9.254 +DTRL-JAKN 168.13.10.1 168.13.10.254 +DTRL-PELH 168.13.13.1 168.13.13.254 +DTRL-SYLV 168.13.12.1 168.13.12.254 +ECGR-APPBY 168.13.192.1 168.13.192.254 +ECGR-AVTBC 168.13.205.1 168.13.205.254 +ECGR-BURKE 168.13.193.1 168.13.193.254 +ECGR-EUCHE 168.13.195.1 168.13.195.254 +ECGR-FRMAN 168.13.196.1 168.13.196.254 +ECGR-GIBBS 168.13.194.1 168.13.194.254 +ECGR-GLSCK 168.13.197.1 168.13.197.254 +ECGR-HARLM 168.13.198.1 168.13.198.254 +ECGR-LINCN 168.13.201.1 168.13.201.254 +ECGR-MAIN 168.13.199.1 168.13.199.254 +ECGR-MIDVL 168.13.203.1 168.13.203.254 +ECGR-MXWLL 168.13.202.1 168.13.202.254 +ECGR-SRDIS 168.13.204.1 168.13.204.254 +ECGR-WALLC 168.13.206.1 168.13.206.254 +ECGR-WARRN 168.13.207.1 168.13.207.254 +ECPL-BWMN 168.12.102.1 168.12.102.254 +ECPL-ECPL 168.12.103.1 168.12.103.254 +FBHCL-MAIN 168.13.20.1 168.13.20.254 +FRRLS-BA 168.12.104.1 168.12.104.254 +FRRLS-FA 168.12.105.1 168.12.105.254 +FRRLS-FY 168.12.111.1 168.12.111.254 +FRRLS-GR 168.12.107.1 168.12.107.254 +FRRLS-JA 168.12.110.1 168.12.110.254 +FRRLS-PT 168.12.112.1 168.12.112.254 +FRRLS-TY 168.12.113.1 168.12.113.254 +FRRLS-ZE 168.12.109.1 168.12.109.254 +HALL-BPL 168.12.118.1 168.12.118.254 +HALL-CL 168.12.119.1 168.12.119.254 +HALL-EH 168.12.120.1 168.12.120.254 +HALL-GVL 168.12.121.1 168.12.121.254 +HALL-MV 168.12.123.1 168.12.123.254 +HART-HQ 168.12.124.1 168.12.124.254 +HCLS-HA 168.12.126.1 168.12.126.254 +HCLS-LG 168.12.128.1 168.12.128.254 +HCLS-MD 168.12.127.1 168.12.127.254 +HCLS-ST 168.12.125.1 168.12.125.254 +HOU-CV 168.13.128.1 168.13.128.254 +HOU-PE 168.13.130.1 168.13.130.254 +HOU-WR 168.13.129.1 168.13.129.254 +JCL-LVILLE 168.13.208.1 168.13.208.254 +JCL-WADLEY 168.13.210.1 168.13.210.254 +JCL-WRENS 168.13.209.1 168.13.209.254 +KRLS-CA 168.13.21.1 168.13.21.254 +KRLS-CL 168.13.22.1 168.13.22.254 +KRLS-RA 168.13.23.1 168.13.23.254 +KRLS-TE 168.13.24.1 168.13.24.254 +KRLS-WE 168.13.26.1 168.13.26.254 +LEE-LSB 168.13.34.1 168.13.34.254 +LEE-SMV 168.13.36.1 168.13.36.254 +MCCLS-DOE 168.13.37.1 168.13.37.254 +MCCLS-HQ 168.13.38.1 168.13.38.254 +MGRL-EW 168.13.132.1 168.13.132.254 +MGRL-GO 168.13.133.1 168.13.133.254 +MGRL-ID 168.13.134.1 168.13.134.254 +MGRL-JO 168.13.135.1 168.13.135.254 +MGRL-MA 168.13.136.1 168.13.136.254 +MGRL-MO 168.13.137.1 168.13.137.254 +MGRL-OG 168.13.138.1 168.13.138.254 +MGRL-RC 168.13.140.1 168.13.140.254 +MGRL-RO 168.13.131.1 168.13.131.254 +MGRL-RV 168.13.139.1 168.13.139.254 +MGRL-SH 168.13.141.1 168.13.141.254 +MGRL-TW 168.13.142.1 168.13.142.254 +MGRL-WA 168.13.143.1 168.13.143.254 +MGRL-WB 168.13.145.1 168.13.145.254 +MRLS-FCPL 168.12.129.1 168.12.129.254 +MRLS-MRL 168.12.130.1 168.12.130.254 +MRLS-TCPL 168.12.131.1 168.12.131.254 +MRLS-UCPL 168.12.132.1 168.12.132.254 +NCLS-COVTN 168.12.133.1 168.12.133.254 +NEG-CLRKVL 168.12.135.1 168.12.135.254 +NEG-CLVLND 168.12.141.1 168.12.141.254 +NEG-CORNEL 168.12.137.1 168.12.137.254 +NEG-HELEN 168.12.140.1 168.12.140.254 +NEG-RABUN 168.12.138.1 168.12.138.254 +NEG-TOCCOA 168.12.139.1 168.12.139.254 +OCRL-DUBLN 168.13.154.1 168.13.154.254 +OCRL-SANDR 168.13.156.1 168.13.156.254 +OCRL-SOPER 168.13.157.1 168.13.157.254 +OCRL-WRIGH 168.13.153.1 168.13.153.254 +OHOOP-LADS 168.13.86.1 168.13.86.254 +OHOOP-LYON 168.13.88.1 168.13.88.254 +OHOOP-MONT 168.13.87.1 168.13.87.254 +OHOOP-TATG 168.13.85.1 168.13.85.254 +OHOOP-TATR 168.13.89.1 168.13.89.254 +OHOOP-VIDT 168.13.90.1 168.13.90.254 +OKRL-APPL 168.13.92.1 168.13.92.254 +OKRL-BACON 168.13.91.1 168.13.91.254 +OKRL-BLMEM 168.13.93.1 168.13.93.254 +OKRL-CLNCH 168.13.94.1 168.13.94.254 +OKRL-MA 168.13.95.1 168.13.95.254 +OKRL-WWC 168.13.96.1 168.13.96.254 +PIED-AUB 168.12.148.1 168.12.148.254 +PIED-BRL 168.12.157.1 168.12.157.254 +PIED-COM 168.12.150.1 168.12.150.254 +PIED-HOM 168.12.149.1 168.12.149.254 +PIED-JEF 168.12.152.1 168.12.152.254 +PIED-MAY 168.12.153.1 168.12.153.254 +PIED-NIC 168.12.151.1 168.12.151.254 +PIED-STA 168.12.156.1 168.12.156.254 +PIED-WIN 168.12.154.1 168.12.154.254 +PMRLS-BPL 168.12.159.1 168.12.159.254 +PMRLS-GPL 168.12.160.1 168.12.160.254 +PMRLS-HML 168.12.161.1 168.12.161.254 +PMRLS-MPL 168.12.163.1 168.12.163.254 +PMRLS-RCL 168.12.164.1 168.12.164.254 +PMRLS-TCL 168.12.165.1 168.12.165.254 +PMRLS-YPL 168.12.158.1 168.12.158.254 +PPL-BPL 168.13.158.1 168.13.158.254 +PPL-TPL 168.13.159.1 168.13.159.254 +RML-MAIN 168.13.40.1 168.13.40.254 +ROCK-NG 168.12.77.1 168.12.77.254 +SHRL-CD 168.12.167.1 168.12.167.254 +SHRL-CS 168.12.166.1 168.12.166.254 +SHRL-RK 168.12.168.1 168.12.168.254 +SHRL-RM 168.12.170.1 168.12.170.254 +SJRLS-JCML 168.13.211.1 168.13.211.254 +SJRLS-SCL 168.13.212.1 168.13.212.254 +SRL-AMBR 168.13.98.1 168.13.98.254 +SRL-BROX 168.13.99.1 168.13.99.254 +SRL-DOUG 168.13.100.1 168.13.100.254 +SRL-JDHAZ 168.13.102.1 168.13.102.254 +SRL-NICH 168.13.103.1 168.13.103.254 +SRL-PEAR 168.13.104.1 168.13.104.254 +SRL-WILLA 168.13.105.1 168.13.105.254 +STRL-CLAX 168.13.106.1 168.13.106.254 +STRL-METT 168.13.108.1 168.13.108.254 +STRL-PEMB 168.13.109.1 168.13.109.254 +STRL-RHILL 168.13.110.1 168.13.110.254 +STRL-SBORO 168.13.111.1 168.13.111.254 +STRL-SWAIN 168.13.107.1 168.13.107.254 +SWGRL-DEC 168.13.49.1 168.13.49.254 +SWGRL-MIL 168.13.50.1 168.13.50.254 +SWGRL-SEM 168.13.51.1 168.13.51.254 +TLLS-LS 168.13.161.1 168.13.161.254 +TLLS-MV 168.13.162.1 168.13.162.254 +TRRL-BRANT 168.13.113.1 168.13.113.254 +TRRL-CAMDN 168.13.116.1 168.13.116.254 +TRRL-CHARL 168.13.117.1 168.13.117.254 +TRRL-GLYNN 168.13.114.1 168.13.114.254 +TRRL-LONG 168.13.119.1 168.13.119.254 +TRRL-MCINT 168.13.118.1 168.13.118.254 +TRRL-STMRY 168.13.120.1 168.13.120.254 +TRRL-WAYNE 168.13.121.1 168.13.121.254 +URRLS-GR 168.12.188.1 168.12.188.254 +URRLS-HA 168.12.189.1 168.12.189.254 +URRLS-JA 168.12.190.1 168.12.190.254 +URRLS-MA 168.12.193.1 168.12.193.254 +URRLS-MR 168.12.191.1 168.12.191.254 +URRLS-OK 168.12.194.1 168.12.194.254 +URRLS-PU 168.12.187.1 168.12.187.254 +URRLS-SC 168.12.195.1 168.12.195.254 +WGRL-BO 168.12.207.1 168.12.207.254 +WGRL-BR 168.12.208.1 168.12.208.254 +WGRL-BU 168.12.196.1 168.12.196.254 +WGRL-DC 168.12.197.1 168.12.197.254 +WGRL-FR 168.12.198.1 168.12.198.254 +WGRL-HQ 168.12.202.1 168.12.202.254 +WGRL-LS 168.12.199.1 168.12.199.254 +WGRL-MR 168.12.200.1 168.12.200.254 +WGRL-NG 168.12.203.1 168.12.203.254 +WGRL-PC 168.12.204.1 168.12.204.254 +WGRL-TA 168.12.205.1 168.12.205.254 +WGRL-VR 168.12.206.1 168.12.206.254 diff --git a/Evergreen/conf/load_ips.pl b/Evergreen/conf/load_ips.pl new file mode 100755 index 0000000000..4cc6001de0 --- /dev/null +++ b/Evergreen/conf/load_ips.pl @@ -0,0 +1,30 @@ +#!/usr/bin/perl +use strict; use warnings; + + +# This file should be loaded by apache on startup (add to a "startup.pl" file) + +open(F,"lib_ips.txt"); + +$OpenILS::WWW::Redirect::lib_ips_hash = {}; +my $hash = $OpenILS::WWW::Redirect::lib_ips_hash; + + +while( my $data = ) { + + chomp($data); + + my( $reglib, $ip1, $ip2 ) = split(/\t/, $data); + next unless ($reglib and $ip1 and $ip2); + + my( $reg, $lib ) = split(/-/,$reglib); + next unless ($reg and $lib); + +# print "$reg : $lib : $ip1 : $ip2\n"; + + $hash->{$reg} = {} unless exists $hash->{$reg}; + $hash->{$reg}->{$lib} = [] unless exists $hash->{$reg}->{$lib}; + + push( @{$hash->{$reg}->{$lib}}, [ $ip1, $ip2 ] ); +} + diff --git a/Open-ILS/src/apachemods/mod_xmlbuilder.c b/Open-ILS/src/apachemods/mod_xmlbuilder.c index b0df4f9291..71875f80b7 100644 --- a/Open-ILS/src/apachemods/mod_xmlbuilder.c +++ b/Open-ILS/src/apachemods/mod_xmlbuilder.c @@ -143,7 +143,7 @@ static int xmlBuilderHandler( request_rec* r ) { } char* docXML = xmlDocToString( doc, 1 ); - apacheDebug("DOC:\n%s\n%s", docXML); + //apacheDebug("DOC:\n%s\n%s", docXML); ap_rputs(docXML, r); free(docXML); xmlFreeDoc( doc ); diff --git a/Open-ILS/src/perlmods/OpenILS/WWW/Redirect.pm b/Open-ILS/src/perlmods/OpenILS/WWW/Redirect.pm index 12889877e3..6fa1d53e4b 100644 --- a/Open-ILS/src/perlmods/OpenILS/WWW/Redirect.pm +++ b/Open-ILS/src/perlmods/OpenILS/WWW/Redirect.pm @@ -40,7 +40,7 @@ sub handler { my $proto = "http"; if($cgi->https) { $proto = "https"; } - my $url = "$proto://$hostname:$port/opac/"; + my $url = "$proto://$hostname:$port/opac/skin/default/xml/index.xml"; my $path = $apache_obj->path_info(); @@ -62,8 +62,8 @@ sub handler { } -# print "Location: $url\n\n"; -# return Apache::REDIRECT; + print "Location: $url\n\n"; + return Apache2::Const::REDIRECT; return print_page($url); } @@ -76,19 +76,20 @@ sub redirect_libs { # do this the linear way for now... for my $reg (keys %$lib_ips_hash) { + for my $lib( keys %{$lib_ips_hash->{$reg}} ) { - for my $ip_block (@{$lib_ips_hash->{$reg}->{$lib}}) { - if(defined($ip_block->[0]) && defined($ip_block->[1]) ) { - my $start_binary = inet_aton( $ip_block->[0] ); - my $end_binary = inet_aton( $ip_block->[1] ); + for my $block (@{$lib_ips_hash->{$reg}->{$lib}}) { + + if(defined($block->[0]) && defined($block->[1]) ) { + my $start_binary = inet_aton( $block->[0] ); + my $end_binary = inet_aton( $block->[1] ); unless( $start_binary and $end_binary ) { next; } if( $start_binary le $aton_binary and $end_binary ge $aton_binary ) { return [ $reg, $lib ]; } } - } } } @@ -122,7 +123,7 @@ sub print_page {

Loading...



-
+
HTML diff --git a/install.sh b/install.sh index aa605752e2..b101a5c8da 100755 --- a/install.sh +++ b/install.sh @@ -209,6 +209,7 @@ function runInstall { "evergreen_core" ) if installing; then $MAKE -C "$EVERGREENDIR" "circ-install"; fi; + if installing; then $MAKE -C "$EVERGREENDIR" "iplist-install"; fi; ;; "evergreen_xul_client" ) -- 2.43.2