Skip to content

Commit

Permalink
v0.9 + shorewall, ufw, firewalld rules overlap on reboot
Browse files Browse the repository at this point in the history
  • Loading branch information
AKotov-dev committed May 16, 2023
1 parent dde4fef commit 8ecf1e0
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion censor/backup/censor.lps
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<UnitName Value="Unit1"/>
<IsVisibleTab Value="True"/>
<TopLine Value="142"/>
<CursorPos X="5" Y="168"/>
<CursorPos X="70" Y="157"/>
<UsageCount Value="54"/>
<Loaded Value="True"/>
<LoadedDesigner Value="True"/>
Expand Down
3 changes: 2 additions & 1 deletion censor/backup/unit1.pas
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,12 @@ procedure TMainForm.CreateServices;
S := TStringList.Create;

//Если нет, создаём и активируем сервис /etc/systemd/system/censor.service
//Перекрыть возможные правила от shorewall.service ufw.service firewalld.service
if not FileExists('/etc/systemd/system/censor.service') then
begin
S.Add('[Unit]');
S.Add('Description=Censor Unit');
S.Add('After=network-online.target shorewall.service ufw.service firewalld.service');
S.Add('After=network-online.target shorewall.service shorewall6.service ufw.service firewalld.service');
S.Add('Wants=network-online.target');
S.Add('');
S.Add('[Service]');
Expand Down
Binary file modified censor/censor
Binary file not shown.
2 changes: 1 addition & 1 deletion censor/censor.lps
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<UnitName Value="Unit1"/>
<IsVisibleTab Value="True"/>
<TopLine Value="142"/>
<CursorPos X="52" Y="154"/>
<CursorPos X="47" Y="152"/>
<UsageCount Value="54"/>
<Loaded Value="True"/>
<LoadedDesigner Value="True"/>
Expand Down
Binary file modified censor/lib/x86_64-linux/unit1.o
Binary file not shown.
Binary file modified censor/lib/x86_64-linux/unit1.ppu
Binary file not shown.
4 changes: 2 additions & 2 deletions censor/unit1.pas
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,12 @@ procedure TMainForm.CreateServices;
S := TStringList.Create;

//Если нет, создаём и активируем сервис /etc/systemd/system/censor.service
//Перекрыть возможные правила от shorewall.service ufw.service firewalld.service
//Перекрыть возможные правила от shorewall shorewall6 ufw firewalld
if not FileExists('/etc/systemd/system/censor.service') then
begin
S.Add('[Unit]');
S.Add('Description=Censor Unit');
S.Add('After=network-online.target shorewall.service ufw.service firewalld.service');
S.Add('After=network-online.target shorewall.service shorewall6.service ufw.service firewalld.service');
S.Add('Wants=network-online.target');
S.Add('');
S.Add('[Service]');
Expand Down

0 comments on commit 8ecf1e0

Please sign in to comment.