From b2841c811e96a2106169ffea15d3c40a911fde59 Mon Sep 17 00:00:00 2001 From: Cian Hughes Date: Fri, 7 Feb 2025 10:01:22 +0000 Subject: [PATCH] Undid ./repo changes and updated settings --- repo/.invenio | 4 ++-- repo/docker-compose.full.yml | 26 ++++---------------- repo/docker-compose.yml | 2 +- repo/docker-services.yml | 41 +++++++------------------------- repo/docker/uwsgi/uwsgi_rest.ini | 5 +--- repo/docker/uwsgi/uwsgi_ui.ini | 5 +--- repo/invenio.cfg | 14 +++++------ 7 files changed, 24 insertions(+), 73 deletions(-) diff --git a/repo/.invenio b/repo/.invenio index a5d52fa..8772fbd 100644 --- a/repo/.invenio +++ b/repo/.invenio @@ -6,7 +6,7 @@ logfile = /logs/invenio-cli.log project_name = AM-D-Model Data Repository project_shortname = am-d-model-data-repository package_name = am_d_model_data_repository -project_site = am-d-model.eu +project_site = invenio.am-d-model.eu author_name = Cian Hughes author_email = repo@am-d-model.eu year = 2025 @@ -17,7 +17,7 @@ development_tools = no site_code = yes use_reduced_vocabs = no _template = https://github.com/inveniosoftware/cookiecutter-invenio-rdm.git -_output_dir = /home/ec2-user +_output_dir = /home/ec2-user/am-d-model.eu [files] app_data = {'pages': {'.gitkeep': '22818f8c9f68fb11b7ca893ad1c082f844ae9f691f082d2174e32738d9ae6114'}, 'vocabularies': {'cc_licences.csv': '19a8bfd2488c7adb90d1dbe1c70f57cf2e0a737cb11814cc814f917072843de7', 'languages.yaml': 'd3bdb59940e8e6cd2401785ad55733f5fc6a1fb0bb0a2005a8fe4e5148e5f286', 'names.yaml': '6dc80984186ec960bcf53fbb6c482554d0aaf386d345bf82f504fdbd896e5848', 'subjects_oecd_fos.yaml': 'eef38714c506d956193c3be17e6004049525d252bf22424f4804dfc1ad46db44', 'affiliations_ror.yaml': '2e913fbecacd3694cba1b9a10739164911c2d45db3b32f1cb923027c48e0ac3e'}, 'README.md': 'd58978488626bdeddc791a15a39e341a4ed06f202b84d0c0d4aa9ef49481c6d9', 'vocabularies.yaml': '86f780281913b4ed5683775632d36511b16dff4b4f90fa7f14127cf69ab4e0cc'} diff --git a/repo/docker-compose.full.yml b/repo/docker-compose.full.yml index e7202c4..06462d2 100644 --- a/repo/docker-compose.full.yml +++ b/repo/docker-compose.full.yml @@ -24,32 +24,22 @@ services: extends: file: docker-services.yml service: cache - networks: - - am-d-model-repo-network db: extends: file: docker-services.yml service: db - networks: - - am-d-model-repo-network mq: extends: file: docker-services.yml service: mq - networks: - - am-d-model-repo-network search: extends: file: docker-services.yml service: search - networks: - - am-d-model-repo-network s3: extends: file: docker-services.yml service: s3 - networks: - - am-d-model-repo-network # Frontend frontend: extends: @@ -60,8 +50,9 @@ services: depends_on: - web-ui - web-api - networks: - - am-d-model-repo-network + ports: + - "80:80" + - "443:443" # UI Application web-ui: extends: @@ -73,8 +64,6 @@ services: - "5000" volumes: - static_data:/opt/invenio/var/instance/static - networks: - - am-d-model-repo-network # API Rest Application web-api: @@ -85,8 +74,6 @@ services: image: am-d-model-data-repository:latest ports: - "5000" - networks: - - am-d-model-repo-network # Worker worker: @@ -104,11 +91,6 @@ services: condition: service_started mq: condition: service_started - networks: - - am-d-model-repo-network -networks: - am-d-model-repo-network: - name: am-d-model-repo-network volumes: static_data: - redis_data: + data: diff --git a/repo/docker-compose.yml b/repo/docker-compose.yml index 912538a..c212340 100644 --- a/repo/docker-compose.yml +++ b/repo/docker-compose.yml @@ -14,6 +14,7 @@ # - OpenSearch (exposed ports: 9200, 9600) # - Kibana (view ES indexes) (exposed ports: 5601) # +version: "2.2" services: cache: extends: @@ -37,4 +38,3 @@ services: service: s3 volumes: data: - redis_data: diff --git a/repo/docker-services.yml b/repo/docker-services.yml index aed3ff0..e131478 100644 --- a/repo/docker-services.yml +++ b/repo/docker-services.yml @@ -18,12 +18,9 @@ services: - "INVENIO_CELERY_RESULT_BACKEND=redis://cache:6379/2" - "INVENIO_COMMUNITIES_IDENTITIES_CACHE_REDIS_URL=redis://cache:6379/4" - "INVENIO_SEARCH_HOSTS=['search:9200']" - # - "INVENIO_SECRET_KEY=${aws secretsmanager get-secret-value --secret-id Invenio | jq '.SecretString | fromjson | .INVENIO_SECRET_KEY'}" - "INVENIO_SQLALCHEMY_DATABASE_URI=postgresql+psycopg2://am-d-model-data-repository:am-d-model-data-repository@db/am-d-model-data-repository" - "INVENIO_WSGI_PROXIES=2" - "INVENIO_RATELIMIT_STORAGE_URL=redis://cache:6379/3" - networks: - - am-d-model-repo-network frontend: build: ./docker/nginx/ image: am-d-model-data-repository-frontend @@ -31,19 +28,13 @@ services: ports: - "80" - "443" - networks: - - am-d-model-repo-network cache: image: redis:7 restart: "unless-stopped" - # read_only: true + read_only: true command: redis-server --appendonly yes - volumes: - - redis_data:/data ports: - "6379:6379" - networks: - - am-d-model-repo-network db: image: postgres:14.13 restart: "unless-stopped" @@ -51,17 +42,14 @@ services: - .env environment: - "POSTGRES_USER=am-d-model-data-repository" - # - "POSTGRES_PASSWORD=am-d-model-data-repository" - "POSTGRES_DB=am-d-model-data-repository" ports: - "5432" - networks: - - am-d-model-repo-network pgadmin: image: dpage/pgadmin4:6 restart: "unless-stopped" ports: - - "5050" + - "5050:80" environment: PGADMIN_DEFAULT_EMAIL: "repo@am-d-model.eu" PGADMIN_DEFAULT_PASSWORD: "am-d-model-data-repository" @@ -73,10 +61,8 @@ services: image: rabbitmq:3-management restart: "unless-stopped" ports: - - "15672" - - "5672" - networks: - - am-d-model-repo-network + - "15672:15672" + - "5672:5672" search: image: opensearchproject/opensearch:2.17.1 restart: "unless-stopped" @@ -96,10 +82,8 @@ services: hard: 65536 mem_limit: 2g ports: - - "9200" - - "9600" - networks: - - am-d-model-repo-network + - "9200:9200" + - "9600:9600" opensearch-dashboards: image: opensearchproject/opensearch-dashboards:2.17.1 ports: @@ -116,8 +100,8 @@ services: image: minio/minio:RELEASE.2022-10-24T18-35-07Z restart: "unless-stopped" ports: - - "9000" - - "9001" + - "9000:9000" + - "9001:9001" env_file: - .env environment: @@ -131,12 +115,3 @@ services: interval: 30s timeout: 20s retries: 3 - networks: - - am-d-model-repo-network - -networks: - am-d-model-repo-network: - name: am-d-model-repo-network - -volumes: - redis_data: diff --git a/repo/docker/uwsgi/uwsgi_rest.ini b/repo/docker/uwsgi/uwsgi_rest.ini index a7b0d20..8d26747 100644 --- a/repo/docker/uwsgi/uwsgi_rest.ini +++ b/repo/docker/uwsgi/uwsgi_rest.ini @@ -10,7 +10,4 @@ mount = /api=invenio_app.wsgi_rest:application manage-script-name = true wsgi-disable-file-wrapper = true single-interpreter = true -buffer-size = 65535 -log-4xx = true -log-5xx = true -debug = true +buffer-size = 8192 diff --git a/repo/docker/uwsgi/uwsgi_ui.ini b/repo/docker/uwsgi/uwsgi_ui.ini index 5337abb..2c8d408 100644 --- a/repo/docker/uwsgi/uwsgi_ui.ini +++ b/repo/docker/uwsgi/uwsgi_ui.ini @@ -7,8 +7,5 @@ die-on-term = true processes = 2 threads = 2 single-interpreter = true -buffer-size = 65535 +buffer-size = 8192 wsgi-disable-file-wrapper = true -log-4xx = true -log-5xx = true -debug = true diff --git a/repo/invenio.cfg b/repo/invenio.cfg index a428862..ff58668 100644 --- a/repo/invenio.cfg +++ b/repo/invenio.cfg @@ -25,7 +25,6 @@ def init_env(): } config(options) - print("Environment variables loaded successfully.") init_env() @@ -58,7 +57,7 @@ SECRET_KEY=get_env_variable("INVENIO_SECRET_KEY") # provided, the allowed hosts variable is set to localhost. In production it # should be set to the correct host and it is strongly recommended to only # route correct hosts to the application. -APP_ALLOWED_HOSTS = ['0.0.0.0', 'localhost', '127.0.0.1', 'am-d-modeleu-caddy-1'] +APP_ALLOWED_HOSTS = ['0.0.0.0', 'localhost', '127.0.0.1', 'am-d-modeleu-repo-web-ui-1', 'repo-web-ui', 'am-d-modeleu-caddy-1', 'caddy'] # Flask-SQLAlchemy @@ -170,7 +169,8 @@ FILES_REST_STORAGE_FACTORY='invenio_s3.s3fs_storage_factory' # Invenio-S3 # ========== -S3_ENDPOINT_URL='http://localhost:9000/' +S3_ENDPOINT_URL='https://s3.eu-west-1.amazonaws.com/' +S3_REGION_NAME='eu-west-1' S3_ACCESS_KEY_ID=get_env_variable("S3_ACCESS_KEY_ID") S3_SECRET_ACCESS_KEY=get_env_variable("S3_SECRET_ACCESS_KEY") @@ -184,9 +184,9 @@ APP_DEFAULT_SECURE_HEADERS['content_security_policy']['default-src'].append( # See https://github.com/inveniosoftware/invenio-records-resources/blob/master/invenio_records_resources/config.py # TODO: Set with your own hostname when deploying to production -SITE_UI_URL = "https://am-d-model.eu/repo" +SITE_UI_URL = "https://invenio.am-d-model.eu" -SITE_API_URL = "https://am-d-model.eu/repo/api" +SITE_API_URL = "https://invenio.am-d-model.eu/api" # Invenio-RDM-Records # =================== @@ -230,7 +230,7 @@ USERPROFILES_READ_ONLY = False # allow users to change profile info (name, emai # ======= # See https://github.com/inveniosoftware/invenio-oaiserver/blob/master/invenio_oaiserver/config.py -OAISERVER_ID_PREFIX = "am-d-model.eu" +OAISERVER_ID_PREFIX = "invenio.am-d-model.eu" """The prefix that will be applied to the generated OAI-PMH ids.""" OAISERVER_ADMIN_EMAILS = [ "repo@am-d-model.eu", @@ -239,7 +239,7 @@ OAISERVER_ADMIN_EMAILS = [ # Invenio-Search # -------------- -SEARCH_INDEX_PREFIX = "am-d-model-data-repository-" +SEARCH_INDEX_PREFIX = "am-d-model-" # Invenio-Users-Resources # -----------------------