Merge pull request collectionspace#182 from mark-cooper/per_tenant_cr…

…eate_disabled_opt Add per tenant create disabled opt
ray-lee · Aug 25, 2016 · 2fde2a6 · 2fde2a6
2 parents db72d75 + ed3f583
commit 2fde2a6
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/tomcat-main/src/main/resources/tenants/bonsai/settings.xml b/tomcat-main/src/main/resources/tenants/bonsai/settings.xml
@@ -54,7 +54,7 @@
 				<name>bonsai.collectionspace.org</name>
 				<version>0.1</version>
 				<display-name>Collectionspace Bonsai Tenant</display-name>
-				<create-disabled>${CSPACE_TENANT_CREATE_DISABLED_OPT}</create-disabled>
+				<create-disabled>${CSPACE_BONSAI_CREATE_DISABLED_OPT}</create-disabled>
 			</tenant>
 			<repository>
 				<domain>bonsai</domain>

diff --git a/tomcat-main/src/main/resources/tenants/core/settings.xml b/tomcat-main/src/main/resources/tenants/core/settings.xml
@@ -54,7 +54,7 @@
 				<name>core.collectionspace.org</name>
 				<version>0.1</version>
 				<display-name>Collectionspace Core Tenant</display-name>
-				<create-disabled>false</create-disabled>
+				<create-disabled>${CSPACE_CORE_CREATE_DISABLED_OPT}</create-disabled>
 			</tenant>
 			<repository>
 				<domain>core-domain</domain>

diff --git a/tomcat-main/src/main/resources/tenants/fcart/settings.xml b/tomcat-main/src/main/resources/tenants/fcart/settings.xml
@@ -55,7 +55,7 @@
                 <domain>fcart</domain>
 				<version>0.1</version>
 				<display-name>Collectionspace Fine &amp; Contemporary Art Tenant</display-name>
-				<create-disabled>${CSPACE_TENANT_CREATE_DISABLED_OPT}</create-disabled>
+				<create-disabled>${CSPACE_FCART_CREATE_DISABLED_OPT}</create-disabled>
 			</tenant>
 			<repository>
 				<domain>fcart</domain>

diff --git a/tomcat-main/src/main/resources/tenants/herbarium/settings.xml b/tomcat-main/src/main/resources/tenants/herbarium/settings.xml
@@ -55,7 +55,7 @@
                 <domain>herbarium</domain>
                 <version>0.1</version>
                 <display-name>CollectionSpace Herbarium Tenant</display-name>
-				<create-disabled>${CSPACE_TENANT_CREATE_DISABLED_OPT}</create-disabled>
+				<create-disabled>${CSPACE_HERBARIUM_CREATE_DISABLED_OPT}</create-disabled>
             </tenant>
             <repository>
                 <domain>herbarium</domain>

diff --git a/tomcat-main/src/main/resources/tenants/lhmc/settings.xml b/tomcat-main/src/main/resources/tenants/lhmc/settings.xml
@@ -54,7 +54,7 @@
 				<name>lhmc.collectionspace.org</name>
 				<version>0.1</version>
 				<display-name>Collectionspace Local History and Matrial Culture Tenant</display-name>
-				<create-disabled>${CSPACE_TENANT_CREATE_DISABLED_OPT}</create-disabled>
+				<create-disabled>${CSPACE_LHMC_CREATE_DISABLED_OPT}</create-disabled>
 			</tenant>
 			<repository>
 				<domain>lhmc</domain>

diff --git a/tomcat-main/src/main/resources/tenants/materials/settings.xml b/tomcat-main/src/main/resources/tenants/materials/settings.xml
@@ -55,7 +55,7 @@
                 <domain>materials</domain>
                 <version>0.1</version>
                 <display-name>CollectionSpace Materials Tenant</display-name>
-				<create-disabled>false</create-disabled>
+				<create-disabled>${CSPACE_MATERIALS_CREATE_DISABLED_OPT}</create-disabled>
             </tenant>
             <repository>
                 <domain>materials</domain>

diff --git a/tomcat-main/src/main/resources/tenants/publicart/settings.xml b/tomcat-main/src/main/resources/tenants/publicart/settings.xml
@@ -55,7 +55,7 @@
                 <domain>publicart</domain>
                 <version>0.1</version>
                 <display-name>CollectionSpace Public Art Tenant</display-name>
-				<create-disabled>${CSPACE_TENANT_CREATE_DISABLED_OPT}</create-disabled>
+				<create-disabled>${CSPACE_PUBLICART_CREATE_DISABLED_OPT}</create-disabled>
             </tenant>
             <repository>
                 <domain>publicart</domain>

diff --git a/tomcat-main/src/main/resources/tenants/testsci/settings.xml b/tomcat-main/src/main/resources/tenants/testsci/settings.xml
@@ -54,7 +54,7 @@
 				<name>testsci.collectionspace.org</name>
 				<version>0.1</version>
 				<display-name>Default tenant testsci</display-name>
-				<create-disabled>false</create-disabled>				
+				<create-disabled>${CSPACE_TESTSCI_CREATE_DISABLED_OPT}</create-disabled>
 			</tenant>
 			<repository>
 				<domain>testsci_domain</domain>