diff --git a/forgejo.yml b/forgejo.yml index 351a162..2d54e71 100644 --- a/forgejo.yml +++ b/forgejo.yml @@ -12,5 +12,3 @@ internal_token: "{{ forgejo_internal_token }}" secret_key: "{{ forgejo_secret_key }}" lfs_jwt_secret: "{{ forgejo_lfs_jwt_secret }}" - minio_access_key_id: uTJp8KfKSETa1uYMZnSM - minio_secret_access_key: "{{ forgejo_minio_secret_access_key }}" diff --git a/roles/forgejo/meta/argument_specs.yml b/roles/forgejo/meta/argument_specs.yml index 8830a6f..b6445ee 100644 --- a/roles/forgejo/meta/argument_specs.yml +++ b/roles/forgejo/meta/argument_specs.yml @@ -69,13 +69,7 @@ argument_specs: type: str storage_type: type: str - minio_endpoint: - type: str - minio_access_key_id: - type: str - minio_secret_access_key: - type: str - minio_bucket: + app_data_path: type: str cache_adapter: type: str diff --git a/roles/forgejo/templates/app.ini.j2 b/roles/forgejo/templates/app.ini.j2 index f8f0cee..21a2a72 100644 --- a/roles/forgejo/templates/app.ini.j2 +++ b/roles/forgejo/templates/app.ini.j2 @@ -11,11 +11,6 @@ USER={{ db_user }} PASSWD={{ db_password }} [storage] -STORAGE_TYPE={{ storage_type }} -MINIO_ENDPOINT={{ minio_endpoint }} -MINIO_ACCESS_KEY_ID={{ minio_access_key_id }} -MINIO_SECRET_ACCESS_KEY={{ minio_secret_access_key }} -MINIO_BUCKET={{ minio_bucket }} [log] LEVEL={{ log_level }} @@ -43,6 +38,8 @@ SECRET_KEY={{ secret_key }} DOMAIN={{ domain }} ROOT_URL={{ root_url }} HTTP_PORT={{ http_port | string }} +STORAGE_TYPE={{ storage_type }} +APP_DATA_PATH={{ app_data_path }} LFS_START_SERVER={{ lfs_start_server | string }} LFS_JWT_SECRET={{ lfs_jwt_secret }} diff --git a/roles/forgejo/vars/main.yml b/roles/forgejo/vars/main.yml index 7afc790..0575fdc 100644 --- a/roles/forgejo/vars/main.yml +++ b/roles/forgejo/vars/main.yml @@ -42,11 +42,8 @@ cache_host: redis://redis-forgejo:6379/0?pool_size=100&idle_timeout=180s lfs_start_server: true lfs_jwt_secret: "" -storage_type: minio -minio_endpoint: minio:9000 -minio_access_key_id: "" -minio_secret_access_key: "" -minio_bucket: forgejo +storage_type: local +app_data_path: /data/storage cookie_name: session cookie_secure: true