Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Cicognara] Removes inventory files #5655

Closed
wants to merge 2 commits into from
Closed

[Cicognara] Removes inventory files #5655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10f57ce
Removes Cicognara from inventory files
dphillips28 Dec 20, 2024
15d0b19
Updated cicognara and libstatic configuration files, and other role a…
dphillips28 Dec 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 0 additions & 40 deletions group_vars/cicognara/production.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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 }}"
Expand All @@ -69,33 +36,26 @@ 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:
ruby:
init_config:
logs:
- type: file
path: /opt/cicognara/current/log/production.log
service: cicognara
source: ruby
redisdb:
init_config:
instances:
- host: 127.0.0.1
port: 6379
keys:
- 'cicognara:queue:default'
- 'cicognara:retry'
- 'cicognara:dead'
tls:
init_config:
instances:
Expand Down
33 changes: 0 additions & 33 deletions group_vars/cicognara/staging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: ''
Expand All @@ -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 }}"
Expand Down
6 changes: 0 additions & 6 deletions group_vars/libstatic/production.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

won't this bring down cicognara?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

indeed, the entries in libstatic need to stay

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'
Expand Down
6 changes: 0 additions & 6 deletions group_vars/libstatic/staging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@
# defaults file for roles/libstatic
running_on_server: true
named_sites:
- server_name: 'cicognara-staging.lib'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we want cicognara staging to continue to run.

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"
Expand Down
5 changes: 0 additions & 5 deletions inventory/all_projects/cicognara
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion inventory/by_environment/production
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ bibdata_production
byzantine_production
cantaloupe_production
cdh_production
cicognara_production
derrida_production
dpul_production
dss_production
Expand Down
1 change: 0 additions & 1 deletion inventory/by_environment/staging
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ bibdata_staging
byzantine_staging
cantaloupe_staging
cdh_staging
cicognara_staging
derrida_staging
dpul_staging
dss_staging
Expand Down
6 changes: 1 addition & 5 deletions playbooks/cicognara.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This playbook can be deleted entirely. We do not want to build a standalone cicognara site any more.

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
Expand Down
2 changes: 0 additions & 2 deletions roles/dss/molecule/default/yaml-lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions roles/libstatic/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we want this to stay.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

anything in libstatic should stay

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'
Expand Down
23 changes: 0 additions & 23 deletions roles/nginxplus/files/conf/http/dev/static_staging.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,6 @@ upstream static-staging {
zone=static-stagingclient_sessions:1m;
}

server {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these need to stay also

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;
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 0 additions & 4 deletions roles/nginxplus/files/conf/http/templates/pudl_proxy_pass.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,3 @@
# lae redirects
#
rewrite ^/collections/pudl0025(.*)$ https://lae.princeton.edu$1 redirect;

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this will remove cicognara

# cicognara redirects
#
rewrite ^/collections/pudl0134(.*)$ https://cicognara.org$1 redirect;
2 changes: 0 additions & 2 deletions roles/pas/molecule/default/yaml-lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading