From 85f1c02e09e0c7af972476d433341e838de2a4e6 Mon Sep 17 00:00:00 2001 From: Joel Falknau Date: Mon, 7 Jul 2025 14:11:58 +1000 Subject: [PATCH] shift migrations to v5 squash --- ...remove_mumbleuser_display_name_and_more.py | 66 --------- ...015_alter_idlerhandler_options_and_more.py | 121 ----------------- ...ndler_alter_mumbleuser_options_and_more.py | 128 ++++++++++++++++++ ..._alter_mumbleuser_last_connect_and_more.py | 60 -------- ...ns_alter_idlerhandler_denylist_and_more.py | 27 ---- 5 files changed, 128 insertions(+), 274 deletions(-) delete mode 100644 allianceauth/services/modules/mumble/migrations/0014_idlerhandler_remove_mumbleuser_display_name_and_more.py delete mode 100644 allianceauth/services/modules/mumble/migrations/0015_alter_idlerhandler_options_and_more.py create mode 100644 allianceauth/services/modules/mumble/migrations/0016_idlerhandler_alter_mumbleuser_options_and_more.py delete mode 100644 allianceauth/services/modules/mumble/migrations/0016_templink_alter_mumbleuser_last_connect_and_more.py delete mode 100644 allianceauth/services/modules/mumble/migrations/0017_alter_tempuser_options_alter_idlerhandler_denylist_and_more.py diff --git a/allianceauth/services/modules/mumble/migrations/0014_idlerhandler_remove_mumbleuser_display_name_and_more.py b/allianceauth/services/modules/mumble/migrations/0014_idlerhandler_remove_mumbleuser_display_name_and_more.py deleted file mode 100644 index 234535d5..00000000 --- a/allianceauth/services/modules/mumble/migrations/0014_idlerhandler_remove_mumbleuser_display_name_and_more.py +++ /dev/null @@ -1,66 +0,0 @@ -# Generated by Django 4.2.16 on 2024-12-06 06:20 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('mumble', '0013_connection_history'), - ] - - operations = [ - migrations.CreateModel( - name='IdlerHandler', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=50, verbose_name='')), - ('enabled', models.BooleanField(default=False, verbose_name='')), - ('seconds', models.SmallIntegerField(default=3600, verbose_name='')), - ('interval', models.SmallIntegerField(default=60, verbose_name='')), - ('channel', models.SmallIntegerField(verbose_name='')), - ('denylist', models.BooleanField(default=True, verbose_name='')), - ('list', models.CharField(default='', max_length=50, verbose_name='')), - ], - options={ - 'verbose_name': '', - 'verbose_name_plural': 's', - }, - ), - migrations.RemoveField( - model_name='mumbleuser', - name='display_name', - ), - migrations.RemoveField( - model_name='mumbleuser', - name='groups', - ), - migrations.AlterField( - model_name='mumbleuser', - name='hashfn', - field=models.CharField(choices=[('bcrypt-sha256', ''), ('sha1', '')], default='bcrypt-sha256', max_length=15), - ), - migrations.CreateModel( - name='MumbleServerServer', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=50, verbose_name='')), - ('ip', models.GenericIPAddressField(verbose_name='')), - ('endpoint', models.GenericIPAddressField(verbose_name='')), - ('port', models.PositiveSmallIntegerField(default=6502, verbose_name='')), - ('secret', models.CharField(max_length=50, verbose_name='')), - ('watchdog', models.SmallIntegerField(default=30, verbose_name='')), - ('slice', models.CharField(choices=[('MumbleServer.ice', 'MumbleServer.ice eg, Mumble >=1.5.17'), ('Murmur.Ice', 'Murmur.Ice eg, Mumble <=1.5.17')], default='MumbleServer.ice', max_length=16)), - ('virtual_servers', models.CharField(default='1', max_length=50, verbose_name='')), - ('avatar_enable', models.BooleanField(verbose_name='')), - ('reject_on_error', models.BooleanField(verbose_name='')), - ('offset', models.IntegerField(default=1000000000, verbose_name='')), - ('idler_handler', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='mumble.idlerhandler', verbose_name='')), - ], - options={ - 'verbose_name': '', - 'verbose_name_plural': 's', - }, - ), - ] diff --git a/allianceauth/services/modules/mumble/migrations/0015_alter_idlerhandler_options_and_more.py b/allianceauth/services/modules/mumble/migrations/0015_alter_idlerhandler_options_and_more.py deleted file mode 100644 index 64fa49fa..00000000 --- a/allianceauth/services/modules/mumble/migrations/0015_alter_idlerhandler_options_and_more.py +++ /dev/null @@ -1,121 +0,0 @@ -# Generated by Django 4.2.16 on 2024-12-06 09:58 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('mumble', '0014_idlerhandler_remove_mumbleuser_display_name_and_more'), - ] - - operations = [ - migrations.AlterModelOptions( - name='idlerhandler', - options={'default_permissions': (), 'verbose_name': 'Idler Handler', 'verbose_name_plural': 'Idler Handlers'}, - ), - migrations.AlterModelOptions( - name='mumbleserverserver', - options={'default_permissions': (), 'verbose_name': 'Mumble Server', 'verbose_name_plural': 'Mumble Servers'}, - ), - migrations.AlterModelOptions( - name='mumbleuser', - options={'permissions': (('access_mumble', 'Can access the Mumble service'), ('view_connection_history', 'Can access the connection history of the Mumble service')), 'verbose_name': 'User', 'verbose_name_plural': 'Users'}, - ), - migrations.AlterField( - model_name='idlerhandler', - name='channel', - field=models.SmallIntegerField(verbose_name='AFK Channel'), - ), - migrations.AlterField( - model_name='idlerhandler', - name='enabled', - field=models.BooleanField(default=False, verbose_name='Enabled'), - ), - migrations.AlterField( - model_name='idlerhandler', - name='interval', - field=models.SmallIntegerField(default=60, verbose_name='Run Interval'), - ), - migrations.AlterField( - model_name='idlerhandler', - name='name', - field=models.CharField(max_length=50, verbose_name='Name'), - ), - migrations.AlterField( - model_name='idlerhandler', - name='seconds', - field=models.SmallIntegerField(default=3600, verbose_name='Idle Seconds'), - ), - migrations.AlterField( - model_name='mumbleserverserver', - name='avatar_enable', - field=models.BooleanField(default=True, verbose_name='Enable EVE Avatars'), - ), - migrations.AlterField( - model_name='mumbleserverserver', - name='endpoint', - field=models.GenericIPAddressField(default='127.0.0.1', verbose_name='Endpoint IP Address'), - ), - migrations.AlterField( - model_name='mumbleserverserver', - name='idler_handler', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='mumble.idlerhandler', verbose_name='Idler Handler'), - ), - migrations.AlterField( - model_name='mumbleserverserver', - name='ip', - field=models.GenericIPAddressField(default='127.0.0.1', verbose_name='Host IP Address'), - ), - migrations.AlterField( - model_name='mumbleserverserver', - name='name', - field=models.CharField(max_length=50), - ), - migrations.AlterField( - model_name='mumbleserverserver', - name='offset', - field=models.IntegerField(default=1000000000, verbose_name='ID Offset'), - ), - migrations.AlterField( - model_name='mumbleserverserver', - name='port', - field=models.PositiveSmallIntegerField(default=6502, verbose_name='Port'), - ), - migrations.AlterField( - model_name='mumbleserverserver', - name='reject_on_error', - field=models.BooleanField(default=True, verbose_name='Reject Unauthenticated'), - ), - migrations.AlterField( - model_name='mumbleserverserver', - name='secret', - field=models.CharField(max_length=50, verbose_name='ICE Secret'), - ), - migrations.AlterField( - model_name='mumbleserverserver', - name='slice', - field=models.CharField(choices=[('MumbleServer.ice', 'MumbleServer.ice (Mumble >=1.5.17)'), ('Murmur.Ice', 'Murmur.Ice (Mumble <=1.5.17)')], default='MumbleServer.ice', max_length=16), - ), - migrations.AlterField( - model_name='mumbleserverserver', - name='virtual_servers', - field=models.CharField(default='1', max_length=50, verbose_name='Virtual Servers'), - ), - migrations.AlterField( - model_name='mumbleserverserver', - name='watchdog', - field=models.SmallIntegerField(default=30, verbose_name='Watchdog Interval'), - ), - migrations.AlterField( - model_name='mumbleuser', - name='hashfn', - field=models.CharField(choices=[('bcrypt-sha256', 'SHA256'), ('sha1', 'SHA1')], default='bcrypt-sha256', max_length=15), - ), - migrations.AlterField( - model_name='mumbleuser', - name='last_disconnect', - field=models.DateTimeField(blank=True, editable=False, help_text='Timestamp of the users Last Disconnection from Mumble', max_length=254, null=True, verbose_name='Last Disconnection'), - ), - ] diff --git a/allianceauth/services/modules/mumble/migrations/0016_idlerhandler_alter_mumbleuser_options_and_more.py b/allianceauth/services/modules/mumble/migrations/0016_idlerhandler_alter_mumbleuser_options_and_more.py new file mode 100644 index 00000000..882b8460 --- /dev/null +++ b/allianceauth/services/modules/mumble/migrations/0016_idlerhandler_alter_mumbleuser_options_and_more.py @@ -0,0 +1,128 @@ +# Generated by Django 5.2.1 on 2025-07-07 04:07 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('eveonline', '0019_v5squash'), + ('mumble', '0015_v5squash'), + ] + + operations = [ + migrations.CreateModel( + name='IdlerHandler', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=50, verbose_name='Name')), + ('enabled', models.BooleanField(default=False, verbose_name='Enabled')), + ('seconds', models.SmallIntegerField(default=3600, verbose_name='Idle Seconds')), + ('interval', models.SmallIntegerField(default=60, verbose_name='Run Interval')), + ('channel', models.SmallIntegerField(verbose_name='AFK Channel')), + ('denylist', models.BooleanField(default=True, help_text='True for DenyList, False for Allowlist', verbose_name='DenyList')), + ('list', models.CharField(default='', max_length=50, verbose_name='Allow/Deny list')), + ], + options={ + 'verbose_name': 'Idler Handler', + 'verbose_name_plural': 'Idler Handlers', + 'default_permissions': (), + }, + ), + migrations.AlterModelOptions( + name='mumbleuser', + options={'permissions': (('access_mumble', 'Can access the Mumble service'), ('view_connection_history', 'Can access the connection history of the Mumble service')), 'verbose_name': 'User', 'verbose_name_plural': 'Users'}, + ), + migrations.RemoveField( + model_name='mumbleuser', + name='display_name', + ), + migrations.RemoveField( + model_name='mumbleuser', + name='groups', + ), + migrations.AlterField( + model_name='mumbleuser', + name='certhash', + field=models.CharField(blank=True, editable=False, help_text='Hash of Mumble client certificate as presented when user authenticates', max_length=254, null=True, verbose_name='Certificate Hash'), + ), + migrations.AlterField( + model_name='mumbleuser', + name='hashfn', + field=models.CharField(choices=[('bcrypt-sha256', 'SHA256'), ('sha1', 'SHA1')], default='bcrypt-sha256', max_length=15), + ), + migrations.AlterField( + model_name='mumbleuser', + name='last_connect', + field=models.DateTimeField(blank=True, editable=False, help_text='Timestamp of the users Last Connection to Mumble', null=True, verbose_name='Last Connection'), + ), + migrations.AlterField( + model_name='mumbleuser', + name='last_disconnect', + field=models.DateTimeField(blank=True, editable=False, help_text='Timestamp of the users Last Disconnection from Mumble', null=True, verbose_name='Last Disconnection'), + ), + migrations.AlterField( + model_name='mumbleuser', + name='release', + field=models.TextField(blank=True, editable=False, help_text='Client release. For official releases, this equals the version. For snapshots and git compiles, this will be something else.', null=True, verbose_name='Mumble Release'), + ), + migrations.CreateModel( + name='MumbleServerServer', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=50)), + ('ip', models.GenericIPAddressField(default='127.0.0.1', verbose_name='Host IP Address')), + ('endpoint', models.GenericIPAddressField(default='127.0.0.1', verbose_name='Endpoint IP Address')), + ('port', models.PositiveSmallIntegerField(default=6502, verbose_name='Port')), + ('secret', models.CharField(max_length=50, verbose_name='ICE Secret')), + ('watchdog', models.SmallIntegerField(default=30, verbose_name='Watchdog Interval')), + ('slice', models.CharField(choices=[('MumbleServer.ice', 'MumbleServer.ice (Mumble >=1.5.17)'), ('Murmur.Ice', 'Murmur.Ice (Mumble <=1.5.17)')], default='MumbleServer.ice', max_length=16)), + ('virtual_servers', models.CharField(default='1', max_length=50, verbose_name='Virtual Servers')), + ('avatar_enable', models.BooleanField(default=True, verbose_name='Enable EVE Avatars')), + ('reject_on_error', models.BooleanField(default=True, verbose_name='Reject Unauthenticated')), + ('offset', models.IntegerField(default=1000000000, verbose_name='ID Offset')), + ('idler_handler', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='mumble.idlerhandler', verbose_name='Idler Handler')), + ], + options={ + 'verbose_name': 'Mumble Server', + 'verbose_name_plural': 'Mumble Servers', + 'default_permissions': (), + }, + ), + migrations.CreateModel( + name='TempLink', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('expires', models.DateTimeField(verbose_name='Expiry')), + ('link_ref', models.CharField(max_length=20)), + ('creator', models.ForeignKey(default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, to='eveonline.evecharacter')), + ], + options={ + 'permissions': (('create_new_links', 'Can Create Temp Links'),), + }, + ), + migrations.CreateModel( + name='TempUser', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=200)), + ('username', models.CharField(max_length=254, unique=True)), + ('pwhash', models.CharField(max_length=90)), + ('hashfn', models.CharField(choices=[('bcrypt-sha256', 'SHA256'), ('sha1', 'SHA1')], default='bcrypt-sha256', max_length=15)), + ('certhash', models.CharField(blank=True, editable=False, help_text='Hash of Mumble client certificate as presented when user authenticates', max_length=254, null=True, verbose_name='Certificate Hash')), + ('release', models.TextField(blank=True, editable=False, help_text='Client release. For official releases, this equals the version. For snapshots and git compiles, this will be something else.', null=True, verbose_name='Mumble Release')), + ('version', models.IntegerField(blank=True, editable=False, help_text='Client version. Major version in upper 16 bits, followed by 8 bits of minor version and 8 bits of patchlevel. Version 1.2.3 = 0x010203.', null=True, verbose_name='Mumble Version')), + ('last_connect', models.DateTimeField(blank=True, editable=False, help_text='Timestamp of the users Last Connection to Mumble', null=True, verbose_name='Last Connection')), + ('last_disconnect', models.DateTimeField(blank=True, editable=False, help_text='Timestamp of the users Last Disconnection from Mumble', null=True, verbose_name='Last Disconnection')), + ('expires', models.DateTimeField(verbose_name='Expiry')), + ('character_id', models.IntegerField(blank=True, default=None, null=True)), + ('templink', models.ForeignKey(default=None, null=True, on_delete=django.db.models.deletion.CASCADE, to='mumble.templink')), + ], + options={ + 'verbose_name': 'Temp User', + 'verbose_name_plural': 'Temp Users', + 'permissions': (), + }, + ), + ] diff --git a/allianceauth/services/modules/mumble/migrations/0016_templink_alter_mumbleuser_last_connect_and_more.py b/allianceauth/services/modules/mumble/migrations/0016_templink_alter_mumbleuser_last_connect_and_more.py deleted file mode 100644 index c9f3f0b7..00000000 --- a/allianceauth/services/modules/mumble/migrations/0016_templink_alter_mumbleuser_last_connect_and_more.py +++ /dev/null @@ -1,60 +0,0 @@ -# Generated by Django 4.2.16 on 2024-12-06 10:47 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('eveonline', '0017_alliance_and_corp_names_are_not_unique'), - ('mumble', '0015_alter_idlerhandler_options_and_more'), - ] - - operations = [ - migrations.CreateModel( - name='TempLink', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('expires', models.DateTimeField(verbose_name='Expiry')), - ('link_ref', models.CharField(max_length=20)), - ('creator', models.ForeignKey(default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, to='eveonline.evecharacter')), - ], - options={ - 'permissions': (('create_new_links', 'Can Create Temp Links'),), - }, - ), - migrations.AlterField( - model_name='mumbleuser', - name='last_connect', - field=models.DateTimeField(blank=True, editable=False, help_text='Timestamp of the users Last Connection to Mumble', null=True, verbose_name='Last Connection'), - ), - migrations.AlterField( - model_name='mumbleuser', - name='last_disconnect', - field=models.DateTimeField(blank=True, editable=False, help_text='Timestamp of the users Last Disconnection from Mumble', null=True, verbose_name='Last Disconnection'), - ), - migrations.AlterField( - model_name='mumbleuser', - name='release', - field=models.TextField(blank=True, editable=False, help_text='Client release. For official releases, this equals the version. For snapshots and git compiles, this will be something else.', null=True, verbose_name='Mumble Release'), - ), - migrations.CreateModel( - name='TempUser', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=200)), - ('username', models.CharField(max_length=254, unique=True)), - ('pwhash', models.CharField(max_length=90)), - ('hashfn', models.CharField(choices=[('bcrypt-sha256', 'SHA256'), ('sha1', 'SHA1')], default='bcrypt-sha256', max_length=15)), - ('certhash', models.CharField(blank=True, editable=False, help_text='Hash of Mumble client certificate as presented when user authenticates', max_length=254, null=True, verbose_name='Certificate Hash')), - ('release', models.TextField(blank=True, editable=False, help_text='Client release. For official releases, this equals the version. For snapshots and git compiles, this will be something else.', null=True, verbose_name='Mumble Release')), - ('version', models.IntegerField(blank=True, editable=False, help_text='Client version. Major version in upper 16 bits, followed by 8 bits of minor version and 8 bits of patchlevel. Version 1.2.3 = 0x010203.', null=True, verbose_name='Mumble Version')), - ('last_connect', models.DateTimeField(blank=True, editable=False, help_text='Timestamp of the users Last Connection to Mumble', null=True, verbose_name='Last Connection')), - ('last_disconnect', models.DateTimeField(blank=True, editable=False, help_text='Timestamp of the users Last Disconnection from Mumble', null=True, verbose_name='Last Disconnection')), - ('expires', models.DateTimeField(verbose_name='Expiry')), - ('character_id', models.IntegerField(blank=True, default=None, null=True)), - ('templink', models.ForeignKey(default=None, null=True, on_delete=django.db.models.deletion.CASCADE, to='mumble.templink')), - ], - ), - ] diff --git a/allianceauth/services/modules/mumble/migrations/0017_alter_tempuser_options_alter_idlerhandler_denylist_and_more.py b/allianceauth/services/modules/mumble/migrations/0017_alter_tempuser_options_alter_idlerhandler_denylist_and_more.py deleted file mode 100644 index 9c9c3f37..00000000 --- a/allianceauth/services/modules/mumble/migrations/0017_alter_tempuser_options_alter_idlerhandler_denylist_and_more.py +++ /dev/null @@ -1,27 +0,0 @@ -# Generated by Django 4.2.16 on 2024-12-29 13:14 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('mumble', '0016_templink_alter_mumbleuser_last_connect_and_more'), - ] - - operations = [ - migrations.AlterModelOptions( - name='tempuser', - options={'permissions': (), 'verbose_name': 'Temp User', 'verbose_name_plural': 'Temp Users'}, - ), - migrations.AlterField( - model_name='idlerhandler', - name='denylist', - field=models.BooleanField(default=True, help_text='True for DenyList, False for Allowlist', verbose_name='DenyList'), - ), - migrations.AlterField( - model_name='idlerhandler', - name='list', - field=models.CharField(default='', max_length=50, verbose_name='Allow/Deny list'), - ), - ]