smecontribs/smeserver-xt_geoip
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: smecontribs:1_3_1-24_el8_sme
Branches Tags
smecontribs:master
smecontribs:1_3_1-26_el8_sme smecontribs:1_3_1-25_el8_sme smecontribs:1_3_1-24_el8_sme smecontribs:1_3_1-23_el8_sme smecontribs:1.3.1-22
..
compare: smecontribs:master
Branches Tags
smecontribs:master
smecontribs:1_3_1-26_el8_sme smecontribs:1_3_1-25_el8_sme smecontribs:1_3_1-24_el8_sme smecontribs:1_3_1-23_el8_sme smecontribs:1.3.1-22

2 Commits
1_3_1-24_e ... master

Author SHA1 Message Date
John Crisp
02f87475ff * Thu Mar 20 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 1.3.1-26.sme 
- Fix createlink typo remote-access-update [SME: 12438]
 2025-03-20 12:36:51 +01:00
John Crisp
725b2f5418 * Thu Feb 13 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 1.3.1-25.sme 
- Fix various typos as per bug but more to find [SME: 12472]
 2025-02-13 20:07:42 +01:00
5 changed files with 14 additions and 8 deletions
Expand all files Collapse all files

2
createlinks
View File

@@ -38,7 +38,7 @@ for my $event (qw(xt_geoip-update bootstrap-console-save
event_link("smeserver-xt_geoip-download-action", $event, "10"); event_link("smeserver-xt_geoip-download-action", $event, "10");
} }
for my $event (qw(bootstrap-console-save e-smith-packetfilter-update for my $event (qw(bootstrap-console-save e-smith-packetfilter-update
smeserver-xt_geoip-update remote-access-update)) smeserver-xt_geoip-update remoteaccess-update))
{ {
event_link("xt_geoip_kmod", $event, "15"); event_link("xt_geoip_kmod", $event, "15");
} }

2
root/usr/share/smanager/themes/default/templates/partials/_xtg_services.html.ep
View File

@@ -31,7 +31,7 @@
% foreach my $sv (@services) { % foreach my $sv (@services) {
% my $svBC = $sv->prop('BadCountries') || ' '; % my $svBC = $sv->prop('BadCountries') || ' ';
% my $svRev = (( $sv->prop('Xt_geoipRev')|| 'disabled') eq 'disabled' )? '==': '!='; % my $svRev = (( $sv->prop('XTGeoipRev')|| 'disabled') eq 'disabled' )? '==': '!=';
% my $color = 'red'; % my $color = 'red';
% my $deco= "none"; % my $deco= "none";
% if ($svRev eq '!=' ) { $color = 'green'; } % if ($svRev eq '!=' ) { $color = 'green'; }

2
root/usr/share/smanager/themes/default/templates/xt_geoip_upds.html.ep
View File

@@ -44,7 +44,7 @@
<br><span class=label> <br><span class=label>
%=l 'xtg_LABEL_REVERSE_MATCH' %=l 'xtg_LABEL_REVERSE_MATCH'
</span><span class=data> </span><span class=data>
% param 'Masq_srv_reverse' => $c->get_reverse('','Xt_geoipRev') unless param 'Masq_srv_reverse'; % param 'Masq_srv_reverse' => $c->get_reverse('masq','XTGeoipRev') unless param 'Masq_srv_reverse';
%= select_field 'Masq_srv_reverse' => [['!=' => 'enabled'], ['==' => 'disabled']], class => 'input' %= select_field 'Masq_srv_reverse' => [['!=' => 'enabled'], ['==' => 'disabled']], class => 'input'
</span></p> </span></p>

4
root/usr/share/smanager/themes/default/templates/xt_geoip_updt.html.ep
View File

@@ -35,7 +35,7 @@
<br><span class=label> <br><span class=label>
%=l 'xtg_LABEL_REVERSE_MATCH' %=l 'xtg_LABEL_REVERSE_MATCH'
</span><span class=data> </span><span class=data>
% param 'Masq_reverse' => $c->get_reverse('masq','Xt_geoipRev') unless param 'Masq_reverse'; % param 'Masq_reverse' => $c->get_reverse('masq','XTGeoipRev') unless param 'Masq_reverse';
%= select_field 'Masq_reverse' => [[ '!=' => 'enabled'], [ '==' => 'disabled']], class => 'input' %= select_field 'Masq_reverse' => [[ '!=' => 'enabled'], [ '==' => 'disabled']], class => 'input'
</span></p> </span></p>
@@ -59,7 +59,7 @@
<br><span class=label> <br><span class=label>
%=l 'xtg_LABEL_OTHERS' %=l 'xtg_LABEL_OTHERS'
</span><span class=data> </span><span class=data>
% param 'Masq_others' => $c->get_reverse('masq','Xt_geoipOther') unless param 'Masq_others'; % param 'Masq_others' => $c->get_reverse('masq','XT_GeoipOther') unless param 'Masq_others';
%= select_field 'Masq_others' => [[(l 'DISABLED') => 'disabled'], [(l 'ENABLED') => 'enabled']], class => 'input' %= select_field 'Masq_others' => [[(l 'DISABLED') => 'disabled'], [(l 'ENABLED') => 'enabled']], class => 'input'
</span></p> </span></p>

12
smeserver-xt_geoip.spec
View File

@@ -1,6 +1,6 @@
%define name smeserver-xt_geoip %define name smeserver-xt_geoip
%define version 1.3.1 %define version 1.3.1
%define release 24 %define release 26
Summary: smserver rpm to setup database, update and configuration for xt_geoip module with a panel. Summary: smserver rpm to setup database, update and configuration for xt_geoip module with a panel.
Name: %{name} Name: %{name}
@@ -82,9 +82,15 @@ fi
%changelog %changelog
* Thu Mar 20 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 1.3.1-26.sme
- Fix createlink typo remote-access-update [SME: 12438]
* Thu Feb 13 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 1.3.1-25.sme
- Fix various typos as per bug but more to find [SME: 12472]
* Thu Feb 13 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 1.3.1-24.sme * Thu Feb 13 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 1.3.1-24.sme
- move scriptoig back to /usr/share/geoip - move scripting back to /usr/share/geoip
- Lose the LE/BE (Little/Big Endian) parts as iptables can't seme to read the file in subdirs - Lose the LE/BE (Little/Big Endian) parts as iptables can't seem to read the file in subdirs
- Update ULOG to NFLOG in rules but restricts the number of countries - Update ULOG to NFLOG in rules but restricts the number of countries
* Wed Feb 12 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 1.3.1-23.sme * Wed Feb 12 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 1.3.1-23.sme