Merge branch 'staging_deploy_env' into 'main'

pathname from env all the time

See merge request notch8/britishlibrary!92

config/initializers/hyrax.rb

@@ -123,19 +123,17 @@
 
   # Temporary path to hold uploads before they are ingested into FCrepo.
   # This must be a lambda that returns a Pathname
-  if Settings.multitenancy.enabled
-   config.upload_path = ->() do
-     if Settings.s3.upload_bucket
-       "uploads/#{Apartment::Tenant.current}"
-     else
-       Rails.root + 'public' + 'uploads' + Apartment::Tenant.current
-     end
-   end
+  config.upload_path = ->() do
+    if Settings.s3.upload_bucket
+      "uploads/#{Apartment::Tenant.current}"
+    else
+      ENV['HYRAX_UPLOAD_PATH'].present? ? Pathname.new(File.join(ENV['HYRAX_UPLOAD_PATH'], Apartment::Tenant.current)) : Rails.root.join('public', 'uploads', Apartment::Tenant.current)
+    end
   end
 
   # Location on local file system where derivatives will be stored.
   # If you use a multi-server architecture, this MUST be a shared volume.
-  # config.derivatives_path = File.join(Rails.root, 'tmp', 'derivatives')
+  config.derivatives_path = ENV['HYRAX_DERIVATIVES_PATH'].present? ? ENV['HYRAX_DERIVATIVES_PATH'] :  File.join(Rails.root, 'tmp', 'derivatives')
 
   # Should schema.org microdata be displayed?
   # config.display_microdata = true
@@ -179,18 +177,18 @@
   #   config.browse_everything = nil
   # end
   config.browse_everything = nil
-  
+
   config.iiif_image_server = true
-  
+
   config.iiif_image_url_builder = lambda do |file_id, base_url, size|
     Riiif::Engine.routes.url_helpers.image_url(file_id, host: base_url, size: size)
   end
-  
+
   config.iiif_info_url_builder = lambda do |file_id, base_url|
     uri = Riiif::Engine.routes.url_helpers.info_url(file_id, host: base_url)
     uri.sub(%r{/info\.json\Z}, '')
   end
-  
+
 end
 
 Date::DATE_FORMATS[:standard] = "%m/%d/%Y"

ops/staging-deploy.yaml

@@ -56,7 +56,7 @@ extraEnvVars:
   - name: IN_DOCKER
     value: "true"
   - name: LD_LIBRARY_PATH
-    value: /opt/fits-latest/tools/mediainfo/linux
+    value: /app/fits/tools/mediainfo/linux
   - name: PASSENGER_APP_ENV
     value: production
   - name: RAILS_CACHE_STORE_URL
@@ -80,7 +80,7 @@ extraEnvVars:
   - name: SETTINGS__DEVISE__INVITATION_FROM_EMAIL
     value: [email protected]
   - name: SETTINGS__FITS_PATH
-    value: /opt/fits/fits.sh
+    value: /app/fits/fits.sh
   - name: SETTINGS__MULTITENANCY__ADMIN_HOST
     value: staging-nnp-web.notch8.cloud
   - name: SETTINGS__MULTITENANCY__ADMIN_ONLY_TENANT_CREATION
@@ -109,6 +109,20 @@ extraEnvVars:
     value: "8983"
   - name: SOLR_URL
     value: http://admin:***REMOVED***@solr.staging-solr:8983/solr/
+  - name: SMTP_ENABLED
+    value: "true"
+  - name: SMTP_USER_NAME
+    value: 857d9918238540
+  - name: SMTP_PASSWORD
+    value: 885f7e2bdd17c5
+  - name: SMTP_ADDRESS
+    value: smtp.mailtrap.io
+  - name: SMTP_DOMAIN
+    value: smtp.mailtrap.io
+  - name: SMTP_PORT
+    value: "2525"
+  - name: SMTP_TYPE
+    value: cram_md5
 
 worker:
   replicaCount: 1
@@ -151,7 +165,7 @@ worker:
   - name: IN_DOCKER
     value: "true"
   - name: LD_LIBRARY_PATH
-    value: /opt/fits-latest/tools/mediainfo/linux
+    value: /app/fits/tools/mediainfo/linux
   - name: PASSENGER_APP_ENV
     value: production
   - name: RAILS_CACHE_STORE_URL
@@ -175,7 +189,7 @@ worker:
   - name: SETTINGS__DEVISE__INVITATION_FROM_EMAIL
     value: [email protected]
   - name: SETTINGS__FITS_PATH
-    value: /opt/fits/fits.sh
+    value: /app/fits/fits.sh
   - name: SETTINGS__MULTITENANCY__ADMIN_HOST
     value: staging-nnp-web.notch8.cloud
   - name: SETTINGS__MULTITENANCY__ADMIN_ONLY_TENANT_CREATION
@@ -204,6 +218,20 @@ worker:
     value: "8983"
   - name: SOLR_URL
     value: http://admin:***REMOVED***@solr.staging-solr:8983/solr/
+  - name: SMTP_ENABLED
+    value: "true"
+  - name: SMTP_USER_NAME
+    value: 857d9918238540
+  - name: SMTP_PASSWORD
+    value: 885f7e2bdd17c5
+  - name: SMTP_ADDRESS
+    value: smtp.mailtrap.io
+  - name: SMTP_DOMAIN
+    value: smtp.mailtrap.io
+  - name: SMTP_PORT
+    value: "2525"
+  - name: SMTP_TYPE
+    value: cram_md5
 
 podSecurityContext:
   runAsUser: 1001