dor-services 5.13.0 → 5.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83ea7517f092cf1a5d89325c43366ccb4e3bee86
-  data.tar.gz: 94eadb824517f646112e73134687684be1e2f47c
+  metadata.gz: e8cb605ae9ed74300c5e0d6748d8f0c274fb3896
+  data.tar.gz: ec4c6ac406b9da2a3253c346b2df694e83c224f4
 SHA512:
-  metadata.gz: b5a1a67f735a73ec58a0958f0daeb650d83e42ed09dea6c2fc3592c3d2caa58b4e5fb0187bbe2d4dd5d79741820a3178b6e935933a83569a27e527f50c7b8d37
-  data.tar.gz: 4cd1cdd316963885fe7f3e82ad67fcd1e42aa32170ab6f2e08b4980bc7ebaf10b0d7d9736837bef6defe3a07a1eaba2dc1cb166a5c03087cae55bc3e8a237c0d
+  metadata.gz: f8e4bd986251c5be9211888e9c25f917affee01c787386ba48f2180a136701cc0b1be87445a9d9cbcc579d00aa2e132014db53e6a0c562962e9af5ea2bf069f0
+  data.tar.gz: d9ba452a5a57f1cc64069ce15ed71aa50dd0211d753d7a85885a0c8ba1d855efc59e5d71926dd2450abcce81da54b5d68dd0d627c0110370cc25fa8ddd7106b3

data/lib/dor/datastreams/rights_metadata_ds.rb

@@ -51,6 +51,18 @@ module Dor
       end.doc
     end
 
+    RIGHTS_TYPE_CODES = {
+      'world' => 'World',
+      'world-nd' => 'World (no-download)',
+      'stanford' => 'Stanford',
+      'stanford-nd' => 'Stanford (no-download)',
+      'loc:spec' => 'Location spec',
+      'loc:music' => 'Location music',
+      'dark' => 'Dark (Preserve Only)',
+      'none' => 'Citation Only'
+    }.freeze
+
+
     # just a wrapper to invalidate @dra_object
     def content=(xml)
       @dra_object = nil
@@ -61,36 +73,64 @@ module Dor
       @dra_object ||= Dor::RightsAuth.parse(ng_xml, true)
     end
 
-    # @param rights [string] archetypical rights to assign: 'world', 'stanford', 'none' or 'dark'
-    # Moved from Governable
-    # slight misnomer: also sets discover rights!
-    # TODO: convert xpath reads to dra_object calls
-    def set_read_rights(rights)
-      raise(ArgumentError, "Argument '#{rights}' is not a recognized value") unless %w(world stanford none dark).include? rights
-      rights_xml = ng_xml
-      if rights_xml.search('//rightsMetadata/access[@type=\'read\']').length == 0
-        raise('The rights metadata stream doesnt contain an entry for machine read permissions. Consider populating it from the APO before trying to change it.')
-      end
-      label = rights == 'dark' ? 'none' : 'world'
-      @dra_object = nil # until TODO complete, we'll expect to have to reparse after modification
+    # key is the rights type code, used by e.g. RightsMetadataDS#set_read_rights and Editable#default_rights=
+    # value is the human-readable string, used for indexing, and for things like building select lists in the argo UI.
+    def self.valid_rights_types
+      RIGHTS_TYPE_CODES.keys
+    end
+
+    def self.valid_rights_type?(rights)
+      RightsMetadataDS.valid_rights_types.include? rights
+    end
+
+    # a helper method for setting up well-structured rights_xml based on a rights type code
+    # @param rights_xml [ng_xml] a nokogiri xml (ruby) object that represents the rights xml for a DOR object
+    # @param rights_type [string] a recognized rights type code ('world', 'dark', 'loc:spec', etc)
+    def self.upd_rights_xml_for_rights_type(rights_xml, rights_type)
+      label = rights_type == 'dark' ? 'none' : 'world'
       rights_xml.search('//rightsMetadata/access[@type=\'discover\']/machine').each do |node|
         node.children.remove
         node.add_child Nokogiri::XML::Node.new(label, rights_xml)
       end
+
       rights_xml.search('//rightsMetadata/access[@type=\'read\']').each do |node|
         node.children.remove
         machine_node = Nokogiri::XML::Node.new('machine', rights_xml)
         node.add_child(machine_node)
