forked from extern/shorewall_code
Revert "Add SHARED_CONFIG option to shorewallrc"
This reverts commit 4e978b687d
.
This commit is contained in:
parent
b9b7baf98d
commit
d1a21fb678
3
Shorewall-core/configure
vendored
3
Shorewall-core/configure
vendored
@ -236,8 +236,7 @@ for on in \
|
|||||||
ANNOTATED \
|
ANNOTATED \
|
||||||
VARLIB \
|
VARLIB \
|
||||||
VARDIR \
|
VARDIR \
|
||||||
DEFAULT_PAGER \
|
DEFAULT_PAGER
|
||||||
SHARED_CONFIG
|
|
||||||
do
|
do
|
||||||
echo "$on=${options[${on}]}"
|
echo "$on=${options[${on}]}"
|
||||||
echo "$on=${options[${on}]}" >> shorewallrc
|
echo "$on=${options[${on}]}" >> shorewallrc
|
||||||
|
@ -210,8 +210,7 @@ for ( qw/ HOST
|
|||||||
ANNOTATED
|
ANNOTATED
|
||||||
VARLIB
|
VARLIB
|
||||||
VARDIR
|
VARDIR
|
||||||
DEFAULT_PAGER
|
DEFAULT_PAGER / ) {
|
||||||
SHARED_CONFIG / ) {
|
|
||||||
|
|
||||||
my $val = $options{$_} || '';
|
my $val = $options{$_} || '';
|
||||||
|
|
||||||
|
@ -20,4 +20,3 @@ SYSCONFDIR= #Unused on OS X
|
|||||||
SPARSE=Yes #Only install $PRODUCT/$PRODUCT.conf in $CONFDIR.
|
SPARSE=Yes #Only install $PRODUCT/$PRODUCT.conf in $CONFDIR.
|
||||||
VARLIB=/var/lib #Unused on OS X
|
VARLIB=/var/lib #Unused on OS X
|
||||||
DEFAULT_PAGER= #Pager to use if none specified in shorewall[6].conf
|
DEFAULT_PAGER= #Pager to use if none specified in shorewall[6].conf
|
||||||
SHARED_CONFIG= #Configuration serves both Shorewall and Shorewall6
|
|
||||||
|
@ -21,4 +21,3 @@ SPARSE= #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
|
|||||||
VARLIB=/var/lib #Directory where product variable data is stored.
|
VARLIB=/var/lib #Directory where product variable data is stored.
|
||||||
VARDIR=${VARLIB}/$PRODUCT #Directory where product variable data is stored.
|
VARDIR=${VARLIB}/$PRODUCT #Directory where product variable data is stored.
|
||||||
DEFAULT_PAGER= #Pager to use if none specified in shorewall[6].conf
|
DEFAULT_PAGER= #Pager to use if none specified in shorewall[6].conf
|
||||||
SHARED_CONFIG= #Configuration serves both Shorewall and Shorewall6
|
|
||||||
|
@ -20,4 +20,3 @@ SYSCONFDIR= #Unused on Cygwin
|
|||||||
SPARSE=Yes #Only install $PRODUCT/$PRODUCT.conf in $CONFDIR.
|
SPARSE=Yes #Only install $PRODUCT/$PRODUCT.conf in $CONFDIR.
|
||||||
VARLIB=/var/lib #Unused on Cygwin
|
VARLIB=/var/lib #Unused on Cygwin
|
||||||
DEFAULT_PAGER= #Pager to use if none specified in shorewall[6].conf
|
DEFAULT_PAGER= #Pager to use if none specified in shorewall[6].conf
|
||||||
SHARED_CONFIG= #Configuration serves both Shorewall and Shorewall6
|
|
||||||
|
@ -22,4 +22,3 @@ SPARSE=Yes #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
|
|||||||
VARLIB=/var/lib #Directory where product variable data is stored.
|
VARLIB=/var/lib #Directory where product variable data is stored.
|
||||||
VARDIR=${VARLIB}/$PRODUCT #Directory where product variable data is stored.
|
VARDIR=${VARLIB}/$PRODUCT #Directory where product variable data is stored.
|
||||||
DEFAULT_PAGER=/usr/bin/less #Pager to use if none specified in shorewall[6].conf
|
DEFAULT_PAGER=/usr/bin/less #Pager to use if none specified in shorewall[6].conf
|
||||||
SHARED_CONFIG= #Configuration serves both Shorewall and Shorewall6
|
|
||||||
|
@ -22,4 +22,3 @@ SPARSE=Yes #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
|
|||||||
VARLIB=/var/lib #Directory where product variable data is stored.
|
VARLIB=/var/lib #Directory where product variable data is stored.
|
||||||
VARDIR=${VARLIB}/$PRODUCT #Directory where product variable data is stored.
|
VARDIR=${VARLIB}/$PRODUCT #Directory where product variable data is stored.
|
||||||
DEFAULT_PAGER=/usr/bin/less #Pager to use if none specified in shorewall[6].conf
|
DEFAULT_PAGER=/usr/bin/less #Pager to use if none specified in shorewall[6].conf
|
||||||
SHARED_CONFIG= #Configuration serves both Shorewall and Shorewall6
|
|
||||||
|
@ -22,4 +22,3 @@ SPARSE= #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
|
|||||||
VARLIB=/var/lib #Directory where product variable data is stored.
|
VARLIB=/var/lib #Directory where product variable data is stored.
|
||||||
VARDIR=${VARLIB}/$PRODUCT #Directory where product variable data is stored.
|
VARDIR=${VARLIB}/$PRODUCT #Directory where product variable data is stored.
|
||||||
DEFAULT_PAGER= #Pager to use if none specified in shorewall[6].conf
|
DEFAULT_PAGER= #Pager to use if none specified in shorewall[6].conf
|
||||||
SHARED_CONFIG= #Configuration serves both Shorewall and Shorewall6
|
|
||||||
|
@ -22,4 +22,3 @@ SPARSE= #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
|
|||||||
VARLIB=/lib #Directory where product variable data is stored.
|
VARLIB=/lib #Directory where product variable data is stored.
|
||||||
VARDIR=${VARLIB}/$PRODUCT #Directory where product variable data is stored.
|
VARDIR=${VARLIB}/$PRODUCT #Directory where product variable data is stored.
|
||||||
DEFAULT_PAGER= #Pager to use if none specified in shorewall[6].conf
|
DEFAULT_PAGER= #Pager to use if none specified in shorewall[6].conf
|
||||||
SHARED_CONFIG= #Configuration serves both Shorewall and Shorewall6
|
|
||||||
|
@ -22,4 +22,3 @@ SPARSE= #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
|
|||||||
VARLIB=/var/lib #Directory where product variable data is stored.
|
VARLIB=/var/lib #Directory where product variable data is stored.
|
||||||
VARDIR=${VARLIB}/$PRODUCT #Directory where product variable data is stored.
|
VARDIR=${VARLIB}/$PRODUCT #Directory where product variable data is stored.
|
||||||
DEFAULT_PAGER= #Pager to use if none specified in shorewall[6].conf
|
DEFAULT_PAGER= #Pager to use if none specified in shorewall[6].conf
|
||||||
SHARED_CONFIG= #Configuration serves both Shorewall and Shorewall6
|
|
||||||
|
@ -23,4 +23,3 @@ ANNOTATED= #If non-empty, install annotated configuration files
|
|||||||
VARLIB=/var/lib #Directory where product variable data is stored.
|
VARLIB=/var/lib #Directory where product variable data is stored.
|
||||||
VARDIR=${VARLIB}/$PRODUCT #Directory where product variable data is stored.
|
VARDIR=${VARLIB}/$PRODUCT #Directory where product variable data is stored.
|
||||||
DEFAULT_PAGER= #Pager to use if none specified in shorewall[6].conf
|
DEFAULT_PAGER= #Pager to use if none specified in shorewall[6].conf
|
||||||
SHARED_CONFIG= #Configuration serves both Shorewall and Shorewall6
|
|
||||||
|
@ -22,4 +22,3 @@ SPARSE= #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDI
|
|||||||
VARLIB=/var/lib #Directory where persistent product data is stored.
|
VARLIB=/var/lib #Directory where persistent product data is stored.
|
||||||
VARDIR=${VARLIB}/$PRODUCT #Directory where product variable data is stored.
|
VARDIR=${VARLIB}/$PRODUCT #Directory where product variable data is stored.
|
||||||
DEFAULT_PAGER= #Pager to use if none specified in shorewall[6].conf
|
DEFAULT_PAGER= #Pager to use if none specified in shorewall[6].conf
|
||||||
SHARED_CONFIG= #Configuration serves both Shorewall and Shorewall6
|
|
||||||
|
Loading…
Reference in New Issue
Block a user