diff --git a/Model/lib/conifer/roles/conifer/vars/OrthoMCL/production/default.yml b/Model/lib/conifer/roles/conifer/vars/OrthoMCL/production/default.yml new file mode 100644 index 0000000..1bce293 --- /dev/null +++ b/Model/lib/conifer/roles/conifer/vars/OrthoMCL/production/default.yml @@ -0,0 +1,26 @@ +# $SourceFileURL$ +--- +modelconfig_adminEmail: + - "{{ 'aurreco$uga.edu'|replace('$', '@') }}" + - "{{ 'dfalke$uga.edu'|replace('$', '@') }}" + - "{{ 'sfischer$pcbi.upenn.edu'|replace('$', '@') }}" + - "{{ 'dmgaldi$upenn.edu'|replace('$', '@') }}" + + +modelprop: + COMMUNITY_SITE: "//{{ community_env_map[prefix]|default(community_env_map['default']) }}" + + +# the below extends the w_ q_ prefix pattern used for workspace_env_map, which +# # really feels like a bad idea. please don't let this cancer spread. Find a +# # generalized way to do this in the future... +community_env_map: + w_prefix: static-content.veupathdb.org/ + b_prefix: qa.static-content.veupathdb.org/ + default: qa.static-content.veupathdb.org/ + +# construct a prefix from hostname, like w_prefix, q_prefix +prefix: "{{ hostname | regex_replace('^([a-z])[0-9].*','\\1_prefix') }}" + + + diff --git a/Site/package.json b/Site/package.json index 5a36e28..14f0f5d 100644 --- a/Site/package.json +++ b/Site/package.json @@ -2,6 +2,6 @@ "name": "ortho-site-deployer", "private": true, "dependencies": { - "@veupathdb/ortho-site": "^1.1.0" + "@veupathdb/ortho-site": ">=1.1.10-orthotree.1 <1.1.10" } } diff --git a/Site/yarn.lock b/Site/yarn.lock index b55c0e2..91056dc 100644 --- a/Site/yarn.lock +++ b/Site/yarn.lock @@ -2,7 +2,15 @@ # yarn lockfile v1 -"@veupathdb/ortho-site@^1.1.0": - version "1.1.35" - resolved "https://registry.yarnpkg.com/@veupathdb/ortho-site/-/ortho-site-1.1.35.tgz#a10b7b73ba7bebd55e039f5ba5755a33c07925ea" - integrity sha512-tVqhKbtaKqYef5cEXMBjgHZy6GTQufU+zdeobsRZZ6cLltOh/zk1xCx+9dsofhvwmcc6F1kG/OSJjPEQQfKPgg== + +"@veupathdb/ortho-site@>=1.1.10-orthotree.1 <1.1.10": + version "1.1.10-orthotree.16" + resolved "https://registry.yarnpkg.com/@veupathdb/ortho-site/-/ortho-site-1.1.10-orthotree.16.tgz#e120daa4026e655ab267998d02fb5b3d83a149a8" + integrity sha512-ZR6KT93PL2gsHF8DbXfCJbV+VYTUBCeq5we/vkR6EUd9EBAind5Imup21YmjBdaQPDlVTkIfVcUuKUNKTXClBA== + dependencies: + patristic "^0.6.0" + +patristic@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/patristic/-/patristic-0.6.0.tgz#7cb52065621d4c63a372056debf294d5244be5e2" + integrity sha512-t1r7vXgfq+aF6/REmsln0B34OuPXAflOwiRlW0zmvaPgWKNt0MhOXpYf0n+AdBcgQFvGH6f8pDDtxSiiGwr9xQ== diff --git a/build.xml b/build.xml index 82c5c80..9d7434c 100644 --- a/build.xml +++ b/build.xml @@ -19,7 +19,9 @@ + OrthoMCLService-WebInstallation, + OrthoMCLWebsite/Site-WebInstallation"/> +