-        if rights == 'world'
-          machine_node.add_child Nokogiri::XML::Node.new(rights, rights_xml)
-        elsif rights == 'stanford'
+        if rights_type.start_with?('world')
+          world_node = Nokogiri::XML::Node.new('world', rights_xml)
+          world_node.set_attribute('rule', 'no-download') if rights_type.end_with?('-nd')
+          machine_node.add_child(world_node)
+        elsif rights_type.start_with?('stanford')
           group_node = Nokogiri::XML::Node.new('group', rights_xml)
-          group_node.content = 'Stanford'
+          group_node.content = 'stanford'
+          group_node.set_attribute('rule', 'no-download') if rights_type.end_with?('-nd')
           machine_node.add_child(group_node)
+        elsif rights_type.start_with?('loc:')
+          loc_node = Nokogiri::XML::Node.new('location', rights_xml)
+          loc_node.content = rights_type.split(':').last
+          machine_node.add_child(loc_node)
         else  # we know it is none or dark by the argument filter (first line)
           machine_node.add_child Nokogiri::XML::Node.new('none', rights_xml)
         end
       end
+    end
+
+    # @param rights [string] archetypical rights to assign: 'world', 'stanford', 'none', 'dark', etc
+    # Moved from Governable
+    # slight misnomer: also sets discover rights!
+    # TODO: convert xpath reads to dra_object calls
+    def set_read_rights(rights)
+      raise(ArgumentError, "Argument '#{rights}' is not a recognized value") unless RightsMetadataDS.valid_rights_type? rights
+
+      rights_xml = ng_xml
+      if rights_xml.search('//rightsMetadata/access[@type=\'read\']').length == 0
+        raise('The rights metadata stream doesnt contain an entry for machine read permissions. Consider populating it from the APO before trying to change it.')
+      end
+
+      RightsMetadataDS.upd_rights_xml_for_rights_type(rights_xml, rights)
+
+      self.dra_object = nil # until TODO complete, we'll expect to have to reparse after modification
       self.content = rights_xml.to_xml
       content_will_change!
     end

data/lib/dor/models/editable.rb

@@ -47,7 +47,7 @@ module Dor
 
     def to_solr(solr_doc = {}, *args)
       solr_doc = super(solr_doc, *args)
-      add_solr_value(solr_doc, 'default_rights', default_rights, :string, [:symbol])
+      add_solr_value(solr_doc, 'default_rights', default_rights_for_indexing, :string, [:symbol])
       add_solr_value(solr_doc, 'agreement', agreement, :string, [:symbol]) if agreement_object
       add_solr_value(solr_doc, 'default_use_license_machine', use_license, :string, [:stored_sortable])
       solr_doc
@@ -229,50 +229,57 @@ module Dor
       end
     end
 
-    # @return [String] A description of the rights defined in the default object rights datastream. Can be 'Stanford', 'World', 'Dark' or 'None'
+    # @return [String] A description of the rights defined in the default object rights datastream. Can be one of
+    # RightsMetadataDS::RIGHTS_TYPE_CODES.keys (so this is essentially the inverse of RightsMetadataDS.upd_rights_xml_for_rights_type).
     def default_rights
       xml = defaultObjectRights.ng_xml
-      if xml.search('//rightsMetadata/access[@type=\'read\']/machine/group').length == 1
-        'Stanford'
-      elsif xml.search('//rightsMetadata/access[@type=\'read\']/machine/world').length == 1
-        'World'
-      elsif xml.search('//rightsMetadata/access[@type=\'discover\']/machine/none').length == 1
-        'Dark'
+      machine_read_access = xml.search('//rightsMetadata/access[@type="read"]/machine')
+      machine_discover_access = xml.search('//rightsMetadata/access[@type="discover"]/machine')
+
+      machine_read_access_node = machine_read_access.length == 1 ? machine_read_access.first : nil
+      machine_discover_access_node = machine_discover_access.length == 1 ? machine_discover_access.first : nil
+
+      if machine_read_access_node && machine_read_access_node.search('./group[text()="Stanford" or text()="stanford"]').length == 1
+        if machine_read_access_node.search('./group[@rule="no-download"]').length == 1
+          'stanford-nd'
+        else
+          'stanford'
+        end
+      elsif machine_read_access_node && machine_read_access_node.search('./world').length == 1
+        if machine_read_access_node.search('./world[@rule="no-download"]').length == 1
+          'world-nd'
+        else
+          'world'
+        end
+      elsif machine_read_access_node && machine_read_access_node.search('./location[text()="spec"]').length == 1
+        'loc:spec'
+      elsif machine_read_access_node && machine_read_access_node.search('./location[text()="music"]').length == 1
+        'loc:music'
+      elsif machine_discover_access_node && machine_discover_access_node.search('./world').length == 1
+        # if it's not stanford restricted, world readable, or location restricted, but it is world discoverable, it's "citation only"
+        'none'
+      elsif machine_discover_access_node && machine_discover_access_node.search('./none').length == 1
+        # if it's not even discoverable, it's "dark"
+        'dark'
       else
