hyrax 3.4.1 → 4.0.0.beta1

data/app/views/hyrax/users/_user_info.html.erb

@@ -34,12 +34,12 @@
   <dd><%= mail_to user.email %></dd>
 
   <% if user.chat_id %>
-    <dt><span class="glyphicon glyphicon-bullhorn" aria-hidden="true"></span> Chat ID</dt>
+    <dt><span class="fa fa-bullhorn" aria-hidden="true"></span> Chat ID</dt>
     <dd><%= user.chat_id %></dd>
   <% end %>
 
   <% if user.website %>
-    <dt><span class="glyphicon glyphicon-globe" aria-hidden="true"></span> Website(s)</dt>
+    <dt><span class="fa fa-globe" aria-hidden="true"></span> Website(s)</dt>
     <dd><%= iconify_auto_link(user.website) %></dd>
   <% end %>
 
@@ -64,7 +64,7 @@
   <% end %>
 
   <% if user.address %>
-    <dt><span class="glyphicon glyphicon-map-marker" aria-hidden="true"></span> Address</dt>
+    <dt><span class="fa fa-map-marker" aria-hidden="true"></span> Address</dt>
     <dd><%= user.address %></dd>
   <% end %>
 
@@ -74,7 +74,7 @@
   <% end %>
 
   <% if user.telephone %>
-    <dt><span class="glyphicon glyphicon-earphone" aria-hidden="true"></span> Telephone</dt>
+    <dt><span class="fa fa-phone" aria-hidden="true"></span> Telephone</dt>
     <dd><%= link_to_telephone(user) %></dd>
   <% end %>
 

data/app/views/hyrax/users/_vitals.html.erb

@@ -1,15 +1,15 @@
 <div class="list-group-item">
-  <span class="glyphicon glyphicon-time" aria-hidden="true"></span> <%= t("hyrax.dashboard.stats.joined_on") %> <%= user.created_at.to_date.strftime("%b %d, %Y") %>
+  <span class="fa fa-clock-o" aria-hidden="true"></span> <%= t("hyrax.dashboard.stats.joined_on") %> <%= user.created_at.to_date.strftime("%b %d, %Y") %>
 </div>
 
 <div class="list-group-item">
   <span class="badge"><%= number_of_collections(user) %></span>
-  <span class="glyphicon glyphicon-folder-open" aria-hidden="true"></span> <%= link_to_field('', '', t("hyrax.dashboard.stats.collections"), {generic_type: "Collection", depositor: user.to_s}) %>
+  <span class="fa fa-folder-open" aria-hidden="true"></span> <%= link_to_field('', '', t("hyrax.dashboard.stats.collections"), {generic_type: "Collection", depositor: user.to_s}) %>
 </div>
 
 <div class="list-group-item">
   <span class="badge"><%= number_of_works(user) %></span>
-  <span class="glyphicon glyphicon-upload" aria-hidden="true"></span> <%= link_to_field('', '', t("hyrax.dashboard.stats.works"), {generic_type: "Work", depositor: user.to_s}) %>
+  <span class="fa fa-upload" aria-hidden="true"></span> <%= link_to_field('', '', t("hyrax.dashboard.stats.works"), {generic_type: "Work", depositor: user.to_s}) %>
 
   <ul class="views-downloads-dashboard list-unstyled">
       <li><span class="badge badge-optional"><%= user.total_file_views %></span> <%= t("hyrax.dashboard.stats.file_views").pluralize(user.total_file_views) %></li>

data/app/views/hyrax/users/show.html.erb

@@ -1,9 +1,9 @@
 <div class="row profile">
-  <div class="col-xs-3">
+  <div class="col-3">
     <%= render 'left_sidebar' %>
   </div>
   <!-- right col -->
-  <div class="col-xs-9">
+  <div class="col-9">
     <%= render 'profile_tabs', presenter: @presenter %>
   </div>
 </div>

data/app/views/layouts/hyrax/dashboard.html.erb

