diff --git a/.gitignore b/.gitignore index 70b7265051b5eabb1ba4322942867f6cc58b41b6..3edae7a012e511c96df71992e1a860874bc56683 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 9e7ccedcc54645c37b86cf679d9f1472edc5a0fe..5702e23a4204fb1ca60792ca141756386f1be461 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 449dbb1adc0a9cce628ca9e0709a4cf9546800a8..652b6bd6bb6f41affe54e2d7d089c5feb6d1affe 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 0000000000000000000000000000000000000000..fbf77b9721fc1e82e28141cc11685a7785032621 --- /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 53e38bd306a99317d8304fd527058bca4c5f7ba6..7ef63dcae7734b7e4c9b2fe3778edf83085c3225 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')