-        'None'
+        # if none of the above, the rights xml structure is unsupported/unintelligible
+        nil
       end
     end
+
+    # @return [String] A description of the rights defined in the default object rights datastream. Can be 'Stanford', 'World', 'Dark' or 'None'
+    def default_rights_for_indexing
+      RightsMetadataDS::RIGHTS_TYPE_CODES.fetch(default_rights, 'Unrecognized default rights value')
+    end
+
     # Set the rights in default object rights
     # @param rights [String] Stanford, World, Dark, or None
     def default_rights=(rights)
       rights = rights.downcase
+      raise(ArgumentError, "Unrecognized rights value '#{rights}'") unless RightsMetadataDS.valid_rights_type? rights
+
       rights_xml = defaultObjectRights.ng_xml
-      rights_xml.search('//rightsMetadata/access[@type=\'discover\']/machine').each do |node|
-        node.children.remove
-        world_node = Nokogiri::XML::Node.new((rights == 'dark' ? 'none' : 'world'), rights_xml)
-        node.add_child(world_node)
-      end
-      rights_xml.search('//rightsMetadata/access[@type=\'read\']').each do |node|
-        node.children.remove
-        machine_node = Nokogiri::XML::Node.new('machine', rights_xml)
-        if rights == 'world'
-          world_node = Nokogiri::XML::Node.new(rights, rights_xml)
-          node.add_child(machine_node)
-          machine_node.add_child(world_node)
-        elsif rights == 'stanford'
-          node.add_child(machine_node)
-          group_node = Nokogiri::XML::Node.new('group', rights_xml)
-          group_node.content = 'Stanford'
-          node.add_child(machine_node)
-          machine_node.add_child(group_node)
-        elsif rights == 'none' || rights == 'dark'
-          none_node = Nokogiri::XML::Node.new('none', rights_xml)
-          node.add_child(machine_node)
-          machine_node.add_child(none_node)
-        else
-          raise ArgumentError, "Unrecognized rights value '#{rights}'"
-        end
-      end
+      RightsMetadataDS.upd_rights_xml_for_rights_type(rights_xml, rights)
     end
 
     def desc_metadata_format

data/lib/dor/services/registration_service.rb

@@ -75,7 +75,7 @@ module Dor
         rights = nil
         if params[:rights]
           rights = params[:rights]
-          unless %w(world stanford dark default none).include? rights
+          unless rights == 'default' || RightsMetadataDS.valid_rights_type?(rights)
             raise Dor::ParameterError, "Unknown rights setting '#{rights}' when calling #{name}.register_object"
           end
         end

data/lib/dor/version.rb

@@ -1,3 +1,3 @@
 module Dor
-  VERSION = '5.13.0'.freeze
+  VERSION = '5.14.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 5.13.0
+  version: 5.14.0
 platform: ruby
 authors:
 - Michael Klein
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-24 00:00:00.000000000 Z
+date: 2016-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -582,13 +582,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - config/certs/README
-- config/certs/dlss-dev-petucket-dor-dev.crt
-- config/certs/dlss-dev-petucket-dor-dev.csr
-- config/certs/dlss-dev-petucket-dor-dev.key
-- config/certs/dlss-dev-petucket-dor-prod.crt
-- config/certs/dlss-dev-petucket-dor-prod.key
 - config/config_defaults.yml
-- config/dev_console_env.rb
 - config/dev_console_env.rb.example
 - config/predicate_mappings.yml
 - lib/dor-services.rb

