From 9afed027d944c1d7b8e50b9b6d72ea138ab1ffab Mon Sep 17 00:00:00 2001
From: Stefano Alberto Russo <stefano.russo@gmail.com>
Date: Sat, 7 Oct 2023 12:54:58 +0200
Subject: [PATCH] Minor fixes and clenaup.
---
.gitignore | 3 ---
rosetta/makemigrations | 2 +-
rosetta/migrate | 2 +-
.../migrations/0034_auto_20231007_1052.py | 18 ++++++++++++++++++
.../webapp/code/rosetta/core_app/models.py | 2 +-
5 files changed, 21 insertions(+), 6 deletions(-)
create mode 100644 services/webapp/code/rosetta/core_app/migrations/0034_auto_20231007_1052.py
diff --git a/.gitignore b/.gitignore
index 70b7265..3edae7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,8 +14,5 @@ __pycache__/
# Data
data*
-# DB conf
-services/webapp/db_conf.sh
-
# Compose
docker-compose.yml
diff --git a/rosetta/makemigrations b/rosetta/makemigrations
index 9e7cced..5702e23 100755
--- a/rosetta/makemigrations
+++ b/rosetta/makemigrations
@@ -6,5 +6,5 @@ if [ ! -d ./services ]; then
exit 1
fi
-rosetta/shell webapp "cd /opt/code && source /env.sh && source /db_conf.sh && BACKEND_LOG_LEVEL=ERROR python3 manage.py makemigrations"
+rosetta/shell webapp "cd /opt/code && source /env.sh && BACKEND_LOG_LEVEL=ERROR python3 manage.py makemigrations"
diff --git a/rosetta/migrate b/rosetta/migrate
index 449dbb1..652b6bd 100755
--- a/rosetta/migrate
+++ b/rosetta/migrate
@@ -6,4 +6,4 @@ if [ ! -d ./services ]; then
exit 1
fi
-rosetta/shell webapp "cd /opt/code && source /env.sh && source /db_conf.sh && BACKEND_LOG_LEVEL=ERROR python3 manage.py migrate"
+rosetta/shell webapp "cd /opt/code && source /env.sh && BACKEND_LOG_LEVEL=ERROR python3 manage.py migrate"
diff --git a/services/webapp/code/rosetta/core_app/migrations/0034_auto_20231007_1052.py b/services/webapp/code/rosetta/core_app/migrations/0034_auto_20231007_1052.py
new file mode 100644
index 0000000..fbf77b9
--- /dev/null
+++ b/services/webapp/code/rosetta/core_app/migrations/0034_auto_20231007_1052.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.1 on 2023-10-07 10:52
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('core_app', '0033_auto_20220410_1531'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='task',
+ name='requires_tcp_tunnel',
+ field=models.BooleanField(verbose_name='Requires TCP tunnel'),
+ ),
+ ]
diff --git a/services/webapp/code/rosetta/core_app/models.py b/services/webapp/code/rosetta/core_app/models.py
index 53e38bd..7ef63dc 100644
--- a/services/webapp/code/rosetta/core_app/models.py
+++ b/services/webapp/code/rosetta/core_app/models.py
@@ -286,7 +286,7 @@ class Task(models.Model):
interface_port = models.IntegerField('Interface port', blank=True, null=True)
# Task access
- requires_tcp_tunnel = models.BooleanField('Requires a TCP tunnel')
+ requires_tcp_tunnel = models.BooleanField('Requires TCP tunnel')
tcp_tunnel_port = models.IntegerField('TCP tunnel port', blank=True, null=True)
requires_proxy = models.BooleanField('Requires proxy')
requires_proxy_auth = models.BooleanField('Requires proxy auth')
--
GitLab