@@ -9,18 +9,18 @@
     <div class="skip-to-content">
       <%= link_to "Skip to Content", "#skip-to-content" %>
     </div>
-    <%= render '/masthead' %>
+    <%= render '/masthead', placement_class: 'fixed-top' %>
     <%= content_for(:navbar) %>
     <div id="content-wrapper" role="main">
       <div class="sidebar maximized">
         <%= render 'hyrax/dashboard/sidebar' %>
       </div>
-      <div class="main-content maximized">
+      <div class="main-content maximized<%= " admin-stats" if request.fullpath.include? '/admin/stats' %>">
         <%= render_breadcrumbs builder: Hyrax::BootstrapBreadcrumbsBuilder %>
         <%= render '/flash_msg' %>
         <% if content_for?(:page_header) %>
           <div class="row">
-            <div class="col-xs-12 main-header">
+            <div class="col-12 main-header">
               <%= yield(:page_header) %>
             </div>
           </div>
@@ -33,6 +33,6 @@
       </div>
 
     </div><!-- /#content-wrapper -->
-    <%= render 'shared/ajax_modal' %>
+    <%= render 'shared/modal' %>
   </body>
 </html>

data/app/views/layouts/hyrax.html.erb

@@ -9,15 +9,16 @@
     <div class="skip-to-content">
       <%= link_to "Skip to Content", "#skip-to-content" %>
     </div>
-    <%= render '/masthead' %>
+    <%= render '/masthead', placement_class: nil %>
     <%= content_for(:navbar) %>
     <%= content_for(:precontainer_content) %>
     <div id="content-wrapper" class="container" role="main">
+      <%= content_for(:container_header) %>
       <%= render '/flash_msg' %>
       <%= render_breadcrumbs builder: Hyrax::BootstrapBreadcrumbsBuilder %>
       <% if content_for?(:page_header) %>
         <div class="row">
-          <div class="col-xs-12 main-header">
+          <div class="col-12 main-header">
             <%= yield(:page_header) %>
           </div>
         </div>
@@ -28,6 +29,6 @@
       <%= content_for?(:content) ? yield(:content) : yield %>
     </div><!-- /#content-wrapper -->
     <%= render 'shared/footer' %>
-    <%= render 'shared/ajax_modal' %>
+    <%= render 'shared/modal' %>
   </body>
 </html>

data/app/views/shared/_appearance_styles.html.erb

@@ -2,17 +2,17 @@
 <style>
 <% appearance = Hyrax::Forms::Admin::Appearance.new %>
 a { color: <%= appearance.link_color %>; }
-.navbar-inverse .navbar-link { color: <%= appearance.footer_link_color %>; }
+.navbar-dark.bg-dark .navbar-link { color: <%= appearance.footer_link_color %>; }
 
-.navbar-inverse { background-color: <%= appearance.header_background_color %>; }
+.navbar-dark.bg-dark { background-color: <%= appearance.header_background_color %> !important; }
 
-.navbar-inverse .navbar-nav > .open > a,
-.navbar-inverse .navbar-nav > .open > a:hover,
-.navbar-inverse .navbar-nav > .open > a:focus { background-color: <%= appearance.header_background_color %>; }
+.navbar-dark.bg-dark .navbar-nav > .open > a,
+.navbar-dark.bg-dark .navbar-nav > .open > a:hover,
+.navbar-dark.bg-dark .navbar-nav > .open > a:focus { background-color: <%= appearance.header_background_color %>; }
 