data/config/certs/dlss-dev-petucket-dor-dev.crt

@@ -1,29 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIE3zCCAscCCQCcUJVDTu7rPzANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMC
-VVMxEzARBgNVBAgTCkNhbGlmb3JuaWExETAPBgNVBAcTCFN0YW5mb3JkMRwwGgYD
-VQQKExNTdGFuZm9yZCBVbml2ZXJzaXR5MRIwEAYDVQQLEwlMaWJyYXJpZXMxJTAj
-BgNVBAMTHFNVTCBET1IgKGRldi90ZXN0KSBhY2Nlc3MgQ0ExLzAtBgkqhkiG9w0B
-CQEWIHN1bC13ZWJtYXN0ZXJAbGlzdHMuc3RhbmZvcmQuZWR1MB4XDTEyMDkyNjAw
-Mzg1OFoXDTIyMDkyNDAwMzg1OFowgaIxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpD
-YWxpZm9ybmlhMREwDwYDVQQHEwhTdGFuZm9yZDEcMBoGA1UEChMTU3RhbmZvcmQg
-VW5pdmVyc2l0eTEnMCUGA1UEAxMeZGxzcy1kZXYtcGV0dWNrZXQuc3RhbmZvcmQu
-ZWR1MSQwIgYJKoZIhvcNAQkBFhVwZXR1Y2tldEBzdGFuZm9yZC5lZHUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3cqsXN6QQIMD/yqKNI+BFtPBrhV1F
-hRqenXUrqDRhIE6o0WVolJC4pBVXMXZksk/cnsDkb/PrD2JZH4YTS6+B51qRvScg
-cyqioPOJnPNRowogNUwkDiR4OGdKIbdRyYG+SgDuMWN/it7TqtG92KJm78imQS6S
-wOtP8AnqOveMHEdmAzcANGTHCLF8SNxNqGgedXLWfpi4MSYI1io0PCA/gtrotrsL
-xcwOfdkUrImaa0Og/Jyp/GAq6uveYangt3Ox3GLyyToSK4/FJXwxba9+OqR0U2MZ
-qiFbXkTzGzLbx+xhfkG5Qe1eR3u1JigSjS4z3rUmvPz+MIQVQX9ZdAThAgMBAAEw
-DQYJKoZIhvcNAQEFBQADggIBAH0u9ZVNGCXO6a77hTIO6vjJ0MoWzJNY4j+47Dl9
-2hhDoVtw7VtV5/mKVKAiQB+Gbz/NIfkqfPgJEwyC5vr4330wIC2dMuGNFnSxGTKz
-PlkZAWGUqpkfucPISwPXRgbQIMghRy+EZ05ayv1w+HlV9QGj+hbOt92jL/e1yCpH
-Fd3I/7Ui26vrHqx+5Hg2d4gT2YGHTKBy8LakuoN59fw8sb+Gk0Xp/0pZMD+Sgl6T
-db0HOH4lcC3qG0ZfrNJ2BwDUnzbt8cruc98iu5obnmSK39ezKsSWx6leHzWIQLLT
-guNGOpbWJrNfF/VXpH9t0Q/xd0vZsOWSUkfHpd02PCBFRIWUv6UCldsDByP4IKHE
-bwNa3STPwIWKq2SGE+qGkY5P6t7zqPZ+SFl4kOXUWNuspSY8v5dKFyfFexaX6p6S
-bRRK5CoZq3jvxvHk88VQPTli0EP12r4SSG19UU43Twqqqd2CEW7woL3Z/OPws047
-jV/e8cHA7goo5d9RKwyz/7zivUWqidnp7SeL5/YQRY2bwWOcS/y49Dmi0+FQOJCw
-wjDDUv6Z+SR3NmbGtc0dIroTIWxvS7otIa+dXnH+ubrGAlbUvT1NAeO9mdX9m/qh
-YHm8oRVyJD12Hylc5pmFEBbV02Lzc/D4mB3oNtSVvhNfoTZfyKqwA+kAPol6HDIb
-vJi3
------END CERTIFICATE-----

data/config/certs/dlss-dev-petucket-dor-dev.csr

