diff --git a/.gitignore b/.gitignore index af3eb46..9e54ecc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ .idea/ cmake-build-* +cert.pem +key.pem +dh.pem diff --git a/CMakeLists.txt b/CMakeLists.txt index 70c95c8..9bd48a6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ endif() add_compile_options(-Wall -Wextra -Wsign-conversion) -add_subdirectory(dependencies/control_system-dvbs-2) +add_subdirectory(dependencies/control_system) add_executable(terminal-web-server src/server/mime_types.hpp diff --git a/dependencies/control_system-dvbs-2/CMakeLists.txt b/dependencies/control_system/CMakeLists.txt similarity index 100% rename from dependencies/control_system-dvbs-2/CMakeLists.txt rename to dependencies/control_system/CMakeLists.txt diff --git a/dependencies/control_system-dvbs-2/client/ControlProtoCInterface.h b/dependencies/control_system/client/ControlProtoCInterface.h similarity index 100% rename from dependencies/control_system-dvbs-2/client/ControlProtoCInterface.h rename to dependencies/control_system/client/ControlProtoCInterface.h diff --git a/dependencies/control_system-dvbs-2/client/main.cpp b/dependencies/control_system/client/main.cpp similarity index 100% rename from dependencies/control_system-dvbs-2/client/main.cpp rename to dependencies/control_system/client/main.cpp diff --git a/dependencies/control_system-dvbs-2/client/sock_client.cpp b/dependencies/control_system/client/sock_client.cpp similarity index 100% rename from dependencies/control_system-dvbs-2/client/sock_client.cpp rename to dependencies/control_system/client/sock_client.cpp diff --git a/dependencies/control_system-dvbs-2/client/sock_client.h b/dependencies/control_system/client/sock_client.h similarity index 100% rename from dependencies/control_system-dvbs-2/client/sock_client.h rename to dependencies/control_system/client/sock_client.h diff --git a/dependencies/control_system-dvbs-2/client/system_client.cpp b/dependencies/control_system/client/system_client.cpp similarity index 100% rename from dependencies/control_system-dvbs-2/client/system_client.cpp rename to dependencies/control_system/client/system_client.cpp diff --git a/dependencies/control_system-dvbs-2/client/system_client.h b/dependencies/control_system/client/system_client.h similarity index 100% rename from dependencies/control_system-dvbs-2/client/system_client.h rename to dependencies/control_system/client/system_client.h diff --git a/dependencies/control_system-dvbs-2/common/protocol_commands.h b/dependencies/control_system/common/protocol_commands.h similarity index 100% rename from dependencies/control_system-dvbs-2/common/protocol_commands.h rename to dependencies/control_system/common/protocol_commands.h diff --git a/dependencies/control_system-dvbs-2/common/seq_packet.h b/dependencies/control_system/common/seq_packet.h similarity index 100% rename from dependencies/control_system-dvbs-2/common/seq_packet.h rename to dependencies/control_system/common/seq_packet.h diff --git a/static/login.html b/static/login.html index ee0c243..b9bc581 100644 --- a/static/login.html +++ b/static/login.html @@ -2,6 +2,7 @@ + Login @@ -14,7 +15,7 @@
- +