-.navbar-inverse .navbar-nav > li > a,
-.navbar-inverse .navbar-text,
-.navbar-inverse .navbar-brand { color: <%= appearance.header_text_color %>; }
+.navbar-dark.bg-dark .navbar-nav > li > a,
+.navbar-dark.bg-dark .navbar-text,
+.navbar-dark.bg-dark .navbar-brand { color: <%= appearance.header_text_color %>; }
 
 .btn-primary {
   background-color: <%= appearance.primary_button_background_color %>;

data/app/views/shared/_footer.html.erb

@@ -1,4 +1,4 @@
-<footer class="navbar navbar-inverse site-footer">
+<footer class="navbar navbar-dark bg-dark site-footer">
   <div class="container-fluid">
     <div class="navbar-text text-left">
         <p><%= t('hyrax.footer.service_html') %></p>

data/app/views/shared/_locale_picker.html.erb

@@ -2,15 +2,12 @@
     <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false" aria-controls="language-dropdown-menu">
         <span class="sr-only"><%= t('hyrax.toolbar.language_switch') %></span>
         <span title="<%= t('hyrax.toolbar.language_switch') %>"><%= available_translations[I18n.locale.to_s] %></span>
-        <b class="caret"></b>
     </a>
-    <ul id="language-dropdown-menu" class="dropdown-menu" role="menu">
-        <li role="presentation" class="dropdown-header"><%= t('hyrax.toolbar.language_switch') %></li>
-        <li role="presentation" class="divider"></li>
+    <div id="language-dropdown-menu" class="dropdown-menu" role="menu">
+        <div role="presentation" class="dropdown-header"><%= t('hyrax.toolbar.language_switch') %></div>
+        <div role="presentation" class="dropdown-divider"></div>
         <% available_translations.each do |language, label| %>
-            <li role="presentation" lang="<%= language %>">
-                <%= link_to label, "?locale=#{language}", class: 'dropdown-item', role: 'menuitem', tabindex: '-1', data: { locale: language } %>
-            </li>
+            <%= link_to label, "?locale=#{language}", class: 'dropdown-item', role: 'menuitem', lang: language, tabindex: '-1', data: { locale: language } %>
         <% end %>
-    </ul>
+    </div>
 </li>

data/app/views/shared/_nav_safety_modal.html.erb

@@ -5,8 +5,8 @@
         <%= t(:'hyrax.nav_safety.change_tab_message') %>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-default" id="nav-safety-acknowledge" data-dismiss="modal">Cancel</button>
-        <button type="button" class="btn btn-default" id="nav-safety-dismiss" data-dismiss="modal">OK</button>
+        <button type="button" class="btn btn-secondary" id="nav-safety-acknowledge" data-dismiss="modal">Cancel</button>
+        <button type="button" class="btn btn-secondary" id="nav-safety-dismiss" data-dismiss="modal">OK</button>
       </div>
     </div>
   </div>

data/app/views/shared/_select_work_type_modal.html.erb

@@ -3,8 +3,8 @@
   <div class="modal-dialog" role="document">
     <form class="modal-content new-work-select">
       <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-label="<%= t('hyrax.dashboard.heading_actions.close') %>"><span aria-hidden="true">&times;</span></button>
         <h2 class="modal-title" id="select-worktype-label"><%= t('hyrax.dashboard.heading_actions.select_type_of_work') %></h2>
+        <button type="button" class="close" data-dismiss="modal" aria-label="<%= t('hyrax.dashboard.heading_actions.close') %>"><span aria-hidden="true">&times;</span></button>
       </div>
       <div class="modal-body">
         <% create_work_presenter.each do |row_presenter| %>
@@ -25,7 +25,7 @@
         <% end %>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal"><%= t('hyrax.dashboard.heading_actions.close') %></button>
+        <button type="button" class="btn btn-secondary" data-dismiss="modal"><%= t('hyrax.dashboard.heading_actions.close') %></button>
         <input type="submit" class="btn btn-primary" value="<%= t('hyrax.dashboard.heading_actions.create_work') %>" />
       </div>
     </form>

data/chart/hyrax/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: hyrax
 description: An open-source, Samvera-powered digital repository system
 type: application
-version: 1.1.0
+version: 1.5.1
 appVersion: 3.3.0
 dependencies:
   - name: fcrepo
@@ -11,21 +11,25 @@ dependencies:
     condition: fcrepo.enabled
   - name: memcached
     version: 4.2.21
-    repository: https://charts.bitnami.com/bitnami
+    repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
     condition: memcached.enabled
   - name: minio
     version: 6.7.2
-    repository: https://charts.bitnami.com/bitnami
+    repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
     condition: minio.enabled
   - name: postgresql
     version: 10.3.13
-    repository: https://charts.bitnami.com/bitnami
+    repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
     condition: postgresql.enabled
   - name: redis
     version: 10.7.16
-    repository: https://charts.bitnami.com/bitnami
+    repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
     condition: redis.enabled
   - name: solr
     version: 1.0.1
-    repository: https://charts.bitnami.com/bitnami
+    repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
     condition: solr.enabled
+  - name: nginx
+    version: 9.8.0
+    repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
+    condition: nginx.enabled

data/chart/hyrax/templates/_helpers.tpl

@@ -179,6 +179,10 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- printf "redis://:%s@%s:%s" .Values.redis.password (include "hyrax.redis.host" .) "6379/0" -}}
 {{- end -}}
 