@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIIC6DCCAdACAQAwgaIxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlh
-MREwDwYDVQQHEwhTdGFuZm9yZDEcMBoGA1UEChMTU3RhbmZvcmQgVW5pdmVyc2l0
-eTEnMCUGA1UEAxMeZGxzcy1kZXYtcGV0dWNrZXQuc3RhbmZvcmQuZWR1MSQwIgYJ
-KoZIhvcNAQkBFhVwZXR1Y2tldEBzdGFuZm9yZC5lZHUwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC3cqsXN6QQIMD/yqKNI+BFtPBrhV1FhRqenXUrqDRh
-IE6o0WVolJC4pBVXMXZksk/cnsDkb/PrD2JZH4YTS6+B51qRvScgcyqioPOJnPNR
-owogNUwkDiR4OGdKIbdRyYG+SgDuMWN/it7TqtG92KJm78imQS6SwOtP8AnqOveM
-HEdmAzcANGTHCLF8SNxNqGgedXLWfpi4MSYI1io0PCA/gtrotrsLxcwOfdkUrIma
-a0Og/Jyp/GAq6uveYangt3Ox3GLyyToSK4/FJXwxba9+OqR0U2MZqiFbXkTzGzLb
-x+xhfkG5Qe1eR3u1JigSjS4z3rUmvPz+MIQVQX9ZdAThAgMBAAGgADANBgkqhkiG
-9w0BAQUFAAOCAQEAdAVri6K2jyMcAJDWohxGVld7HU2ejhN1tx9+HSroK1+7f2LX
-R4i06NLZI0qJA92cd5sC7T5KFG3v1Ad5gPcZfkhmH8uL0v/qNkx/vvZgF9vlUf+L
-5JEyqzsMIxcRCC9gujsk9ha7oigFWbf1AxNt1KSDcIIID7nm+Tl7b/kSoOTK5z8j
-/Pg8CL54paNtRQ8TDtlvdbziPn4J/Zopx0s5lpgV/pLaSkq+GPih+eV2ST1fpFzu
-RQNQVZ3fa2W3Jz9m6vAtWZP1Ht7ZnLYTdSIJOo0Z2mBjcDE86JqF8bbWYt4THAgv
-DIEKxWpGWz7rmTJJ5DStxFmUK6135FKatnAT4w==
------END CERTIFICATE REQUEST-----

data/config/certs/dlss-dev-petucket-dor-dev.key

