extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-08-09 23:54:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cosmetic changes to generated script

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6766 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep
2007-07-03 18:22:36 +00:00
parent 70690de951
commit 82428d66bc
3 changed files with 61 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
Shorewall-perl/Shorewall/Compiler.pm
View File

@ -84,29 +84,13 @@ sub reinitialize() {
sub generate_script_1() {
copy $globals{SHAREDIRPL} . 'prog.header';
my $date = localtime;
emit "#\n# Compiled firewall script generated by Shorewall-perl $globals{VERSION} - $date\n#";
emit "#!/bin/sh\n#\n# Compiled firewall script generated by Shorewall-perl $globals{VERSION} - $date\n#";
if ( $export ) {
emitj ( 'SHAREDIR=/usr/share/shorewall-lite',
'CONFDIR=/etc/shorewall-lite',
'VARDIR=/var/lib/shorewall-lite',
'PRODUCT="Shorewall Lite"'
);
} else {
emitj ( 'SHAREDIR=/usr/share/shorewall',
'CONFDIR=/etc/shorewall',
'VARDIR=/var/lib/shorewall',
'PRODUCT=\'Shorewall\'',
);
}
copy $globals{SHAREDIRPL} . 'prog.header';
emit "TEMPFILE=\n";
for my $exit qw/init start tcclear started stop stopped clear/ {
for my $exit qw/init start tcclear started stop stopped clear refresh/ {
emit "run_${exit}_exit() {";
push_indent;
append_file $exit or emit 'true';
@ -123,12 +107,28 @@ sub generate_script_1() {
push_indent;
if ( $export ) {
emitj ( 'SHAREDIR=/usr/share/shorewall-lite',
'CONFDIR=/etc/shorewall-lite',
'VARDIR=/var/lib/shorewall-lite',
'PRODUCT="Shorewall Lite"'
);
} else {
emitj ( 'SHAREDIR=/usr/share/shorewall',
'CONFDIR=/etc/shorewall',
'VARDIR=/var/lib/shorewall',
'PRODUCT=\'Shorewall\'',
);
}
if ( $export ) {
emit ( 'CONFIG_PATH="/etc/shorewall-lite:/usr/share/shorewall-lite"' );
} else {
emit ( qq(CONFIG_PATH="$config{CONFIG_PATH}") );
}
emit 'TEMPFILE=';
propagateconfig;
emitj ( '[ -n "${COMMAND:=restart}" ]',
@ -627,14 +627,17 @@ if [ $COMMAND = restore ]; then
fi
set_state "Started"
else
setup_netfilter
restore_dynamic_rules
run_start_exit
$IPTABLES -N shorewall
set_state "Started"
run_started_exit
cp -f $(my_pathname) ${VARDIR}/.restore
if [ $COMMAND = refresh ]; then
run_refresh_exit
else
setup_netfilter
restore_dynamic_rules
run_start_exit
$IPTABLES -N shorewall
set_state "Started"
run_started_exit
cp -f $(my_pathname) ${VARDIR}/.restore
fi
fi
date > ${VARDIR}/restarted