From 8bd6b9051213b7d8143e676fcd957765363f56d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Garc=C3=ADa?= <73230111+alegarsan11@users.noreply.github.com> Date: Tue, 28 May 2024 00:10:30 +0200 Subject: [PATCH 1/7] Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index c4d8f9e..b513b19 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,6 @@ This repository is used to develop a web interface that enables the configuration of nftables through a graphical user interface. - ## Requirements To use this project, you need to install `python3-nftables` and `python3-hug`. For proper functioning, it's necessary to run the parsing file as an administrator. @@ -50,4 +49,4 @@ To run the tests and generate coverage reports, use the following commands: - Generate a coverage report: - `python -m pytest --cov --cov-report=html` \ No newline at end of file + `python -m pytest --cov --cov-report=html` From 4314f1159d1425af3d793457c7ba776146633237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Garc=C3=ADa?= <73230111+alegarsan11@users.noreply.github.com> Date: Tue, 28 May 2024 09:18:41 +0200 Subject: [PATCH 2/7] Update build.sh --- build.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 404ac01..192a38c 100755 --- a/build.sh +++ b/build.sh @@ -7,7 +7,9 @@ sudo chown www-data:www-data $MPLCONFIGDIR sudo chmod 777 $MPLCONFIGDIR sudo pip install -r requirements.txt # Instalación de dependencias -sudo apt-get install -y libfreetype6-dev libxft-dev apache2 +sudo apt-get install libfreetype6-dev +sudo apt-get install libxft-dev apache2 + sleep 5 # Copiar la aplicación sudo cp -r nftables-frontend /usr/share @@ -29,6 +31,14 @@ sudo chmod -R 775 /usr/share/nftables-frontend sudo chmod -R 775 /usr/share/nftables-frontend/instance sudo chmod -R 775 /usr/share/nftables-frontend/static sudo chown -R www-data:www-data /usr/share/nftables-frontend/static +FICHERO="/etc/apache2/sites-available/000-default.conf" + +if [ -f "$FICHERO" ]; then + rm "$FICHERO" + echo "El fichero $FICHERO ha sido eliminado." +else + echo "El fichero $FICHERO no existe." +fi # Reiniciar Apache sudo systemctl restart apache2 From 8f1ac70a5cca464563703c2a456f8684954c8533 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Garc=C3=ADa?= <73230111+alegarsan11@users.noreply.github.com> Date: Tue, 28 May 2024 09:25:33 +0200 Subject: [PATCH 3/7] Delete nftables-frontend/instance/nftables.db --- nftables-frontend/instance/nftables.db | Bin 49152 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 nftables-frontend/instance/nftables.db diff --git a/nftables-frontend/instance/nftables.db b/nftables-frontend/instance/nftables.db deleted file mode 100644 index 575338966fd7d3d6f0df5bc30438afb1f7c3fda6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 49152 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 Date: Tue, 28 May 2024 09:29:09 +0200 Subject: [PATCH 4/7] Update build.sh --- build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sh b/build.sh index 192a38c..248840e 100755 --- a/build.sh +++ b/build.sh @@ -24,6 +24,7 @@ sudo cp nftables-frontend/nftables-config.conf /etc/apache2/sites-available/nfta sudo a2ensite nftables-config.conf # Ajuste de permisos +sudo touch /usr/share/nftables-frontend/instance/nftables.db sudo chmod 664 /usr/share/nftables-frontend/instance/nftables.db sudo chown www-data:www-data /usr/share/nftables-frontend/instance/nftables.db sudo chown -R www-data:www-data /usr/share/nftables-frontend From 8ce7376b8a311f1a0017a5a688a1c0652ab96441 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Garc=C3=ADa?= <73230111+alegarsan11@users.noreply.github.com> Date: Tue, 28 May 2024 09:37:33 +0200 Subject: [PATCH 5/7] Update build.sh --- build.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/build.sh b/build.sh index 248840e..227d2ce 100755 --- a/build.sh +++ b/build.sh @@ -34,6 +34,14 @@ sudo chmod -R 775 /usr/share/nftables-frontend/static sudo chown -R www-data:www-data /usr/share/nftables-frontend/static FICHERO="/etc/apache2/sites-available/000-default.conf" +if [ -f "$FICHERO" ]; then + rm "$FICHERO" + echo "El fichero $FICHERO ha sido eliminado." +else + echo "El fichero $FICHERO no existe." +fi +FICHERO="/etc/apache2/sites-enabled/000-default.conf" + if [ -f "$FICHERO" ]; then rm "$FICHERO" echo "El fichero $FICHERO ha sido eliminado." From cfec09d07277c5d7c399745e25fab88b81cdf0b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Garc=C3=ADa?= <73230111+alegarsan11@users.noreply.github.com> Date: Tue, 28 May 2024 09:50:56 +0200 Subject: [PATCH 6/7] Update build.sh --- build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sh b/build.sh index 227d2ce..49c6f6c 100755 --- a/build.sh +++ b/build.sh @@ -22,6 +22,7 @@ sudo a2enmod wsgi # Configuración del sitio de Apache sudo cp nftables-frontend/nftables-config.conf /etc/apache2/sites-available/nftables-config.conf sudo a2ensite nftables-config.conf +sudo a2dissite 000-default.conf # Ajuste de permisos sudo touch /usr/share/nftables-frontend/instance/nftables.db From a5b29b692b4ad6aaf0d616299e5c10f1b7353ffc Mon Sep 17 00:00:00 2001 From: alegarsan11 Date: Tue, 28 May 2024 09:58:48 +0200 Subject: [PATCH 7/7] deploy: apache server --- README.md | 2 ++ build.sh | 14 ++++++++++++++ nftables-frontend/nftables-config.conf | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b513b19..f50a120 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,8 @@ To deploy an Apache server, use the build.sh file: `sudo ./build.sh` +(Apache server will be available on port 8080) + ### Testing and Coverage To run the tests and generate coverage reports, use the following commands: - Execute the test files (in the nftables-frontend folder): diff --git a/build.sh b/build.sh index 49c6f6c..b8c6d56 100755 --- a/build.sh +++ b/build.sh @@ -50,6 +50,20 @@ else echo "El fichero $FICHERO no existe." fi +ARCHIVO="/etc/apache2/ports.conf" + +# Línea a añadir +LINEA="Listen 8080" + +# Comprobar si la línea ya existe en el archivo +if ! grep -qF "$LINEA" "$ARCHIVO"; then + # Añadir la línea al final del archivo + echo "$LINEA" | sudo tee -a "$ARCHIVO" > /dev/null + echo "Línea añadida: $LINEA" +else + echo "La línea ya existe en el archivo: $LINEA" +fi + # Reiniciar Apache sudo systemctl restart apache2 diff --git a/nftables-frontend/nftables-config.conf b/nftables-frontend/nftables-config.conf index a30a50b..1dc9eaf 100644 --- a/nftables-frontend/nftables-config.conf +++ b/nftables-frontend/nftables-config.conf @@ -1,4 +1,4 @@ - + ServerName www.example.com ServerAlias example.com DocumentRoot /usr/share/nftables-frontend