@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEogIBAAKCAQEAt3KrFzekECDA/8qijSPgRbTwa4VdRYUanp11K6g0YSBOqNFl
-aJSQuKQVVzF2ZLJP3J7A5G/z6w9iWR+GE0uvgedakb0nIHMqoqDziZzzUaMKIDVM
-JA4keDhnSiG3UcmBvkoA7jFjf4re06rRvdiiZu/IpkEuksDrT/AJ6jr3jBxHZgM3
-ADRkxwixfEjcTahoHnVy1n6YuDEmCNYqNDwgP4La6La7C8XMDn3ZFKyJmmtDoPyc
-qfxgKurr3mGp4Ldzsdxi8sk6EiuPxSV8MW2vfjqkdFNjGaohW15E8xsy28fsYX5B
-uUHtXkd7tSYoEo0uM961Jrz8/jCEFUF/WXQE4QIDAQABAoIBAGZR9Q/sHvxH6J5D
-ncrvecYnl/nA1zdReHmEBbimByEtbfJHaTKduuLh0m1hz1F3C4hYm+pOb1RqrkZb
-iOL2Uhw4uJGVWV+GHP+8mlnlSun78Efqsl9h7AGKJEJ6788Uf+NtT3uL3J1lDcgt
-/PLRBDQ6BkaFEL8WD6n0jvMwlKZ2pLOsYaMx29vPVpcf/zL2B4CWr+jsm38OMRNk
-WsQ0aA1XPZuJC/iS8Ky/ccvOLt3BlVVh62/L776XrKpXzAi9O/u3clak3Sel1rxt
-NnTrN+hacsQp4gS1qPiKF656b6WG1tQ29r5rUMPqNltPjmVTe4m5S16NoRv/IEFQ
-9thtEAECgYEA7WSSNiwbDgXRygEIRAP4M26Bvv8EQ29i7mnv5RnHObiD1y5eu/qQ
-E5/VULqYcHR9C3qpDqdfFf9IVg0CjeuFatG85Jd15vDWtk5RErxLq005qzUsC0o8
-AsCurdb0r6zOo5iWyjk8JwT/LAJ8Tg4JDGARcZnHk9LBbDI8i/FAvqECgYEAxdOo
-9viFFblcwu9Oua/i67VNGocBgjTHNof15nhnu4Am3vR3g8wRBzjUcJLjxT+kxlMf
-/YwfUSDIs9yviGv2kj8M3UPtCQ8vkzRwPnhbT9gvWxtnc0XxYNq7IVZ8x1cZeBsf
-8vH6/tCnjgfsN6HP3DSqiJ5cqAjECsJq0fo03kECgYBAIs3FyQC+NyBIvSKojZH/
-AzoWifty5KML2p8vfFlw5MLp3eNGUhme063kE6WfrDkkYs1N4jY0UTYP2Y/5G8p9
-45BvCeSWsjawJlSNBUZET6bm9ISjwDiaXchTuyF8XOmvFUiX9gKkYBs4nqtKw0v6
-hfHwiSV8cJJFUwU8ob9mQQKBgAh8MqQdNsAeyj7GOu81/xqzFRKNNeBa2Syamk5/
-XZuqPICVpcauaxCPPHVzp3dfanbjO90JNJKrQFCOp6zHTLUrJScccb9Qum6q8iGL
-0gbTs/xJaZ+FIXxRBXPBnOqD7uC68Rzfii+BzZ4G8vfT5fGBBMuFV14Rui7n9eL5
-w2jBAoGAbh77B0kzLngbs+NmTfwjnYw5qYqwFPAYPYcu0w1wF8oTD38U8FqJ/6LG
-oKaszyYODurPox81kJplNukEmSCDto1i6DJ71i8HcCfitEFXua28WD1+5Wn4o9CS
-AOxLn8jHa7K6lmXZm2hgjWcSI9VGp5En79pGzrtO/d+OswVIJEc=
------END RSA PRIVATE KEY-----

data/config/certs/dlss-dev-petucket-dor-prod.crt

@@ -1,29 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIE+jCCAuICCQDiT+2CJW52sTANBgkqhkiG9w0BAQUFADCBuTELMAkGA1UEBhMC
-VVMxEzARBgNVBAgTCkNhbGlmb3JuaWExETAPBgNVBAcTCFN0YW5mb3JkMRwwGgYD
-VQQKExNTdGFuZm9yZCBVbml2ZXJzaXR5MRIwEAYDVQQLEwlMaWJyYXJpZXMxHzAd
-BgNVBAMTFlNVTCBET1IgcHJvZCBhY2Nlc3MgQ0ExLzAtBgkqhkiG9w0BCQEWIHN1
-bC13ZWJtYXN0ZXJAbGlzdHMuc3RhbmZvcmQuZWR1MB4XDTEyMTAwODE3MDk1NVoX
-DTIyMTAwNjE3MDk1NVowgcMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9y
-bmlhMREwDwYDVQQHEwhTdGFuZm9yZDEcMBoGA1UEChMTU3RhbmZvcmQgVW5pdmVy
-c2l0eTESMBAGA1UECxMJTGlicmFyaWVzMScwJQYDVQQDEx5kbHNzLWRldi1wZXR1
-Y2tldC5zdGFuZm9yZC5lZHUxMTAvBgkqhkiG9w0BCQEWImRsc3MtZGV2ZWxvcGVy
-c0BsaXN0cy5zdGFuZm9yZC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDO3bOG2i4DZNnPTt2C6fFM3znmqHIW/n771ntWTzS8k01REksYPlxBNZ3t
-M+aZFy/2lEv7PMMNg2VDDn1TRJd0hy87VW7QOTYTo1SCo2AYgn+qOnujSGqU+RRn
-pM4xTGBnF5BGSXfAi++iMJyyQngF3nev5jAcy9SrwtpXrV4JyNl6LtmodtjBi/3k
-LO6KY9Uc9T8zRcuiC/5zidM1+aymfoymG295aVDc+JsghjWm/UoE+Nvs20zfi+5a
-JB3iL+3RyUr2Hh3N4zdxR6dar/Ivy5WfPTEmtkqiSnnhdDX6fE4f+4P3ewn7bbZN
-LrH2T5Bm4W64bPsnUPP1evgidZ0LAgMBAAEwDQYJKoZIhvcNAQEFBQADggIBAJIZ
-bdwEJQEOKAruCvCwxFNXQUUPzJiuYqlJ61+4Vhs7JugORo+DgNTYL/JkZ6dCR/uj
-4W0TQyBtA1GtfUYvcXCrvQl51YTMAODkoWNlkP/xaHx02twIoZDsGSVAVZryP0ae
-OzToLSvj+a1OvRS3YX/CO+Gq5t2//kCYrI1h6d/41PjWBRD2A2NWJrBiIj62W1qJ
-muY1YvSiNZ27Pwjp0fA6QwpFY+AxUAei6jKQcUCp6q3wlFaVgMS4SKtIC/rNAAc3
-2aN2dlk6u81wjKQqMKXzWhwxTqEPQAmxoP8oJVxRwh1gxoBEAbLxse76Cc9+eISn
-CG0RF+bku3ceGrNYWQHGu8xOXAexM77WFSIVrtYJ2Tf/P+un8J+fvb3U8I5hOkGK
-/yMIxRfpYyOx8Qg3IJ6ci6Frg2Jn1Csv7RR8vXgRqWDRrYpeRdm8VjO/MkozGp3X
-r7y8hmoacnaOAcPV+KCMQ4zCobFEfxpIlajNgb4ZJhA4/ZcHlnXCr51n/A3FTLdG
-MR4D2JWw9oKDrf9317IomWQd6B8/+MzBX+vFteq0xQPHVJcCh48NuRkJomfy+m2q
-nMgxRTeRIN0VNFrhOxarv+Xiw9BoBAdKd1JbZX4uPVFs+DdkAcZC8aJRnmsowwfG
-C5+Fxxdx+ucfga5QSZui4uyIXlx1nAy+eeTPwmDc
------END CERTIFICATE-----

