From 1c88320f739b8b0859fe04b4be8ed12d4dd20fd8 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Sat, 7 Jan 2023 11:08:02 -0600 Subject: [PATCH] Update: Restructure settings now the install.sh is installing them. These files are moved into a sub-directory. --- level_3/controller/data/build/settings | 2 +- level_3/controller/data/settings/{ => controller}/entries/default.entry | 0 .../controller/data/settings/{ => controller}/entries/maintenance.entry | 0 .../settings/{ => controller}/example/entries/asynchronous-serial.entry | 0 .../data/settings/{ => controller}/example/entries/asynchronous.entry | 0 .../data/settings/{ => controller}/example/entries/delay-program.entry | 0 .../data/settings/{ => controller}/example/entries/delay-service.entry | 0 .../data/settings/{ => controller}/example/entries/environment.entry | 0 .../data/settings/{ => controller}/example/entries/htop-alternate.entry | 0 .../data/settings/{ => controller}/example/entries/htop-command.entry | 0 .../data/settings/{ => controller}/example/entries/htop.entry | 0 .../controller/data/settings/{ => controller}/example/entries/iki.entry | 0 .../settings/{ => controller}/example/entries/serial-alternate.entry | 0 .../data/settings/{ => controller}/example/entries/serial.entry | 0 .../data/settings/{ => controller}/example/entries/sshd.entry | 0 .../data/settings/{ => controller}/example/entries/test.entry | 0 .../controller/data/settings/{ => controller}/example/entries/up.entry | 0 .../data/settings/{ => controller}/example/entries/utility.entry | 0 .../data/settings/{ => controller}/example/exits/htop-alternate.exit | 0 .../controller/data/settings/{ => controller}/example/exits/serial.exit | 0 .../controller/data/settings/{ => controller}/example/exits/sshd.exit | 0 .../settings/{ => controller}/example/rules/asynchronous/sleep_1.rule | 0 .../settings/{ => controller}/example/rules/asynchronous/sleep_10.rule | 0 .../settings/{ => controller}/example/rules/asynchronous/sleep_2.rule | 0 .../settings/{ => controller}/example/rules/asynchronous/sleep_3.rule | 0 .../settings/{ => controller}/example/rules/asynchronous/sleep_5.rule | 0 .../settings/{ => controller}/example/rules/asynchronous/sleep_8.rule | 0 .../data/settings/{ => controller}/example/rules/command/htop.rule | 0 .../data/settings/{ => controller}/example/rules/command/multiple.rule | 0 .../data/settings/{ => controller}/example/rules/delay/long.rule | 0 .../data/settings/{ => controller}/example/rules/delay/short.rule | 0 .../settings/{ => controller}/example/rules/environment/default.rule | 0 .../data/settings/{ => controller}/example/rules/environment/empty.rule | 0 .../settings/{ => controller}/example/rules/environment/exported.rule | 0 .../settings/{ => controller}/example/rules/environment/exporting.rule | 0 .../{ => controller}/example/rules/environment/fake-nothing.rule | 0 .../{ => controller}/example/rules/environment/fake-something.rule | 0 .../data/settings/{ => controller}/example/rules/maintenance/boom.rule | 0 .../data/settings/{ => controller}/example/rules/print/newline.rule | 0 .../{ => controller}/example/rules/script/create_socket_path.rule | 0 .../data/settings/{ => controller}/example/rules/script/fail.rule | 0 .../data/settings/{ => controller}/example/rules/script/iki.rule | 0 .../data/settings/{ => controller}/example/rules/script/php.rule | 0 .../data/settings/{ => controller}/example/rules/script/python.rule | 0 .../data/settings/{ => controller}/example/rules/script/require_me.rule | 0 .../data/settings/{ => controller}/example/rules/script/succeed.rule | 0 .../data/settings/{ => controller}/example/rules/serial/s_1.rule | 0 .../data/settings/{ => controller}/example/rules/serial/s_2.rule | 0 .../data/settings/{ => controller}/example/rules/serial/s_3.rule | 0 .../data/settings/{ => controller}/example/rules/serial/s_4.rule | 0 .../data/settings/{ => controller}/example/rules/serial/s_5.rule | 0 .../data/settings/{ => controller}/example/rules/serial/s_6.rule | 0 .../data/settings/{ => controller}/example/rules/service/sshd.rule | 0 .../data/settings/{ => controller}/example/rules/utility/sleeper_1.rule | 0 .../data/settings/{ => controller}/example/rules/utility/sleeper_2.rule | 0 .../data/settings/{ => controller}/example/rules/utility/sleeper_3.rule | 0 .../controller/data/settings/{ => controller}/rules/boot/devices.rule | 0 .../data/settings/{ => controller}/rules/boot/file_system.rule | 0 .../controller/data/settings/{ => controller}/rules/boot/modules.rule | 0 level_3/controller/data/settings/{ => controller}/rules/boot/proc.rule | 0 level_3/controller/data/settings/{ => controller}/rules/boot/root.rule | 0 .../data/settings/{ => controller}/rules/maintenance/console.rule | 0 level_3/controller/data/settings/{ => controller}/rules/net/all.rule | 0 .../controller/data/settings/{ => controller}/rules/net/loopback.rule | 0 .../controller/data/settings/{ => controller}/rules/service/dbus.rule | 0 .../controller/data/settings/{ => controller}/rules/service/logger.rule | 0 .../controller/data/settings/{ => controller}/rules/service/mouse.rule | 0 level_3/controller/data/settings/{ => controller}/rules/task/clock.rule | 0 .../controller/data/settings/{ => controller}/rules/task/keyboard.rule | 0 .../controller/data/settings/{ => controller}/rules/task/ntpdate.rule | 0 .../controller/data/settings/{ => controller}/rules/terminal/four.rule | 0 .../controller/data/settings/{ => controller}/rules/terminal/one.rule | 0 .../controller/data/settings/{ => controller}/rules/terminal/three.rule | 0 .../controller/data/settings/{ => controller}/rules/terminal/two.rule | 0 level_3/firewall/data/build/settings | 2 +- level_3/firewall/data/settings/{ => network}/default-blacklist | 0 level_3/firewall/data/settings/{ => network}/default-whitelist | 0 level_3/firewall/data/settings/{ => network}/example-device-firewall | 0 level_3/firewall/data/settings/{ => network}/firewall-first | 0 level_3/firewall/data/settings/{ => network}/firewall-last | 0 level_3/firewall/data/settings/{ => network}/firewall-other | 0 81 files changed, 2 insertions(+), 2 deletions(-) rename level_3/controller/data/settings/{ => controller}/entries/default.entry (100%) rename level_3/controller/data/settings/{ => controller}/entries/maintenance.entry (100%) rename level_3/controller/data/settings/{ => controller}/example/entries/asynchronous-serial.entry (100%) rename level_3/controller/data/settings/{ => controller}/example/entries/asynchronous.entry (100%) rename level_3/controller/data/settings/{ => controller}/example/entries/delay-program.entry (100%) rename level_3/controller/data/settings/{ => controller}/example/entries/delay-service.entry (100%) rename level_3/controller/data/settings/{ => controller}/example/entries/environment.entry (100%) rename level_3/controller/data/settings/{ => controller}/example/entries/htop-alternate.entry (100%) rename level_3/controller/data/settings/{ => controller}/example/entries/htop-command.entry (100%) rename level_3/controller/data/settings/{ => controller}/example/entries/htop.entry (100%) rename level_3/controller/data/settings/{ => controller}/example/entries/iki.entry (100%) rename level_3/controller/data/settings/{ => controller}/example/entries/serial-alternate.entry (100%) rename level_3/controller/data/settings/{ => controller}/example/entries/serial.entry (100%) rename level_3/controller/data/settings/{ => controller}/example/entries/sshd.entry (100%) rename level_3/controller/data/settings/{ => controller}/example/entries/test.entry (100%) rename level_3/controller/data/settings/{ => controller}/example/entries/up.entry (100%) rename level_3/controller/data/settings/{ => controller}/example/entries/utility.entry (100%) rename level_3/controller/data/settings/{ => controller}/example/exits/htop-alternate.exit (100%) rename level_3/controller/data/settings/{ => controller}/example/exits/serial.exit (100%) rename level_3/controller/data/settings/{ => controller}/example/exits/sshd.exit (100%) rename level_3/controller/data/settings/{ => controller}/example/rules/asynchronous/sleep_1.rule (100%) rename level_3/controller/data/settings/{ => controller}/example/rules/asynchronous/sleep_10.rule (100%) rename level_3/controller/data/settings/{ => controller}/example/rules/asynchronous/sleep_2.rule (100%) rename level_3/controller/data/settings/{ => controller}/example/rules/asynchronous/sleep_3.rule (100%) rename level_3/controller/data/settings/{ => controller}/example/rules/asynchronous/sleep_5.rule (100%) rename level_3/controller/data/settings/{ => controller}/example/rules/asynchronous/sleep_8.rule (100%) rename level_3/controller/data/settings/{ => controller}/example/rules/command/htop.rule (100%) rename level_3/controller/data/settings/{ => controller}/example/rules/command/multiple.rule (100%) rename level_3/controller/data/settings/{ => controller}/example/rules/delay/long.rule (100%) rename level_3/controller/data/settings/{ => controller}/example/rules/delay/short.rule (100%) rename level_3/controller/data/settings/{ => controller}/example/rules/environment/default.rule (100%) rename level_3/controller/data/settings/{ => controller}/example/rules/environment/empty.rule (100%) rename level_3/controller/data/settings/{ => controller}/example/rules/environment/exported.rule (100%) rename level_3/controller/data/settings/{ => controller}/example/rules/environment/exporting.rule (100%) rename level_3/controller/data/settings/{ => controller}/example/rules/environment/fake-nothing.rule (100%) rename level_3/controller/data/settings/{ => controller}/example/rules/environment/fake-something.rule (100%) rename level_3/controller/data/settings/{ => controller}/example/rules/maintenance/boom.rule (100%) rename level_3/controller/data/settings/{ => controller}/example/rules/print/newline.rule (100%) rename level_3/controller/data/settings/{ => controller}/example/rules/script/create_socket_path.rule (100%) rename level_3/controller/data/settings/{ => controller}/example/rules/script/fail.rule (100%) rename level_3/controller/data/settings/{ => controller}/example/rules/script/iki.rule (100%) rename level_3/controller/data/settings/{ => controller}/example/rules/script/php.rule (100%) rename level_3/controller/data/settings/{ => controller}/example/rules/script/python.rule (100%) rename level_3/controller/data/settings/{ => controller}/example/rules/script/require_me.rule (100%) rename level_3/controller/data/settings/{ => controller}/example/rules/script/succeed.rule (100%) rename level_3/controller/data/settings/{ => controller}/example/rules/serial/s_1.rule (100%) rename level_3/controller/data/settings/{ => controller}/example/rules/serial/s_2.rule (100%) rename level_3/controller/data/settings/{ => controller}/example/rules/serial/s_3.rule (100%) rename level_3/controller/data/settings/{ => controller}/example/rules/serial/s_4.rule (100%) rename level_3/controller/data/settings/{ => controller}/example/rules/serial/s_5.rule (100%) rename level_3/controller/data/settings/{ => controller}/example/rules/serial/s_6.rule (100%) rename level_3/controller/data/settings/{ => controller}/example/rules/service/sshd.rule (100%) rename level_3/controller/data/settings/{ => controller}/example/rules/utility/sleeper_1.rule (100%) rename level_3/controller/data/settings/{ => controller}/example/rules/utility/sleeper_2.rule (100%) rename level_3/controller/data/settings/{ => controller}/example/rules/utility/sleeper_3.rule (100%) rename level_3/controller/data/settings/{ => controller}/rules/boot/devices.rule (100%) rename level_3/controller/data/settings/{ => controller}/rules/boot/file_system.rule (100%) rename level_3/controller/data/settings/{ => controller}/rules/boot/modules.rule (100%) rename level_3/controller/data/settings/{ => controller}/rules/boot/proc.rule (100%) rename level_3/controller/data/settings/{ => controller}/rules/boot/root.rule (100%) rename level_3/controller/data/settings/{ => controller}/rules/maintenance/console.rule (100%) rename level_3/controller/data/settings/{ => controller}/rules/net/all.rule (100%) rename level_3/controller/data/settings/{ => controller}/rules/net/loopback.rule (100%) rename level_3/controller/data/settings/{ => controller}/rules/service/dbus.rule (100%) rename level_3/controller/data/settings/{ => controller}/rules/service/logger.rule (100%) rename level_3/controller/data/settings/{ => controller}/rules/service/mouse.rule (100%) rename level_3/controller/data/settings/{ => controller}/rules/task/clock.rule (100%) rename level_3/controller/data/settings/{ => controller}/rules/task/keyboard.rule (100%) rename level_3/controller/data/settings/{ => controller}/rules/task/ntpdate.rule (100%) rename level_3/controller/data/settings/{ => controller}/rules/terminal/four.rule (100%) rename level_3/controller/data/settings/{ => controller}/rules/terminal/one.rule (100%) rename level_3/controller/data/settings/{ => controller}/rules/terminal/three.rule (100%) rename level_3/controller/data/settings/{ => controller}/rules/terminal/two.rule (100%) rename level_3/firewall/data/settings/{ => network}/default-blacklist (100%) rename level_3/firewall/data/settings/{ => network}/default-whitelist (100%) rename level_3/firewall/data/settings/{ => network}/example-device-firewall (100%) rename level_3/firewall/data/settings/{ => network}/firewall-first (100%) rename level_3/firewall/data/settings/{ => network}/firewall-last (100%) rename level_3/firewall/data/settings/{ => network}/firewall-other (100%) diff --git a/level_3/controller/data/build/settings b/level_3/controller/data/build/settings index a9cfda5..42799c6 100644 --- a/level_3/controller/data/build/settings +++ b/level_3/controller/data/build/settings @@ -38,7 +38,7 @@ build_sources_program main.c main-common.c build_sources_headers controller.h common.h -build_sources_setting entries example rules +build_sources_setting controller build_script yes build_shared yes diff --git a/level_3/controller/data/settings/entries/default.entry b/level_3/controller/data/settings/controller/entries/default.entry similarity index 100% rename from level_3/controller/data/settings/entries/default.entry rename to level_3/controller/data/settings/controller/entries/default.entry diff --git a/level_3/controller/data/settings/entries/maintenance.entry b/level_3/controller/data/settings/controller/entries/maintenance.entry similarity index 100% rename from level_3/controller/data/settings/entries/maintenance.entry rename to level_3/controller/data/settings/controller/entries/maintenance.entry diff --git a/level_3/controller/data/settings/example/entries/asynchronous-serial.entry b/level_3/controller/data/settings/controller/example/entries/asynchronous-serial.entry similarity index 100% rename from level_3/controller/data/settings/example/entries/asynchronous-serial.entry rename to level_3/controller/data/settings/controller/example/entries/asynchronous-serial.entry diff --git a/level_3/controller/data/settings/example/entries/asynchronous.entry b/level_3/controller/data/settings/controller/example/entries/asynchronous.entry similarity index 100% rename from level_3/controller/data/settings/example/entries/asynchronous.entry rename to level_3/controller/data/settings/controller/example/entries/asynchronous.entry diff --git a/level_3/controller/data/settings/example/entries/delay-program.entry b/level_3/controller/data/settings/controller/example/entries/delay-program.entry similarity index 100% rename from level_3/controller/data/settings/example/entries/delay-program.entry rename to level_3/controller/data/settings/controller/example/entries/delay-program.entry diff --git a/level_3/controller/data/settings/example/entries/delay-service.entry b/level_3/controller/data/settings/controller/example/entries/delay-service.entry similarity index 100% rename from level_3/controller/data/settings/example/entries/delay-service.entry rename to level_3/controller/data/settings/controller/example/entries/delay-service.entry diff --git a/level_3/controller/data/settings/example/entries/environment.entry b/level_3/controller/data/settings/controller/example/entries/environment.entry similarity index 100% rename from level_3/controller/data/settings/example/entries/environment.entry rename to level_3/controller/data/settings/controller/example/entries/environment.entry diff --git a/level_3/controller/data/settings/example/entries/htop-alternate.entry b/level_3/controller/data/settings/controller/example/entries/htop-alternate.entry similarity index 100% rename from level_3/controller/data/settings/example/entries/htop-alternate.entry rename to level_3/controller/data/settings/controller/example/entries/htop-alternate.entry diff --git a/level_3/controller/data/settings/example/entries/htop-command.entry b/level_3/controller/data/settings/controller/example/entries/htop-command.entry similarity index 100% rename from level_3/controller/data/settings/example/entries/htop-command.entry rename to level_3/controller/data/settings/controller/example/entries/htop-command.entry diff --git a/level_3/controller/data/settings/example/entries/htop.entry b/level_3/controller/data/settings/controller/example/entries/htop.entry similarity index 100% rename from level_3/controller/data/settings/example/entries/htop.entry rename to level_3/controller/data/settings/controller/example/entries/htop.entry diff --git a/level_3/controller/data/settings/example/entries/iki.entry b/level_3/controller/data/settings/controller/example/entries/iki.entry similarity index 100% rename from level_3/controller/data/settings/example/entries/iki.entry rename to level_3/controller/data/settings/controller/example/entries/iki.entry diff --git a/level_3/controller/data/settings/example/entries/serial-alternate.entry b/level_3/controller/data/settings/controller/example/entries/serial-alternate.entry similarity index 100% rename from level_3/controller/data/settings/example/entries/serial-alternate.entry rename to level_3/controller/data/settings/controller/example/entries/serial-alternate.entry diff --git a/level_3/controller/data/settings/example/entries/serial.entry b/level_3/controller/data/settings/controller/example/entries/serial.entry similarity index 100% rename from level_3/controller/data/settings/example/entries/serial.entry rename to level_3/controller/data/settings/controller/example/entries/serial.entry diff --git a/level_3/controller/data/settings/example/entries/sshd.entry b/level_3/controller/data/settings/controller/example/entries/sshd.entry similarity index 100% rename from level_3/controller/data/settings/example/entries/sshd.entry rename to level_3/controller/data/settings/controller/example/entries/sshd.entry diff --git a/level_3/controller/data/settings/example/entries/test.entry b/level_3/controller/data/settings/controller/example/entries/test.entry similarity index 100% rename from level_3/controller/data/settings/example/entries/test.entry rename to level_3/controller/data/settings/controller/example/entries/test.entry diff --git a/level_3/controller/data/settings/example/entries/up.entry b/level_3/controller/data/settings/controller/example/entries/up.entry similarity index 100% rename from level_3/controller/data/settings/example/entries/up.entry rename to level_3/controller/data/settings/controller/example/entries/up.entry diff --git a/level_3/controller/data/settings/example/entries/utility.entry b/level_3/controller/data/settings/controller/example/entries/utility.entry similarity index 100% rename from level_3/controller/data/settings/example/entries/utility.entry rename to level_3/controller/data/settings/controller/example/entries/utility.entry diff --git a/level_3/controller/data/settings/example/exits/htop-alternate.exit b/level_3/controller/data/settings/controller/example/exits/htop-alternate.exit similarity index 100% rename from level_3/controller/data/settings/example/exits/htop-alternate.exit rename to level_3/controller/data/settings/controller/example/exits/htop-alternate.exit diff --git a/level_3/controller/data/settings/example/exits/serial.exit b/level_3/controller/data/settings/controller/example/exits/serial.exit similarity index 100% rename from level_3/controller/data/settings/example/exits/serial.exit rename to level_3/controller/data/settings/controller/example/exits/serial.exit diff --git a/level_3/controller/data/settings/example/exits/sshd.exit b/level_3/controller/data/settings/controller/example/exits/sshd.exit similarity index 100% rename from level_3/controller/data/settings/example/exits/sshd.exit rename to level_3/controller/data/settings/controller/example/exits/sshd.exit diff --git a/level_3/controller/data/settings/example/rules/asynchronous/sleep_1.rule b/level_3/controller/data/settings/controller/example/rules/asynchronous/sleep_1.rule similarity index 100% rename from level_3/controller/data/settings/example/rules/asynchronous/sleep_1.rule rename to level_3/controller/data/settings/controller/example/rules/asynchronous/sleep_1.rule diff --git a/level_3/controller/data/settings/example/rules/asynchronous/sleep_10.rule b/level_3/controller/data/settings/controller/example/rules/asynchronous/sleep_10.rule similarity index 100% rename from level_3/controller/data/settings/example/rules/asynchronous/sleep_10.rule rename to level_3/controller/data/settings/controller/example/rules/asynchronous/sleep_10.rule diff --git a/level_3/controller/data/settings/example/rules/asynchronous/sleep_2.rule b/level_3/controller/data/settings/controller/example/rules/asynchronous/sleep_2.rule similarity index 100% rename from level_3/controller/data/settings/example/rules/asynchronous/sleep_2.rule rename to level_3/controller/data/settings/controller/example/rules/asynchronous/sleep_2.rule diff --git a/level_3/controller/data/settings/example/rules/asynchronous/sleep_3.rule b/level_3/controller/data/settings/controller/example/rules/asynchronous/sleep_3.rule similarity index 100% rename from level_3/controller/data/settings/example/rules/asynchronous/sleep_3.rule rename to level_3/controller/data/settings/controller/example/rules/asynchronous/sleep_3.rule diff --git a/level_3/controller/data/settings/example/rules/asynchronous/sleep_5.rule b/level_3/controller/data/settings/controller/example/rules/asynchronous/sleep_5.rule similarity index 100% rename from level_3/controller/data/settings/example/rules/asynchronous/sleep_5.rule rename to level_3/controller/data/settings/controller/example/rules/asynchronous/sleep_5.rule diff --git a/level_3/controller/data/settings/example/rules/asynchronous/sleep_8.rule b/level_3/controller/data/settings/controller/example/rules/asynchronous/sleep_8.rule similarity index 100% rename from level_3/controller/data/settings/example/rules/asynchronous/sleep_8.rule rename to level_3/controller/data/settings/controller/example/rules/asynchronous/sleep_8.rule diff --git a/level_3/controller/data/settings/example/rules/command/htop.rule b/level_3/controller/data/settings/controller/example/rules/command/htop.rule similarity index 100% rename from level_3/controller/data/settings/example/rules/command/htop.rule rename to level_3/controller/data/settings/controller/example/rules/command/htop.rule diff --git a/level_3/controller/data/settings/example/rules/command/multiple.rule b/level_3/controller/data/settings/controller/example/rules/command/multiple.rule similarity index 100% rename from level_3/controller/data/settings/example/rules/command/multiple.rule rename to level_3/controller/data/settings/controller/example/rules/command/multiple.rule diff --git a/level_3/controller/data/settings/example/rules/delay/long.rule b/level_3/controller/data/settings/controller/example/rules/delay/long.rule similarity index 100% rename from level_3/controller/data/settings/example/rules/delay/long.rule rename to level_3/controller/data/settings/controller/example/rules/delay/long.rule diff --git a/level_3/controller/data/settings/example/rules/delay/short.rule b/level_3/controller/data/settings/controller/example/rules/delay/short.rule similarity index 100% rename from level_3/controller/data/settings/example/rules/delay/short.rule rename to level_3/controller/data/settings/controller/example/rules/delay/short.rule diff --git a/level_3/controller/data/settings/example/rules/environment/default.rule b/level_3/controller/data/settings/controller/example/rules/environment/default.rule similarity index 100% rename from level_3/controller/data/settings/example/rules/environment/default.rule rename to level_3/controller/data/settings/controller/example/rules/environment/default.rule diff --git a/level_3/controller/data/settings/example/rules/environment/empty.rule b/level_3/controller/data/settings/controller/example/rules/environment/empty.rule similarity index 100% rename from level_3/controller/data/settings/example/rules/environment/empty.rule rename to level_3/controller/data/settings/controller/example/rules/environment/empty.rule diff --git a/level_3/controller/data/settings/example/rules/environment/exported.rule b/level_3/controller/data/settings/controller/example/rules/environment/exported.rule similarity index 100% rename from level_3/controller/data/settings/example/rules/environment/exported.rule rename to level_3/controller/data/settings/controller/example/rules/environment/exported.rule diff --git a/level_3/controller/data/settings/example/rules/environment/exporting.rule b/level_3/controller/data/settings/controller/example/rules/environment/exporting.rule similarity index 100% rename from level_3/controller/data/settings/example/rules/environment/exporting.rule rename to level_3/controller/data/settings/controller/example/rules/environment/exporting.rule diff --git a/level_3/controller/data/settings/example/rules/environment/fake-nothing.rule b/level_3/controller/data/settings/controller/example/rules/environment/fake-nothing.rule similarity index 100% rename from level_3/controller/data/settings/example/rules/environment/fake-nothing.rule rename to level_3/controller/data/settings/controller/example/rules/environment/fake-nothing.rule diff --git a/level_3/controller/data/settings/example/rules/environment/fake-something.rule b/level_3/controller/data/settings/controller/example/rules/environment/fake-something.rule similarity index 100% rename from level_3/controller/data/settings/example/rules/environment/fake-something.rule rename to level_3/controller/data/settings/controller/example/rules/environment/fake-something.rule diff --git a/level_3/controller/data/settings/example/rules/maintenance/boom.rule b/level_3/controller/data/settings/controller/example/rules/maintenance/boom.rule similarity index 100% rename from level_3/controller/data/settings/example/rules/maintenance/boom.rule rename to level_3/controller/data/settings/controller/example/rules/maintenance/boom.rule diff --git a/level_3/controller/data/settings/example/rules/print/newline.rule b/level_3/controller/data/settings/controller/example/rules/print/newline.rule similarity index 100% rename from level_3/controller/data/settings/example/rules/print/newline.rule rename to level_3/controller/data/settings/controller/example/rules/print/newline.rule diff --git a/level_3/controller/data/settings/example/rules/script/create_socket_path.rule b/level_3/controller/data/settings/controller/example/rules/script/create_socket_path.rule similarity index 100% rename from level_3/controller/data/settings/example/rules/script/create_socket_path.rule rename to level_3/controller/data/settings/controller/example/rules/script/create_socket_path.rule diff --git a/level_3/controller/data/settings/example/rules/script/fail.rule b/level_3/controller/data/settings/controller/example/rules/script/fail.rule similarity index 100% rename from level_3/controller/data/settings/example/rules/script/fail.rule rename to level_3/controller/data/settings/controller/example/rules/script/fail.rule diff --git a/level_3/controller/data/settings/example/rules/script/iki.rule b/level_3/controller/data/settings/controller/example/rules/script/iki.rule similarity index 100% rename from level_3/controller/data/settings/example/rules/script/iki.rule rename to level_3/controller/data/settings/controller/example/rules/script/iki.rule diff --git a/level_3/controller/data/settings/example/rules/script/php.rule b/level_3/controller/data/settings/controller/example/rules/script/php.rule similarity index 100% rename from level_3/controller/data/settings/example/rules/script/php.rule rename to level_3/controller/data/settings/controller/example/rules/script/php.rule diff --git a/level_3/controller/data/settings/example/rules/script/python.rule b/level_3/controller/data/settings/controller/example/rules/script/python.rule similarity index 100% rename from level_3/controller/data/settings/example/rules/script/python.rule rename to level_3/controller/data/settings/controller/example/rules/script/python.rule diff --git a/level_3/controller/data/settings/example/rules/script/require_me.rule b/level_3/controller/data/settings/controller/example/rules/script/require_me.rule similarity index 100% rename from level_3/controller/data/settings/example/rules/script/require_me.rule rename to level_3/controller/data/settings/controller/example/rules/script/require_me.rule diff --git a/level_3/controller/data/settings/example/rules/script/succeed.rule b/level_3/controller/data/settings/controller/example/rules/script/succeed.rule similarity index 100% rename from level_3/controller/data/settings/example/rules/script/succeed.rule rename to level_3/controller/data/settings/controller/example/rules/script/succeed.rule diff --git a/level_3/controller/data/settings/example/rules/serial/s_1.rule b/level_3/controller/data/settings/controller/example/rules/serial/s_1.rule similarity index 100% rename from level_3/controller/data/settings/example/rules/serial/s_1.rule rename to level_3/controller/data/settings/controller/example/rules/serial/s_1.rule diff --git a/level_3/controller/data/settings/example/rules/serial/s_2.rule b/level_3/controller/data/settings/controller/example/rules/serial/s_2.rule similarity index 100% rename from level_3/controller/data/settings/example/rules/serial/s_2.rule rename to level_3/controller/data/settings/controller/example/rules/serial/s_2.rule diff --git a/level_3/controller/data/settings/example/rules/serial/s_3.rule b/level_3/controller/data/settings/controller/example/rules/serial/s_3.rule similarity index 100% rename from level_3/controller/data/settings/example/rules/serial/s_3.rule rename to level_3/controller/data/settings/controller/example/rules/serial/s_3.rule diff --git a/level_3/controller/data/settings/example/rules/serial/s_4.rule b/level_3/controller/data/settings/controller/example/rules/serial/s_4.rule similarity index 100% rename from level_3/controller/data/settings/example/rules/serial/s_4.rule rename to level_3/controller/data/settings/controller/example/rules/serial/s_4.rule diff --git a/level_3/controller/data/settings/example/rules/serial/s_5.rule b/level_3/controller/data/settings/controller/example/rules/serial/s_5.rule similarity index 100% rename from level_3/controller/data/settings/example/rules/serial/s_5.rule rename to level_3/controller/data/settings/controller/example/rules/serial/s_5.rule diff --git a/level_3/controller/data/settings/example/rules/serial/s_6.rule b/level_3/controller/data/settings/controller/example/rules/serial/s_6.rule similarity index 100% rename from level_3/controller/data/settings/example/rules/serial/s_6.rule rename to level_3/controller/data/settings/controller/example/rules/serial/s_6.rule diff --git a/level_3/controller/data/settings/example/rules/service/sshd.rule b/level_3/controller/data/settings/controller/example/rules/service/sshd.rule similarity index 100% rename from level_3/controller/data/settings/example/rules/service/sshd.rule rename to level_3/controller/data/settings/controller/example/rules/service/sshd.rule diff --git a/level_3/controller/data/settings/example/rules/utility/sleeper_1.rule b/level_3/controller/data/settings/controller/example/rules/utility/sleeper_1.rule similarity index 100% rename from level_3/controller/data/settings/example/rules/utility/sleeper_1.rule rename to level_3/controller/data/settings/controller/example/rules/utility/sleeper_1.rule diff --git a/level_3/controller/data/settings/example/rules/utility/sleeper_2.rule b/level_3/controller/data/settings/controller/example/rules/utility/sleeper_2.rule similarity index 100% rename from level_3/controller/data/settings/example/rules/utility/sleeper_2.rule rename to level_3/controller/data/settings/controller/example/rules/utility/sleeper_2.rule diff --git a/level_3/controller/data/settings/example/rules/utility/sleeper_3.rule b/level_3/controller/data/settings/controller/example/rules/utility/sleeper_3.rule similarity index 100% rename from level_3/controller/data/settings/example/rules/utility/sleeper_3.rule rename to level_3/controller/data/settings/controller/example/rules/utility/sleeper_3.rule diff --git a/level_3/controller/data/settings/rules/boot/devices.rule b/level_3/controller/data/settings/controller/rules/boot/devices.rule similarity index 100% rename from level_3/controller/data/settings/rules/boot/devices.rule rename to level_3/controller/data/settings/controller/rules/boot/devices.rule diff --git a/level_3/controller/data/settings/rules/boot/file_system.rule b/level_3/controller/data/settings/controller/rules/boot/file_system.rule similarity index 100% rename from level_3/controller/data/settings/rules/boot/file_system.rule rename to level_3/controller/data/settings/controller/rules/boot/file_system.rule diff --git a/level_3/controller/data/settings/rules/boot/modules.rule b/level_3/controller/data/settings/controller/rules/boot/modules.rule similarity index 100% rename from level_3/controller/data/settings/rules/boot/modules.rule rename to level_3/controller/data/settings/controller/rules/boot/modules.rule diff --git a/level_3/controller/data/settings/rules/boot/proc.rule b/level_3/controller/data/settings/controller/rules/boot/proc.rule similarity index 100% rename from level_3/controller/data/settings/rules/boot/proc.rule rename to level_3/controller/data/settings/controller/rules/boot/proc.rule diff --git a/level_3/controller/data/settings/rules/boot/root.rule b/level_3/controller/data/settings/controller/rules/boot/root.rule similarity index 100% rename from level_3/controller/data/settings/rules/boot/root.rule rename to level_3/controller/data/settings/controller/rules/boot/root.rule diff --git a/level_3/controller/data/settings/rules/maintenance/console.rule b/level_3/controller/data/settings/controller/rules/maintenance/console.rule similarity index 100% rename from level_3/controller/data/settings/rules/maintenance/console.rule rename to level_3/controller/data/settings/controller/rules/maintenance/console.rule diff --git a/level_3/controller/data/settings/rules/net/all.rule b/level_3/controller/data/settings/controller/rules/net/all.rule similarity index 100% rename from level_3/controller/data/settings/rules/net/all.rule rename to level_3/controller/data/settings/controller/rules/net/all.rule diff --git a/level_3/controller/data/settings/rules/net/loopback.rule b/level_3/controller/data/settings/controller/rules/net/loopback.rule similarity index 100% rename from level_3/controller/data/settings/rules/net/loopback.rule rename to level_3/controller/data/settings/controller/rules/net/loopback.rule diff --git a/level_3/controller/data/settings/rules/service/dbus.rule b/level_3/controller/data/settings/controller/rules/service/dbus.rule similarity index 100% rename from level_3/controller/data/settings/rules/service/dbus.rule rename to level_3/controller/data/settings/controller/rules/service/dbus.rule diff --git a/level_3/controller/data/settings/rules/service/logger.rule b/level_3/controller/data/settings/controller/rules/service/logger.rule similarity index 100% rename from level_3/controller/data/settings/rules/service/logger.rule rename to level_3/controller/data/settings/controller/rules/service/logger.rule diff --git a/level_3/controller/data/settings/rules/service/mouse.rule b/level_3/controller/data/settings/controller/rules/service/mouse.rule similarity index 100% rename from level_3/controller/data/settings/rules/service/mouse.rule rename to level_3/controller/data/settings/controller/rules/service/mouse.rule diff --git a/level_3/controller/data/settings/rules/task/clock.rule b/level_3/controller/data/settings/controller/rules/task/clock.rule similarity index 100% rename from level_3/controller/data/settings/rules/task/clock.rule rename to level_3/controller/data/settings/controller/rules/task/clock.rule diff --git a/level_3/controller/data/settings/rules/task/keyboard.rule b/level_3/controller/data/settings/controller/rules/task/keyboard.rule similarity index 100% rename from level_3/controller/data/settings/rules/task/keyboard.rule rename to level_3/controller/data/settings/controller/rules/task/keyboard.rule diff --git a/level_3/controller/data/settings/rules/task/ntpdate.rule b/level_3/controller/data/settings/controller/rules/task/ntpdate.rule similarity index 100% rename from level_3/controller/data/settings/rules/task/ntpdate.rule rename to level_3/controller/data/settings/controller/rules/task/ntpdate.rule diff --git a/level_3/controller/data/settings/rules/terminal/four.rule b/level_3/controller/data/settings/controller/rules/terminal/four.rule similarity index 100% rename from level_3/controller/data/settings/rules/terminal/four.rule rename to level_3/controller/data/settings/controller/rules/terminal/four.rule diff --git a/level_3/controller/data/settings/rules/terminal/one.rule b/level_3/controller/data/settings/controller/rules/terminal/one.rule similarity index 100% rename from level_3/controller/data/settings/rules/terminal/one.rule rename to level_3/controller/data/settings/controller/rules/terminal/one.rule diff --git a/level_3/controller/data/settings/rules/terminal/three.rule b/level_3/controller/data/settings/controller/rules/terminal/three.rule similarity index 100% rename from level_3/controller/data/settings/rules/terminal/three.rule rename to level_3/controller/data/settings/controller/rules/terminal/three.rule diff --git a/level_3/controller/data/settings/rules/terminal/two.rule b/level_3/controller/data/settings/controller/rules/terminal/two.rule similarity index 100% rename from level_3/controller/data/settings/rules/terminal/two.rule rename to level_3/controller/data/settings/controller/rules/terminal/two.rule diff --git a/level_3/firewall/data/build/settings b/level_3/firewall/data/build/settings index 471246d..6894f06 100644 --- a/level_3/firewall/data/build/settings +++ b/level_3/firewall/data/build/settings @@ -28,7 +28,7 @@ build_sources_program main.c build_sources_headers firewall.h common.h -build_sources_setting default-blacklist default-whitelist example-device-firewall firewall-first firewall-last firewall-other +build_sources_setting network build_script yes build_shared yes diff --git a/level_3/firewall/data/settings/default-blacklist b/level_3/firewall/data/settings/network/default-blacklist similarity index 100% rename from level_3/firewall/data/settings/default-blacklist rename to level_3/firewall/data/settings/network/default-blacklist diff --git a/level_3/firewall/data/settings/default-whitelist b/level_3/firewall/data/settings/network/default-whitelist similarity index 100% rename from level_3/firewall/data/settings/default-whitelist rename to level_3/firewall/data/settings/network/default-whitelist diff --git a/level_3/firewall/data/settings/example-device-firewall b/level_3/firewall/data/settings/network/example-device-firewall similarity index 100% rename from level_3/firewall/data/settings/example-device-firewall rename to level_3/firewall/data/settings/network/example-device-firewall diff --git a/level_3/firewall/data/settings/firewall-first b/level_3/firewall/data/settings/network/firewall-first similarity index 100% rename from level_3/firewall/data/settings/firewall-first rename to level_3/firewall/data/settings/network/firewall-first diff --git a/level_3/firewall/data/settings/firewall-last b/level_3/firewall/data/settings/network/firewall-last similarity index 100% rename from level_3/firewall/data/settings/firewall-last rename to level_3/firewall/data/settings/network/firewall-last diff --git a/level_3/firewall/data/settings/firewall-other b/level_3/firewall/data/settings/network/firewall-other similarity index 100% rename from level_3/firewall/data/settings/firewall-other rename to level_3/firewall/data/settings/network/firewall-other -- 1.8.3.1