Merge remote-tracking branch 'Chocobo1/typo'

This commit is contained in:
Thomas Bernard 2015-04-26 16:29:08 +02:00
commit a224264194
1 changed files with 43 additions and 46 deletions

View File

@ -1,143 +1,141 @@
# WAN network interface # WAN network interface
#ext_ifname=eth1 #ext_ifname=eth1
#ext_ifname=xl1 #ext_ifname=xl1
# if the WAN interface has several IP addresses, you # If the WAN interface has several IP addresses, you
# can specify the one to use below # can specify the one to use below
#ext_ip= #ext_ip=
# LAN network interfaces IPs / networks # LAN network interfaces IPs / networks
# there can be multiple listening ips for SSDP traffic. # There can be multiple listening IPs for SSDP traffic
# should be under the form nnn.nnn.nnn.nnn/nn # It can be IP address or network interface name (ie. "eth0")
# It can also be the network interface name (ie "eth0") # It is mandatory to use the network interface name in order to enable IPv6
# It if mandatory to use the network interface name to enable IPv6
# HTTP is available on all interfaces. # HTTP is available on all interfaces.
# When MULTIPLE_EXTERNAL_IP is enabled, the external ip # When MULTIPLE_EXTERNAL_IP is enabled, the external IP
# address associated with the subnet follows. for example : # address associated with the subnet follows. For example:
# listening_ip=192.168.0.1/24 88.22.44.13 # listening_ip=192.168.0.1/24 88.22.44.13
#listening_ip=192.168.0.1/24 #listening_ip=192.168.0.1/24
#listening_ip=10.5.0.0/16 #listening_ip=10.5.0.0/16
#listening_ip=eth0 #listening_ip=eth0
# CAUTION: mixing up WAN and LAN interfaces may introduce security risks! # CAUTION: mixing up WAN and LAN interfaces may introduce security risks!
# be sure to assign the correct interfaces to LAN and WAN and consider # Be sure to assign the correct interfaces to LAN and WAN and consider
# implementing UPnP permission rules at the bottom of this configuration file # implementing UPnP permission rules at the bottom of this configuration file
# port for HTTP (descriptions and SOAP) traffic. set 0 for autoselect. # Port for HTTP (descriptions and SOAP) traffic. Set to 0 for autoselect.
#http_port=0 #http_port=0
# port for HTTPS. set to 0 for autoselect (default) # Port for HTTPS. Set to 0 for autoselect (default)
#https_port=0 #https_port=0
# path to the unix socket used to communicate with MiniSSDPd # Path to the UNIX socket used to communicate with MiniSSDPd
# If running, MiniSSDPd will manage M-SEARCH answering. # If running, MiniSSDPd will manage M-SEARCH answering.
# default is /var/run/minissdpd.sock # default is /var/run/minissdpd.sock
#minissdpdsocket=/var/run/minissdpd.sock #minissdpdsocket=/var/run/minissdpd.sock
# enable NAT-PMP support (default is no) # Enable NAT-PMP support (default is no)
#enable_natpmp=yes #enable_natpmp=yes
# enable UPNP support (default is yes) # Enable UPNP support (default is yes)
#enable_upnp=no #enable_upnp=no
# PCP : # PCP
# configure minimal and maximal lifetime of the port mapping in seconds # Configure the minimum and maximum lifetime of a port mapping in seconds
# 120s and 86400s (24h) are suggested values from PCP-base # 120s and 86400s (24h) are suggested values from PCP-base
#min_lifetime=120 #min_lifetime=120
#max_lifetime=86400 #max_lifetime=86400
# chain names for netfilter (not used for pf or ipf). # Chain names for netfilter (not used for pf or ipf).
# default is MINIUPNPD for both # default is MINIUPNPD for both
#upnp_forward_chain=forwardUPnP #upnp_forward_chain=forwardUPnP
#upnp_nat_chain=UPnP #upnp_nat_chain=UPnP
# lease file location # Lease file location
#lease_file=/var/log/upnp.leases #lease_file=/var/log/upnp.leases
# to enable the next few runtime options, see compile time # To enable the next few runtime options, see compile time
# ENABLE_MANUFACTURER_INFO_CONFIGURATION (config.h) # ENABLE_MANUFACTURER_INFO_CONFIGURATION (config.h)
# name of this service, default is "`uname -s` router" # Name of this service, default is "`uname -s` router"
#friendly_name=MiniUPnPd router #friendly_name=MiniUPnPd router
# manufacturer name, default is "`uname -s`" # Manufacturer name, default is "`uname -s`"
#manufacturer_name=Manufacturer corp #manufacturer_name=Manufacturer corp
# manufacturer url, default is URL of OS verndor # Manufacturer URL, default is URL of OS vendor
#manufacturer_url=http://miniupnp.free.fr/ #manufacturer_url=http://miniupnp.free.fr/
# model name, default is "`uname -s` router" # Model name, default is "`uname -s` router"
#model_name=Router Model #model_name=Router Model
# model description, default is "`uname -s` router" # Model description, default is "`uname -s` router"
#model_description=Very Secure Router - Model #model_description=Very Secure Router - Model
# model url, default is URL of OS vendor # Model URL, default is URL of OS vendor
#model_url=http://miniupnp.free.fr/ #model_url=http://miniupnp.free.fr/
# bitrates reported by daemon in bits per second # Bitrates reported by daemon in bits per second
# by default miniupnpd tries to get WAN interface speed # by default miniupnpd tries to get WAN interface speed
#bitrate_up=1000000 #bitrate_up=1000000
#bitrate_down=10000000 #bitrate_down=10000000
# "secure" mode : when enabled, UPnP client are allowed to add mappings only # Secure Mode, UPnP clients can only add mappings to their own IP
# to their IP.
#secure_mode=yes #secure_mode=yes
secure_mode=no secure_mode=no
# default presentation url is http address on port 80 # Default presentation URL is HTTP address on port 80
# If set to an empty string, no presentationURL element will appear # If set to an empty string, no presentationURL element will appear
# in the XML description of the device, which prevents MS Windows # in the XML description of the device, which prevents MS Windows
# from displaying an icon in the "Network Connections" panel. # from displaying an icon in the "Network Connections" panel.
#presentation_url=http://www.mylan/index.php #presentation_url=http://www.mylan/index.php
# report system uptime instead of daemon uptime # Report system uptime instead of daemon uptime
system_uptime=yes system_uptime=yes
# notify interval in seconds. default is 30 seconds. # Notify interval in seconds. default is 30 seconds.
#notify_interval=240 #notify_interval=240
notify_interval=60 notify_interval=60
# unused rules cleaning. # Unused rules cleaning.
# never remove any rule before this threshold for the number # never remove any rule before this threshold for the number
# of redirections is exceeded. default to 20 # of redirections is exceeded. default to 20
#clean_ruleset_threshold=10 #clean_ruleset_threshold=10
# clean process work interval in seconds. default to 0 (disabled). # Clean process work interval in seconds. default to 0 (disabled).
# a 600 seconds (10 minutes) interval makes sense # a 600 seconds (10 minutes) interval makes sense
clean_ruleset_interval=600 clean_ruleset_interval=600
# log packets in pf (default is no) # Log packets in pf (default is no)
#packet_log=no #packet_log=no
# anchor name in pf (default is miniupnpd) # Anchor name in pf (default is miniupnpd)
#anchor=miniupnpd #anchor=miniupnpd
# ALTQ queue in pf # ALTQ queue in pf
# filter rules must be used for this to be used. # Filter rules must be used for this to be used.
# compile with PF_ENABLE_FILTER_RULES (see config.h file) # compile with PF_ENABLE_FILTER_RULES (see config.h file)
#queue=queue_name1 #queue=queue_name1
# tag name in pf # Tag name in pf
#tag=tag_name1 #tag=tag_name1
# make filter rules in pf quick or not. default is yes # Make filter rules in pf quick or not. default is yes
# active when compiled with PF_ENABLE_FILTER_RULES (see config.h file) # active when compiled with PF_ENABLE_FILTER_RULES (see config.h file)
#quickrules=no #quickrules=no
# uuid : generate your own with "make genuuid" # UUID, generate your own UUID with "make genuuid"
uuid=00000000-0000-0000-0000-000000000000 uuid=00000000-0000-0000-0000-000000000000
# serial and model number the daemon will report to clients # Daemon's serial and model number when reporting to clients
# in its XML description # (in XML description)
#serial=12345678 #serial=12345678
#model_number=1 #model_number=1
# UPnP permission rules # UPnP permission rules
# (allow|deny) (external port range) ip/mask (internal port range) # (allow|deny) (external port range) IP/mask (internal port range)
# A port range is <min port>-<max port> or <port> if there is only # A port range is <min port>-<max port> or <port> if there is only
# one port in the range. # one port in the range.
# ip/mask format must be nn.nn.nn.nn/nn # IP/mask format must be nnn.nnn.nnn.nnn/nn
# it is advised to only allow redirection of port above 1024 # It is advised to only allow redirection of port >= 1024
# and to finish the rule set with "deny 0-65535 0.0.0.0/0 0-65535" # and end the rule set with "deny 0-65535 0.0.0.0/0 0-65535"
# The following default ruleset allows specific LAN side IP addresses # The following default ruleset allows specific LAN side IP addresses
# to request only ephemeral ports. it is recommended that users # to request only ephemeral ports. It is recommended that users
# modify the IP ranges to match their own internal networks, and # modify the IP ranges to match their own internal networks, and
# also consider implementing network-specific restrictions # also consider implementing network-specific restrictions
# CAUTION: failure to enforce any rules may permit insecure requests to be made! # CAUTION: failure to enforce any rules may permit insecure requests to be made!
@ -146,4 +144,3 @@ allow 1024-65535 192.168.1.0/24 1024-65535
allow 1024-65535 192.168.0.0/23 22 allow 1024-65535 192.168.0.0/23 22
allow 12345 192.168.7.113/32 54321 allow 12345 192.168.7.113/32 54321
deny 0-65535 0.0.0.0/0 0-65535 deny 0-65535 0.0.0.0/0 0-65535