data/config/certs/dlss-dev-petucket-dor-prod.key

@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEAzt2zhtouA2TZz07dgunxTN855qhyFv5++9Z7Vk80vJNNURJL
-GD5cQTWd7TPmmRcv9pRL+zzDDYNlQw59U0SXdIcvO1Vu0Dk2E6NUgqNgGIJ/qjp7
-o0hqlPkUZ6TOMUxgZxeQRkl3wIvvojCcskJ4Bd53r+YwHMvUq8LaV61eCcjZei7Z
-qHbYwYv95CzuimPVHPU/M0XLogv+c4nTNfmspn6MphtveWlQ3PibIIY1pv1KBPjb
-7NtM34vuWiQd4i/t0clK9h4dzeM3cUenWq/yL8uVnz0xJrZKokp54XQ1+nxOH/uD
-93sJ+222TS6x9k+QZuFuuGz7J1Dz9Xr4InWdCwIDAQABAoIBAQCSt1jJrtptm8yD
-JKskW2nBnJzDQ/rO5icH1EHboAeGK27trezGwAvMUAu3HVVShMiGuPz+rkSkw+lA
-2vj14rMMeYh9K4WRdtIssW2Rze+s0nlbMWlZEFZPXC0lqRR4kHPbCjJQN3EQhe8q
-eBHauBvKBdObVMYQ1lv6ihMzlgkZJCtRdwn6DqiN2kkFkHx4mhWoMadYA6xBwN4S
-+YM5O1KwC9nUgRpLFSM8D8fBANzI6takkVDQ6QaJJ11dsur5RE9BsFzl+Op7Evzu
-+zCisC17ZUn07YVvGeTUkIwTk0aeu3HCX83WM8jmg02ijtwqf6pdlLMJ8G8MQURe
-siKh1ZP5AoGBAP5ZJrZ/UcGFR1XLeL6WmgljlF26LQzy/DHMBbWMYpTrwfaxk/sK
-o8wTuVebJGhuffTgYU2VWJ5at7AMasOP6IAT2nP2KvcoCmvG8u3BCTkck57Vde5H
-86bJ88z6TEzhrElDMjmKx7gEb2P6RIKnDcNdduaR6DE6qJOBJ5F5W3KlAoGBANA1
-nKBEFEXJ4Cuw6OrJeyrgu/aCLFKus/orlfLPHFQAvFJzpqmCONz5H/Wcf+m6uMeR
-MQ6V705h2y+FUmwufpFyqCVunC1zJu6mZG9TNEjXzyFBnb4jcEjsMm6DCrVA6zOx
-3iWd+rLNxIpN3fhskzclNnhn+WhGo7xktuIrVDHvAoGBAPLWVVLKTllQkWIFaRu2
-GA08yMuP1DFX0JcOrqi+BuUeDkslEh8N8oMGld9hnSojzBg/Hkd/fmN6Q4RO5qQe
-QqH90oUCk9Tzordx9EAxHEgt03dDYFwG0Eb+68lZc/23PNGZ2Vr8+F/lxCAVMtH3
-Avnyw3Gx/pj54zcpiYin8DqNAoGBAKSqcdfSX9Id6ZvES0E83Zs4p486vkEaCB8H
-j4y7veS1vDrdWmbfJYelw1/lSMiaMv8qVgj6DYwJGmdH4rrKPrFbY55PD1dmpdjC
-YdYlkMk3XIopsc6pimkx3GTIYJSe5iU5O762ZYo58IGNOcr6W6eWV7D8UiTlESOy
-52yR5gGjAoGALfzgCSIAVlOli3a7m3aMWUtGhp+sVi7jGLE9NHTwFXnkYEoXmR+v
-5CIvK8IzwtATEomoAa2GKGek8MSE+H1/o+SrGL9PIATnzuEZeJOIMnGa5mO26a9/
-eV2Qud4v/7qD2P2VnCVYaAMYqS6l0SxB11/UhuQiWdpITxy44CK1Jk8=
------END RSA PRIVATE KEY-----

