Changeset 258

Show
Ignore:
Timestamp:
01/06/09 12:42:55 (3 years ago)
Author:
root
Message:

Fixes based on reports from KiJa?

Location:
floppyfw-3.0
Files:
6 modified

Legend:

Unmodified
Added
Removed

  • floppyfw-3.0/makefiles/flash.mk

    r101 r258  
    1818        cp $(SCRIPTS_DIR)/hosts $(FLASH_DIR)/. 
    1919        cp $(SCRIPTS_DIR)/ethers $(FLASH_DIR)/. 
     20        cp $(SCRIPTS_DIR)/ethers $(FLASH_DIR)/dmz-ethers 
    2021        cp $(SCRIPTS_DIR)/firewall.ini $(FLASH_DIR)/. 
    2122        cp $(SCRIPTS_DIR)/network.ini $(FLASH_DIR)/. 

  • floppyfw-3.0/makefiles/floppy.mk

    r182 r258  
    2323        cp $(SCRIPTS_DIR)/config $(BASE_DIR)/floppy/. 
    2424        cp $(SCRIPTS_DIR)/ethers $(BASE_DIR)/floppy/. 
     25        cp $(SCRIPTS_DIR)/ethers $(BASE_DIR)/floppy/dmz-ethers 
    2526        cp $(SCRIPTS_DIR)/hosts $(BASE_DIR)/floppy/. 
    2627        cp $(SCRIPTS_DIR)/firewall.ini $(BASE_DIR)/floppy/. 

  • floppyfw-3.0/makefiles/isoimage.mk

    r77 r258  
    2323        cp $(SCRIPTS_DIR)/hosts $(BASE_DIR)/isoimage/. 
    2424        cp $(SCRIPTS_DIR)/ethers $(BASE_DIR)/isoimage/. 
     25        cp $(SCRIPTS_DIR)/ethers $(BASE_DIR)/isoimage/dmz-ethers 
    2526        cp $(SCRIPTS_DIR)/firewall.ini $(BASE_DIR)/isoimage/. 
    2627        cp $(SCRIPTS_DIR)/network.ini $(BASE_DIR)/isoimage/. 

  • floppyfw-3.0/makefiles/soekris.mk

    r230 r258  
    1818        cp $(SCRIPTS_DIR)/hosts $(SOEKRIS_DIR)/. 
    1919        cp $(SCRIPTS_DIR)/ethers $(SOEKRIS_DIR)/. 
     20        cp $(SCRIPTS_DIR)/ethers $(SOEKRIS_DIR)/dmz-ethers 
    2021        cp $(SCRIPTS_DIR)/firewall.ini $(SOEKRIS_DIR)/. 
    2122        cp $(SCRIPTS_DIR)/network.ini $(SOEKRIS_DIR)/. 

  • floppyfw-3.0/scripts/dmz-fw.ini

    r232 r258  
    2828iptables -A INPUT -i ${DMZ_DEVICE} -p UDP --dport 53 -j ACCEPT 
    2929 
     30if [ "$DMZ_DHCP_SERVER" = y ] 
     31then 
     32  iptables -A INPUT -i ${DMZ_DEVICE} -p TCP --dport 67 -j ACCEPT 
     33  iptables -A INPUT -i ${DMZ_DEVICE} -p UDP --dport 67 -j ACCEPT 
     34  iptables -A INPUT -i ${DMZ_DEVICE} -p TCP --dport 68 -j ACCEPT 
     35  iptables -A INPUT -i ${DMZ_DEVICE} -p UDP --dport 68 -j ACCEPT 
     36fi 
     37 
    3038if [ "$DMZ_USE_NAT" = "y" ] 
    3139 then 
    … …  
    3442 
    3543# Open ports: 
    36 # The big caveat here is thet multiport only supports 15 ports.. 
     44# The big caveat here is that multiport only supports 15 ports.. 
    3745# We will try to pad that by giving the admin more options.. 
    3846if [ -n "$DMZ_ALLOW_TO_OUTSIDE" ] 

  • floppyfw-3.0/scripts/dmz-udhcpd.conf.sh

    r103 r258  
    2424EOF 
    2525 
    26 # Adding the /etc/ethers file: 
     26# Adding the /etc/dmz-ethers file: 
    2727# I'll use the same file for both. shouldn't matter. 
    28 sed -e '/^#/d;/^$/d;s/^/static_lease /' /etc/ethers >> /etc/dmz-udhcpd.conf 
     28sed -e '/^#/d;/^$/d;s/^/static_lease /' /etc/dmz-ethers >> /etc/dmz-udhcpd.conf