diff --git a/arkindex/documents/management/commands/build_fixtures.py b/arkindex/documents/management/commands/build_fixtures.py index e148226b0d09ab54cee68d4ea410ecbcd204c638..b4021838b7fd37a1cb5cb64b2da1ba800765ac4a 100644 --- a/arkindex/documents/management/commands/build_fixtures.py +++ b/arkindex/documents/management/commands/build_fixtures.py @@ -49,7 +49,7 @@ class Command(BaseCommand): img5 = Image.objects.create(path="img5", width=1000, height=1000, server=imgsrv) img6 = Image.objects.create(path="img6", width=1000, height=1000, server=imgsrv) - # Create an admin, an internal and a normal user + # Create an admin and a normal user superuser = User.objects.create_superuser("root@root.fr", "Pa$$w0rd", display_name="Admin") superuser.verified_email = True superuser.save() diff --git a/arkindex/project/config.py b/arkindex/project/config.py index 147e8528cc828f8d73f334f83f07da985065d686..3b99060be51e5ee8738ffafc3ebce5d641b87581 100644 --- a/arkindex/project/config.py +++ b/arkindex/project/config.py @@ -79,7 +79,6 @@ def add_s3_parser(parser, name, **kwargs): def get_settings_parser(base_dir): parser = ConfigParser() parser.add_option("arkindex_env", type=str, default="dev") - parser.add_option("internal_group_id", type=int, default=2) parser.add_option("local_imageserver_id", type=int, default=1) parser.add_option("allowed_hosts", type=str, many=True, default=[]) parser.add_option("imports_worker_version", type=uuid.UUID, default=None) diff --git a/arkindex/project/settings.py b/arkindex/project/settings.py index 9e898ded762321af73458191667846749edb26cf..238fd4906b9b39338291b4c573b9a9109425dc13 100644 --- a/arkindex/project/settings.py +++ b/arkindex/project/settings.py @@ -537,10 +537,6 @@ ARCHIVE_MIME_TYPES = { "application/zstd", } -# User groups with special permissions -# Deprecated, left there only to run the users.0004 migration -INTERNAL_GROUP_ID = conf["internal_group_id"] - # CDN Assets URL to use for arkindex remote CSS/JS/Images assets CDN_ASSETS_URL = conf["static"]["cdn_assets_url"] if CDN_ASSETS_URL is not None: diff --git a/arkindex/project/tests/config_samples/defaults.yaml b/arkindex/project/tests/config_samples/defaults.yaml index 0fd43ab9933478d6dafb0434ea0e94781d2d4d47..d94fedb78b5909aa2254cb536df1c20b78cb44a8 100644 --- a/arkindex/project/tests/config_samples/defaults.yaml +++ b/arkindex/project/tests/config_samples/defaults.yaml @@ -51,7 +51,6 @@ ingest: prefix_by_bucket_name: true region: null secret_access_key: null -internal_group_id: 2 job_timeouts: corpus_delete: 7200 element_trash: 3600 diff --git a/arkindex/project/tests/config_samples/errors.yaml b/arkindex/project/tests/config_samples/errors.yaml index 351af98d0628180547ad69cf0f85618a2565fcee..81514697a626838f7fd43103003647d3d87b0c6d 100644 --- a/arkindex/project/tests/config_samples/errors.yaml +++ b/arkindex/project/tests/config_samples/errors.yaml @@ -29,7 +29,6 @@ features: gitlab: app_id: yes app_secret: [] -internal_group_id: 2 ingest: endpoint: https://ohno access_key_id: a diff --git a/arkindex/project/tests/config_samples/override.yaml b/arkindex/project/tests/config_samples/override.yaml index 3e4f69e593c1f48694ef69d0a66c30bc092823e7..3aad60f04b22b4c6304f8180d8a7952cc5ecc53d 100644 --- a/arkindex/project/tests/config_samples/override.yaml +++ b/arkindex/project/tests/config_samples/override.yaml @@ -65,7 +65,6 @@ ingest: prefix_by_bucket_name: false region: middle-earth-1 secret_access_key: hunter2 -internal_group_id: 4 job_timeouts: corpus_delete: 1 element_trash: 2