data/config/dev_console_env.rb

@@ -1,66 +0,0 @@
-cert_dir = File.join(File.dirname(__FILE__), "certs")
-
-Dor::Config.configure do
-
-  fedora do
-    url 'https://sul-dor-test.stanford.edu/fedora'
-  end
-
-  ssl do
-    cert_file File.join(cert_dir,"dlss-dev-petucket-dor-dev.crt")
-    key_file  File.join(cert_dir,"dlss-dev-petucket-dor-dev.key")
-    key_pass ''
-  end
-
-  sdr do
-    url 'http://localhost'
-    local_workspace_root '/dor/workspace'
-    local_export_home '/dor/export'
-  end
-
-  suri do
-    mint_ids true
-    id_namespace 'druid'
-    url 'http://sul-lyberservices-test.stanford.edu'
-    user 'labware'
-    pass 'lyberteam'
-  end
-
-  solr.url 'https://sul-solr-tester.stanford.edu/argo_stage'
-  workflow.url 'https://sul-lyberservices-test.stanford.edu/workflow/'
-
-  purl do
-     base_url 'https://purl-test.stanford.edu/'
-   end
-
-   remediation do
-     check_for_versioning_required false  # this MUST be true in production; can be false in development and test if you want to ignore workflow checks
-     check_for_in_accessioning false  # this MUST be true in production; can be false in development and test if you want to ignore workflow checks
-   end
-
-  dor do
-    service_root 'https://dorAdmin:dorAdmin@sul-lyberservices-test.stanford.edu/dor/v1'
-    num_attempts  3  # the number of attempts to contact the dor web service before throwing an exception
-    sleep_time   2  # sleep time in seconds between attempts to contact the dor service
-    default_label 'Untitled' # the default label for an object that is registered when no label is provided in the manifest
-  end
-
-  content do
-     content_user 'lyberadmin'
-     content_base_dir '/dor/workspace/'
-     content_server 'lyberservices-test'
-   end
-   status do
-     indexer_url 'http://sulstats-raw.stanford.edu//render/?format=json&from=-1minute&until=now&target=stats.gauges.dor-prod.argo.reindexqueue.queue-size.count'
-   end
-   stacks do
-     document_cache_storage_root '/home/lyberadmin/document_cache'
-     document_cache_host 'purl-test.stanford.edu'
-     document_cache_user 'lyberadmin'
-     local_workspace_root '/dor/workspace'
-     storage_root '/stacks'
-     host 'stacks-test.stanford.edu'
-     user 'lyberadmin'
-   end
-
-end