+{{- define "hyrax.nginx.host" -}}
+{{- printf "%s-%s" .Release.Name "nginx" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
 {{- define "hyrax.sharedPvcAccessModes" -}}
 {{- if .Values.worker.enabled }}
 accessModes:

data/chart/hyrax/templates/cron-embargo.yaml

@@ -11,6 +11,11 @@ spec:
   jobTemplate:
     spec:
       template:
+        metadata:
+        {{- with .Values.podAnnotations }}
+          annotations:
+            {{- toYaml . | nindent 12 }}
+        {{- end }}
         spec:
           containers:
           - name: embargo-release

data/chart/hyrax/templates/cron-lease.yaml

@@ -11,6 +11,11 @@ spec:
   jobTemplate:
     spec:
       template:
+        metadata:
+        {{- with .Values.podAnnotations }}
+          annotations:
+            {{- toYaml . | nindent 12 }}
+        {{- end }}
         spec:
           containers:
           - name: lease-release

data/chart/hyrax/templates/deployment-worker.yaml

@@ -64,6 +64,17 @@ spec:
             {{- end }}
           env:
             {{- toYaml .Values.worker.extraEnvVars | nindent 12 }}
+          {{- if .Values.worker.readinessProbe.enabled }}
+          readinessProbe:
+            exec:
+              command:
+                {{- toYaml .Values.worker.readinessProbe.command | nindent 16 }}
+            failureThreshold: {{ .Values.worker.readinessProbe.failureThreshold }}
+            initialDelaySeconds: {{ .Values.worker.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.worker.readinessProbe.periodSeconds }}
+            successThreshold: {{ .Values.worker.readinessProbe.successThreshold }}
+            timeoutSeconds: {{ .Values.worker.readinessProbe.timeoutSeconds }}
+          {{- end }}
           volumeMounts:
             - name: derivatives
               mountPath: /app/samvera/derivatives

data/chart/hyrax/templates/ingress.yaml

@@ -1,6 +1,7 @@
 {{- if .Values.ingress.enabled -}}
-{{- $fullName := include "hyrax.fullname" . -}}
-{{- $svcPort := .Values.service.port -}}
+{{- $svcFullName := ternary (include "hyrax.nginx.host" .) (include "hyrax.fullname" .) .Values.nginx.enabled -}}
+{{- $svcPort := ternary .Values.nginx.service.port .Values.service.port .Values.nginx.enabled -}}
+
 {{- $beta := semverCompare "<1.19-0" (default .Capabilities.KubeVersion.Version .Values.kubeVersion) -}}
 {{- if $beta }}
 apiVersion: networking.k8s.io/v1beta1
@@ -9,7 +10,7 @@ apiVersion: networking.k8s.io/v1
 {{- end }}
 kind: Ingress
 metadata:
-  name: {{ $fullName }}
+  name: {{ include "hyrax.fullname" . }}
   labels:
     {{- include "hyrax.labels" . | nindent 4 }}
   {{- with .Values.ingress.annotations }}
@@ -37,14 +38,14 @@ spec:
             pathType: {{ .pathType | default "ImplementationSpecific" }}
             backend:
               {{- if $beta }}
-              serviceName: {{ $fullName }}
+              serviceName: {{ $svcFullName }}
               servicePort: {{ $svcPort }}
               {{- else }}
               service:
-                name: {{ $fullName }}
+                name: {{ $svcFullName }}
                 port:
                   number: {{ $svcPort }}
               {{- end }}
           {{- end }}
     {{- end }}
-  {{- end }}
+{{- end }}

data/chart/hyrax/values.yaml

@@ -201,6 +201,18 @@ worker:
   affinity: {}
   resources: {}
 
+  # see: https://github.com/mperham/sidekiq/wiki/Kubernetes#health-checks
+  readinessProbe:
+    enabled: false
+    # command:
+    #  - cat
+    #  - /app/samvera/hyrax-webapp/tmp/sidekiq_process_has_started_and_will_begin_processing_jobs
+    # initialDelaySeconds: 10
+    # periodSeconds: 2
+    # timeoutSeconds: 1
+    # failureThreshold: 10
+    # successThreshold: 2
+
 fcrepo:
   enabled: true
   externalDatabaseUsername: "hyrax"
@@ -238,6 +250,144 @@ postgresql:
   # persistence:
   #   size: 10Gi
 
+
+## Nginx proxy is used to keep puma from having to serve static assets
+## and to act as an auth proxy for Cantelope
+nginx:
+  enabled: false
+  # The set up below does malicious bot / ip blocking and mounts
+  # vaolumes to allow nginx to server assets and other public directory items
+  # image:
+  #   registry: registry.gitlab.com
+  #   repository: notch8/scripts/bitnami-nginx
+  #   tag: 1.21.5-debian-10-r4
+  # extraVolumes:
+  #   - name: "uploads"
+  #     persistentVolumeClaim:
+  #       claimName: {{ .Values.global.hyraxHostName }}-uploads
+  # extraVolumeMounts:
+  #   - name: uploads
+  #     mountPath: /app/samvera/hyrax-webapp/public/system
+  #     subPath: public-system
+  #   - name: uploads
+  #     mountPath: /app/samvera/hyrax-webapp/public/uploads
+  #     subPath: public-uploads
+  #   - name: uploads
+  #     mountPath: /app/samvera/hyrax-webapp/public/uv
+  #     subPath: public-uv
+  #   - name: uploads
+  #     mountPath: /app/samvera/hyrax-webapp/public/assets
+  #     subPath: public-assets
+  # serverBlock: |-
+  #   upstream rails_app {
+  #     server {{ .Values.global.hyraxHostName }};
+  #   }
+
+  #   map $status $loggable {
+  #       ~^444  0;
+  #       default 1;
+  #   }
+
+  #   log_format loki 'host=$host ip=$http_x_forwarded_for remote_user=$remote_user [$time_local] '
+  #                     'request="$request" status=$status bytes=$body_bytes_sent '
+  #                     'referer="$http_referer" agent="$http_user_agent" request_time=$request_time upstream_response_time=$upstream_response_time upstream_response_length=$upstream_response_length';
+
+  #   error_log  /opt/bitnami/nginx/logs/error.log warn;
+  #   #tcp_nopush     on;
+
+  #   # Cloudflare ips see for refresh
+  #   # https://support.cloudflare.com/hc/en-us/articles/200170786-Restoring-original-visitor-IPs-logging-visitor-IP-addresses
+  #   # update list https://www.cloudflare.com/ips/
+  #   set_real_ip_from 103.21.244.0/22;
+  #   set_real_ip_from 103.22.200.0/22;
+  #   set_real_ip_from 103.31.4.0/22;
+  #   set_real_ip_from 104.16.0.0/13;
+  #   set_real_ip_from 104.24.0.0/14;
+  #   set_real_ip_from 108.162.192.0/18;
+  #   set_real_ip_from 131.0.72.0/22;
+  #   set_real_ip_from 141.101.64.0/18;
+  #   set_real_ip_from 162.158.0.0/15;
+  #   set_real_ip_from 172.64.0.0/13;
+  #   set_real_ip_from 173.245.48.0/20;
+  #   set_real_ip_from 188.114.96.0/20;
+  #   set_real_ip_from 190.93.240.0/20;
+  #   set_real_ip_from 197.234.240.0/22;
+  #   set_real_ip_from 198.41.128.0/17;
+  #   set_real_ip_from 2400:cb00::/32;
+  #   set_real_ip_from 2606:4700::/32;
+  #   set_real_ip_from 2803:f800::/32;
+  #   set_real_ip_from 2405:b500::/32;
+  #   set_real_ip_from 2405:8100::/32;
+  #   set_real_ip_from 2a06:98c0::/29;
+  #   set_real_ip_from 2c0f:f248::/32;
+
+  #   real_ip_header X-Forwarded-For;
+  #   real_ip_recursive on;
+  #   include /opt/bitnami/nginx/conf/conf.d/*.conf;
+  #   server {
+  #       listen 8080;
+  #       server_name _;
+  #       root /app/samvera/hyrax-webapp/public;
+  #       index index.html;
+
+  #       client_body_in_file_only clean;
+  #       client_body_buffer_size 32K;
+  #       client_max_body_size 0;
+  #       access_log /opt/bitnami/nginx/logs/access.log loki;
+  #       # if=$loggable;
+
+  #       sendfile on;
+  #       send_timeout 300s;
+
+  #       include /opt/bitnami/nginx/conf/bots.d/ddos.conf;
+  #       include /opt/bitnami/nginx/conf/bots.d/blockbots.conf;
+
+  #       location ~ (\.php|\.aspx|\.asp) {
+  #       	return 404;
+  #       }
+
+  #       # deny requests for files that should never be accessed
+  #       location ~ /\. {
+  #         deny all;
+  #       }
+
+  #       location ~* ^.+\.(rb|log)$ {
+  #         deny all;
+  #       }
+
+  #       # serve static (compiled) assets directly if they exist (for rails production)
+  #       location ~ ^/(assets|packs|fonts|images|javascripts|stylesheets|swfs|system)/ {
+  #         try_files $uri @rails;
+
+  #         # access_log off;
+  #         gzip_static on; # to serve pre-gzipped version
+
+  #         expires max;
+  #         add_header Cache-Control public;
+
+  #         # Some browsers still send conditional-GET requests if there's a
+  #         # Last-Modified header or an ETag header even if they haven't
+  #         # reached the expiry date sent in the Expires header.
+  #         add_header Last-Modified "";
+  #         add_header ETag "";
+  #         break;
+  #       }
+
+  #       # send non-static file requests to the app server
+  #       location / {
+  #         try_files $uri @rails;
+  #       }
+
+  #       location @rails {
+  #         proxy_set_header  X-Real-IP  $remote_addr;
+  #         proxy_set_header  X-Forwarded-For $proxy_add_x_forwarded_for;
+  #         proxy_set_header Host $http_host;
+  #         proxy_redirect off;
+  #         proxy_pass http://rails_app;
+  #       }
+  #   }
+
+
 redis:
   enabled: true
   password: mysecret
@@ -273,6 +423,8 @@ global:
   postgresql:
     postgresqlUsername: hyrax
     postgresqlPassword: hyrax_pass
+  # This is th name of the running rails server pod
+  hyraxHostName: hyrax
 
 nodeSelector: {}
 

data/config/features.rb

@@ -1,53 +1,51 @@
 # frozen_string_literal: true
 Flipflop.configure do
-  begin
-    # Strategies will be used in the order listed here.
-    strategy :cookie
-    strategy :active_record, class: Hyrax::Feature
-    strategy Hyrax::Strategies::YamlStrategy, config: Hyrax.config.feature_config_path
-    strategy :default
-
-    feature :proxy_deposit,
-            default: true,
-            description: "Depositors may designate proxies to deposit works on their behalf"
-
-    feature :transfer_works,
-            default: true,
-            description: "Depositors may transfer their works to another user"
-
-    # Note, if this is deactivated, a default admin set will be created and all
-    # works will be assigned to it when they are created.
-    feature :assign_admin_set,
-            default: true,
-            description: "Ability to assign uploaded items to an admin set"
-
-    feature :show_deposit_agreement,
-            default: true,
-            description: "Show a deposit agreement to users creating works"
-
-    feature :active_deposit_agreement_acceptance,
-            default: Hyrax.config.active_deposit_agreement_acceptance?,
-            description: "Require an active acceptance of the deposit agreement by checking a checkbox"
-
-    feature :batch_upload,
-            default: false,
-            description: "Enable uploading batches of works"
-
-    feature :hide_private_items,
-            default: false,
-            description: "Do not show the private items."
-
-    feature :hide_users_list,
-            default: true,
-            description: "Do not show users list unless user has authenticated."
-
-    feature :cache_work_iiif_manifest,
-            default: false,
-            description: "Use Rails.cache to cache the JSON document for IIIF manifests"
-    feature :read_only,
-            default: false,
-            description: "Put the system into read-only mode. Deposits, edits, approvals and anything that makes a change to the data will be disabled."
-  rescue Flipflop::StrategyError, Flipflop::FeatureError => err
-    Rails.logger.warn "Ignoring #{err}: #{err.message}"
-  end
+  # Strategies will be used in the order listed here.
+  strategy :cookie
+  strategy :active_record, class: Hyrax::Feature
+  strategy Hyrax::Strategies::YamlStrategy, config: Hyrax.config.feature_config_path
+  strategy :default
+
+  feature :proxy_deposit,
+          default: true,
+          description: "Depositors may designate proxies to deposit works on their behalf"
+
+  feature :transfer_works,
+          default: true,
+          description: "Depositors may transfer their works to another user"
+
+  # Note, if this is deactivated, a default admin set will be created and all
+  # works will be assigned to it when they are created.
+  feature :assign_admin_set,
+          default: true,
+          description: "Ability to assign uploaded items to an admin set"
+
+  feature :show_deposit_agreement,
+          default: true,
+          description: "Show a deposit agreement to users creating works"
+
+  feature :active_deposit_agreement_acceptance,
+          default: Hyrax.config.active_deposit_agreement_acceptance?,
+          description: "Require an active acceptance of the deposit agreement by checking a checkbox"
+
+  feature :batch_upload,
+          default: false,
+          description: "Enable uploading batches of works"
+
+  feature :hide_private_items,
+          default: false,
+          description: "Do not show the private items."
+
+  feature :hide_users_list,
+          default: true,
+          description: "Do not show users list unless user has authenticated."
+
+  feature :cache_work_iiif_manifest,
+          default: false,
+          description: "Use Rails.cache to cache the JSON document for IIIF manifests"
+  feature :read_only,
+          default: false,
+          description: "Put the system into read-only mode. Deposits, edits, approvals and anything that makes a change to the data will be disabled."
+rescue Flipflop::StrategyError, Flipflop::FeatureError => err
+  Rails.logger.warn "Ignoring #{err}: #{err.message}"
 end

data/config/initializers/{valkryrie_storage.rb → storage_adapter_initializer.rb}

@@ -5,3 +5,8 @@ Valkyrie::StorageAdapter.register(
                               path_generator: Hyrax::ValkyrieSimplePathGenerator),
   :branding_disk
 )
+
+Valkyrie::StorageAdapter.register(
+  Valkyrie::Storage::Disk.new(base_path: Hyrax.config.derivatives_path),
+  :derivatives_disk
+)