From 10f57ce60948397073cc0bebc4387c6c445d7a00 Mon Sep 17 00:00:00 2001 From: Denzil Phillips Date: Fri, 20 Dec 2024 13:44:47 -0500 Subject: [PATCH 1/2] Removes Cicognara from inventory files Co-authored-by: Vickie Karasic Co-authored-by: Angel Ruiz --- inventory/all_projects/cicognara | 5 ----- inventory/by_environment/production | 1 - inventory/by_environment/staging | 1 - 3 files changed, 7 deletions(-) delete mode 100644 inventory/all_projects/cicognara diff --git a/inventory/all_projects/cicognara b/inventory/all_projects/cicognara deleted file mode 100644 index aecda87ba5..0000000000 --- a/inventory/all_projects/cicognara +++ /dev/null @@ -1,5 +0,0 @@ -[cicognara_staging] -cicognara-staging1.princeton.edu -[cicognara_production] -cicognara1.princeton.edu -cicognara2.princeton.edu diff --git a/inventory/by_environment/production b/inventory/by_environment/production index bb187ea671..afb76013c7 100644 --- a/inventory/by_environment/production +++ b/inventory/by_environment/production @@ -9,7 +9,6 @@ bibdata_production byzantine_production cantaloupe_production cdh_production -cicognara_production derrida_production dpul_production dss_production diff --git a/inventory/by_environment/staging b/inventory/by_environment/staging index 2950d2d88a..d947c0e07a 100644 --- a/inventory/by_environment/staging +++ b/inventory/by_environment/staging @@ -8,7 +8,6 @@ bibdata_staging byzantine_staging cantaloupe_staging cdh_staging -cicognara_staging derrida_staging dpul_staging dss_staging From 15d0b190ee6d02ce2d6f9262be8944e8914adab6 Mon Sep 17 00:00:00 2001 From: Denzil Phillips Date: Tue, 31 Dec 2024 12:53:11 -0500 Subject: [PATCH 2/2] Updated cicognara and libstatic configuration files, and other role adjustments --- group_vars/cicognara/production.yml | 40 ------------------- group_vars/cicognara/staging.yml | 33 --------------- group_vars/libstatic/production.yml | 6 --- group_vars/libstatic/staging.yml | 6 --- playbooks/cicognara.yml | 6 +-- roles/dss/molecule/default/yaml-lint.yml | 2 - roles/libstatic/defaults/main.yml | 6 --- .../files/conf/http/dev/static_staging.conf | 23 ----------- .../conf/http/templates/pudl_proxy_pass.conf | 4 -- roles/pas/molecule/default/yaml-lint.yml | 2 - 10 files changed, 1 insertion(+), 127 deletions(-) diff --git a/group_vars/cicognara/production.yml b/group_vars/cicognara/production.yml index 924d3e3e8e..7553673ae2 100644 --- a/group_vars/cicognara/production.yml +++ b/group_vars/cicognara/production.yml @@ -12,20 +12,8 @@ pg_hba_postgresql_user: "all" pg_hba_postgresql_database: "all" pg_hba_method: "md5" pg_hba_source: "{{ ansible_host }}/32" -passenger_server_name: "cicognara1.princeton.edu" -passenger_app_root: "/opt/cicognara/current/public" -passenger_app_env: "production" -rails_app_name: "cicognara" -rails_app_directory: "cicognara" rails_app_symlinks: [] -cicognara_db_name: 'cicognara' -cicognara_db_user: 'cicognara' -cicognara_db_password: '{{ vault_cicognara_db_password }}' rails_app_env: "production" -cicognara_host_name: 'cicognara1.princeton.edu' -application_db_name: '{{ cicognara_db_name }}' -application_dbuser_name: '{{ cicognara_db_user }}' -application_dbuser_password: '{{ cicognara_db_password }}' application_host: '{{ passenger_server_name }}' application_host_protocol: 'https' application_dbuser_role_attr_flags: 'CREATEDB' @@ -35,27 +23,6 @@ rails_app_dependencies: - libsqlite3-dev - nodejs rails_app_vars: - - name: CICOGNARA_SECRET_KEY_BASE - value: '{{ vault_cicognara_secret_key }}' - - name: CICOGNARA_DB - value: '{{ cicognara_db_name }}' - - name: CICOGNARA_DB_USERNAME - value: '{{ cicognara_db_user }}' - - name: CICOGNARA_DB_PASSWORD - value: '{{ cicognara_db_password }}' - - name: CICOGNARA_DB_HOST - value: '{{ postgres_host }}' - - name: APPLICATION_HOST - value: '{{ cicognara_host_name }}' - - name: APPLICATION_HOST_PROTOCOL - value: '{{ application_host_protocol }}' - - name: GOOGLE_CLIENT_SECRET - value: '{{ vault_cicognara_google_client_secret }}' - - name: GOOGLE_CLIENT_ID - value: '{{ vault_cicognara_google_client_id }}' - - name: CICOGNARA_SOLR_URL - value: 'http://lib-solr8-prod.princeton.edu:8983/solr/cicognara' -sidekiq_worker_name: cicognara-workers redis__server_default_configuration: syslog-enabled: "{{ redis__server_syslog | bool }}" syslog-ident: "{{ redis__server_syslog_ident }}" @@ -69,14 +36,12 @@ redis__server_default_configuration: maxmemory-samples: "{{ redis__server_maxmemory_samples }}" datadog_api_key: "{{ vault_datadog_key }}" datadog_config: - tags: "application:cicognara, environment:production, type:webserver" apm_enabled: "true" log_enabled: true process_config: enabled: "true" apm_config: analyzed_spans: - cicognara|rack.request: 1 filter_tags: reject: ["http.useragent:nginx/1.23.4 (health check)", "operation:heartbeat", "operation:job_fetch", "operation:scheduled_push", "operation:scheduled_poller_wait"] datadog_checks: @@ -84,8 +49,6 @@ datadog_checks: init_config: logs: - type: file - path: /opt/cicognara/current/log/production.log - service: cicognara source: ruby redisdb: init_config: @@ -93,9 +56,6 @@ datadog_checks: - host: 127.0.0.1 port: 6379 keys: - - 'cicognara:queue:default' - - 'cicognara:retry' - - 'cicognara:dead' tls: init_config: instances: diff --git a/group_vars/cicognara/staging.yml b/group_vars/cicognara/staging.yml index 3770418cb0..8487a1ed6d 100644 --- a/group_vars/cicognara/staging.yml +++ b/group_vars/cicognara/staging.yml @@ -10,20 +10,9 @@ pg_hba_postgresql_user: "all" pg_hba_postgresql_database: "all" pg_hba_method: "md5" pg_hba_source: "{{ ansible_host }}/32" -passenger_server_name: "cicognara-staging1.princeton.edu" -passenger_app_root: "/opt/cicognara/current/public" passenger_app_env: "staging" -rails_app_name: "cicognara" -rails_app_directory: "cicognara" rails_app_symlinks: [] -cicognara_db_name: 'cicognara_staging' -cicognara_db_user: 'cicognara_staging' -cicognara_db_password: "{{ vault_cicognara_staging_db_password }}" rails_app_env: "staging" -cicognara_host_name: "cicognara-staging1.princeton.edu" -application_db_name: "{{ cicognara_db_name }}" -application_dbuser_name: "{{ cicognara_db_user }}" -application_dbuser_password: "{{ cicognara_db_password }}" application_host: "{{ passenger_server_name }}" application_host_protocol: 'https' application_dbuser_role_attr_flags: '' @@ -32,28 +21,6 @@ rails_app_dependencies: - zlib1g-dev - libsqlite3-dev - nodejs -rails_app_vars: - - name: CICOGNARA_SECRET_KEY_BASE - value: '{{ vault_cicognara_staging_secret_key }}' - - name: CICOGNARA_DB - value: '{{ cicognara_db_name }}' - - name: CICOGNARA_DB_USERNAME - value: '{{ cicognara_db_user }}' - - name: CICOGNARA_DB_PASSWORD - value: '{{ cicognara_db_password }}' - - name: CICOGNARA_DB_HOST - value: '{{ postgres_host }}' - - name: APPLICATION_HOST - value: '{{ cicognara_host_name }}' - - name: APPLICATION_HOST_PROTOCOL - value: '{{ application_host_protocol }}' - - name: GOOGLE_CLIENT_SECRET - value: '{{ vault_cicognara_staging_google_client_secret }}' - - name: GOOGLE_CLIENT_ID - value: '{{ vault_cicognara_staging_google_client_id }}' - - name: CICOGNARA_SOLR_URL - value: 'http://lib-solr8-staging.princeton.edu:8983/solr/cicognara-staging' -sidekiq_worker_name: cicognara-workers redis__server_default_configuration: syslog-enabled: "{{ redis__server_syslog | bool }}" syslog-ident: "{{ redis__server_syslog_ident }}" diff --git a/group_vars/libstatic/production.yml b/group_vars/libstatic/production.yml index ca9ae43128..3c9ab23fce 100644 --- a/group_vars/libstatic/production.yml +++ b/group_vars/libstatic/production.yml @@ -12,12 +12,6 @@ named_sites: repo_root: "/var/local/daviesproject" git_repo: 'https://github.com/pulibrary/davies_project.git' version: 'main' - - server_name: "cicognara.org" - site_name: "cicognara.org" - doc_root: '/var/local/cicognara/apps/cicognara-static/_site' - repo_root: "/var/local/cicognara" - git_repo: 'https://github.com/pulibrary/digital-cicognara-library' - version: 'main' lib_static_site: site_name: 'static-prod1.lib' server_name: 'static-prod.lib' diff --git a/group_vars/libstatic/staging.yml b/group_vars/libstatic/staging.yml index ff708e3b31..f665dbeb06 100644 --- a/group_vars/libstatic/staging.yml +++ b/group_vars/libstatic/staging.yml @@ -2,12 +2,6 @@ # defaults file for roles/libstatic running_on_server: true named_sites: - - server_name: 'cicognara-staging.lib' - site_name: 'cicognara-staging.lib' - doc_root: '/var/local/digital-cicognara-library/apps/cicognara-static/_site' - repo_root: '/var/local/digital-cicognara-library' - git_repo: 'https://github.com/pulibrary/digital-cicognara-library.git' - version: 'main' - server_name: "daviesproject-staging.lib" site_name: "daviesproject-staging.lib" doc_root: "/var/local/daviesproject/_site" diff --git a/playbooks/cicognara.yml b/playbooks/cicognara.yml index 187974d0fb..d7c8fe1c7b 100644 --- a/playbooks/cicognara.yml +++ b/playbooks/cicognara.yml @@ -1,15 +1,11 @@ --- # by default this playbook runs in the staging environment # to run in production, pass '-e runtime_env=production' -- name: build the cicognara site - hosts: cicognara_{{ runtime_env | default('staging') }} remote_user: pulsys become: true vars_files: - ../site_vars.yml - - ../group_vars/cicognara/{{ runtime_env | default('staging') }}.yml - - ../group_vars/cicognara/vault.yml - roles: + roles: - role: roles/redis - role: roles/ruby - role: roles/deploy_user diff --git a/roles/dss/molecule/default/yaml-lint.yml b/roles/dss/molecule/default/yaml-lint.yml index a52a4d6f09..f080e5241c 100644 --- a/roles/dss/molecule/default/yaml-lint.yml +++ b/roles/dss/molecule/default/yaml-lint.yml @@ -23,9 +23,7 @@ rules: playbooks/ playbooks/apache2.yml playbooks/approvals_staging.yml - playbooks/cicognara_production.yml playbooks/bibdata_staging.yml - playbooks/cicognara.yml playbooks/bibdata.yml playbooks/lae.yml playbooks/figgy_staging.yml diff --git a/roles/libstatic/defaults/main.yml b/roles/libstatic/defaults/main.yml index a63baea1f0..7d429d00e0 100644 --- a/roles/libstatic/defaults/main.yml +++ b/roles/libstatic/defaults/main.yml @@ -10,12 +10,6 @@ named_sites: repo_root: "/var/local/milberg" git_repo: 'https://github.com/pulibrary/milberg-wp.git' version: 'main' - - server_name: 'cicognara-staging.lib' - site_name: 'cicognara-staging.lib' - doc_root: '/var/local/digital-cicognara-library/apps/cicognara-static/_site' - repo_root: '/var/local/digital-cicognara-library' - git_repo: 'https://github.com/pulibrary/digital-cicognara-library.git' - version: 'main' - server_name: 'daviesproject-staging.lib' site_name: 'daviesproject-staging.lib' doc_root: '/var/local/daviesproject/_site' diff --git a/roles/nginxplus/files/conf/http/dev/static_staging.conf b/roles/nginxplus/files/conf/http/dev/static_staging.conf index 1a17d18191..cf48d738f3 100644 --- a/roles/nginxplus/files/conf/http/dev/static_staging.conf +++ b/roles/nginxplus/files/conf/http/dev/static_staging.conf @@ -11,15 +11,6 @@ upstream static-staging { zone=static-stagingclient_sessions:1m; } -server { - listen 80; - server_name cicognara-staging.lib.princeton.edu; - - location / { - return 301 https://cicognara-staging.lib.princeton.edu$request_uri; - } -} - server { listen 80; server_name daviesproject-staging.lib.princeton.edu; @@ -47,20 +38,6 @@ server { } } -server { - listen 443 ssl; - http2 on; - server_name cicognara-staging.lib.princeton.edu; - - ssl_certificate /etc/letsencrypt/live/cicognara-staging.lib/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/cicognara-staging.lib/privkey.pem; - ssl_session_cache shared:SSL:1m; - ssl_prefer_server_ciphers on; - - location ~ ^/catalog/(\d+)$ { - return 301 /catalogo/itempages/$1.html; - } - location / { app_protect_enable off; app_protect_security_log_enable off; diff --git a/roles/nginxplus/files/conf/http/templates/pudl_proxy_pass.conf b/roles/nginxplus/files/conf/http/templates/pudl_proxy_pass.conf index 96e461d035..27a948bedc 100644 --- a/roles/nginxplus/files/conf/http/templates/pudl_proxy_pass.conf +++ b/roles/nginxplus/files/conf/http/templates/pudl_proxy_pass.conf @@ -132,7 +132,3 @@ # lae redirects # rewrite ^/collections/pudl0025(.*)$ https://lae.princeton.edu$1 redirect; - -# cicognara redirects -# - rewrite ^/collections/pudl0134(.*)$ https://cicognara.org$1 redirect; diff --git a/roles/pas/molecule/default/yaml-lint.yml b/roles/pas/molecule/default/yaml-lint.yml index f60b20a0bb..fa34acfc9c 100644 --- a/roles/pas/molecule/default/yaml-lint.yml +++ b/roles/pas/molecule/default/yaml-lint.yml @@ -22,9 +22,7 @@ rules: ignore: | playbooks/ playbooks/apache2.yml - playbooks/cicognara_production.yml playbooks/bibdata_staging.yml - playbooks/cicognara.yml playbooks/bibdata.yml playbooks/lae.yml playbooks/figgy_staging.yml