From d2349c3140283f67d4193a3859fb92f1ca2181f6 Mon Sep 17 00:00:00 2001 From: Denzil Phillips Date: Fri, 17 Jan 2025 08:47:56 -0500 Subject: [PATCH] Removed OJS from inventory and role/ngingxplus --- inventory/all_projects/ojs | 10 ---- roles/nginxplus/files/conf/http/ojs-prod.conf | 56 ------------------ .../files/conf/http/ojs-staging.conf | 58 ------------------- 3 files changed, 124 deletions(-) delete mode 100644 inventory/all_projects/ojs delete mode 100644 roles/nginxplus/files/conf/http/ojs-prod.conf delete mode 100644 roles/nginxplus/files/conf/http/ojs-staging.conf diff --git a/inventory/all_projects/ojs b/inventory/all_projects/ojs deleted file mode 100644 index dfa35e9c80..0000000000 --- a/inventory/all_projects/ojs +++ /dev/null @@ -1,10 +0,0 @@ -[ojs_production] -ojs-prod1.princeton.edu -# ojs-prod2.princeton.edu -[ojs_staging] -# ojs-staging1.princeton.edu -ojs-staging2.princeton.edu - -[ojs:children] -ojs_staging -ojs_production \ No newline at end of file diff --git a/roles/nginxplus/files/conf/http/ojs-prod.conf b/roles/nginxplus/files/conf/http/ojs-prod.conf deleted file mode 100644 index 8e0b349730..0000000000 --- a/roles/nginxplus/files/conf/http/ojs-prod.conf +++ /dev/null @@ -1,56 +0,0 @@ -# {{ ansible_managed | comment }} -proxy_cache_path /var/cache/nginx/ojs-prod/ keys_zone=ojs-prodcache:10m; - -upstream ojs-prod1 { - zone ojs-prod 64k; - #server ojs-prod1.princeton.edu:443; - #server ojs-prod2.princeton.edu:443; - sticky learn - create=$upstream_cookie_ojsprodcookie - lookup=$cookie_ojsprodcookie - zone=ojsprodclient_sessions:1m; -} - -server { - listen 80; - server_name ojs-prod.princeton.edu; - - location / { - return 301 https://$server_name$request_uri; - } -} - -server { - listen 443 ssl http2; - server_name ojs-prod.princeton.edu; - - ssl_certificate /etc/letsencrypt/live/ojs-prod/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/ojs-prod/privkey.pem; - ssl_session_cache shared:SSL:1m; - ssl_prefer_server_ciphers on; - - location / { - proxy_pass https://ojs-prod1; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header Host $host; - proxy_ssl_certificate /etc/letsencrypt/live/ojs-prod/fullchain.pem; - proxy_ssl_certificate_key /etc/letsencrypt/live/ojs-prod/privkey.pem; - proxy_ssl_protocols TLSv1 TLSv1.1 TLSv1.2; - proxy_ssl_ciphers HIGH:!aNULL:!MD5; - - proxy_cache ojs-prodcache; - # allow princeton network - include /etc/nginx/conf.d/templates/restrict.conf; - # block all - deny all; - } - include /etc/nginx/conf.d/templates/prod-maintenance.conf; - -} - -server { -# Permanent redirect to ojs-prod - server_name ojs-prod1.princeton.edu; - rewrite ^/(.*)$ https://ojs-prod.princeton.edu/$1 permanent; -} diff --git a/roles/nginxplus/files/conf/http/ojs-staging.conf b/roles/nginxplus/files/conf/http/ojs-staging.conf deleted file mode 100644 index 54b7ae778e..0000000000 --- a/roles/nginxplus/files/conf/http/ojs-staging.conf +++ /dev/null @@ -1,58 +0,0 @@ -# Ansible managed -proxy_cache_path /var/cache/nginx/ojs-staging/ keys_zone=ojs-stagingcache:10m; - -upstream ojs-staging1 { - zone ojs-staging 64k; - #server ojs-staging1.princeton.edu:443; - server ojs-staging2.princeton.edu:443; - sticky learn - create=$upstream_cookie_ojsstagingcookie - lookup=$cookie_ojsstagingcookie - zone=ojsstagingclient_sessions:1m; -} - -server { - listen 80; - server_name ojs-staging.princeton.edu; - - location / { - return 301 https://$server_name$request_uri; - } -} - -server { - listen 443 ssl http2; - server_name ojs-staging.princeton.edu; - client_max_body_size 75M; - - ssl_certificate /etc/letsencrypt/live/ojs-staging/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/ojs-staging/privkey.pem; - ssl_session_cache shared:SSL:1m; - ssl_prefer_server_ciphers on; - - location / { - # app_protect_enable on; - # app_protect_security_log_enable on; - proxy_pass https://ojs-staging1; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header Host $host; - proxy_ssl_protocols TLSv1 TLSv1.1 TLSv1.2; - proxy_ssl_ciphers HIGH:!aNULL:!MD5; - proxy_intercept_errors on; - - proxy_cache ojs-stagingcache; - # allow princeton network - include /etc/nginx/conf.d/templates/restrict.conf; - # block all - deny all; - } - include /etc/nginx/conf.d/templates/errors.conf; - -} - -server { -# Permanent redirect to ojs-staging - server_name ojs-staging1.princeton.edu; - rewrite ^/(.*)$ https://ojs-staging.princeton.edu/$1 permanent; -}