Commit 390a4c6c authored by Philip Schildkamp's avatar Philip Schildkamp

Fix variable substitution, update MCD

parent 27dee91b
......@@ -12,7 +12,7 @@ fn_pkginfo() {
# configure
fn_configure() {
while read -rd ';' TUPLE; do FILE="${TUPLE#*,}"
test "${FILE#*.json}" == "$FILE" && continue
test "${FILE%.json}" == "$FILE" && continue
curl -sX POST $CONFIGURE_DBMSAPI/$DBName/_bulk_docs \
-H "Content-Type: application/json" \
-T "$CONFIGURE_CSARDIR/$FILE"
......
......@@ -12,7 +12,7 @@ fn_pkginfo() {
# configure
fn_configure() {
while read -rd ';' TUPLE; do FILE="${TUPLE#*,}"
test "${FILE#*.json}" == "$FILE" && continue
test "${FILE%.json}" == "$FILE" && continue
curl -sX POST $CONFIGURE_DBMSAPI/$DBName/_bulk_docs \
-H "Content-Type: application/json" \
-T "$CONFIGURE_CSARDIR/$FILE"
......
......@@ -12,7 +12,7 @@ fn_pkginfo() {
# configure
fn_configure() {
while read -rd ';' TUPLE; do FILE="${TUPLE#*,}"
test "${FILE#*.json}" == "$FILE" && continue
test "${FILE%.json}" == "$FILE" && continue
curl -sX POST $CONFIGURE_DBMSAPI/$DBName/_bulk_docs \
-H "Content-Type: application/json" \
-T "$CONFIGURE_CSARDIR/$FILE"
......
......@@ -12,7 +12,7 @@ fn_pkginfo() {
# configure
fn_configure() {
while read -rd ';' TUPLE; do FILE="${TUPLE#*,}"
test "${FILE#*.json}" == "$FILE" && continue
test "${FILE%.json}" == "$FILE" && continue
curl -sX POST $CONFIGURE_DBMSAPI/$DBName/_bulk_docs \
-H "Content-Type: application/json" \
-T "$CONFIGURE_CSARDIR/$FILE"
......
......@@ -12,8 +12,9 @@ fn_pkginfo() {
# configure
fn_configure() {
while read -rd ';' TUPLE; do FILE="${TUPLE#*,}"
test "${FILE#*.json}" == "$FILE" && continue
curl -sX POST $CONFIGURE_APIHOST/$IndexName/_mapping \
test "${FILE%.json}" == "$FILE" && continue
curl -sX DELETE $CONFIGURE_APIHOST/$IndexName
curl -sX POST $CONFIGURE_APIHOST/$IndexName \
-H "Content-Type: application/json" \
-T "$CONFIGURE_CSARDIR/$FILE"
done <<< "$DAs"
......
......@@ -12,8 +12,9 @@ fn_pkginfo() {
# configure
fn_configure() {
while read -rd ';' TUPLE; do FILE="${TUPLE#*,}"
test "${FILE#*.json}" == "$FILE" && continue
curl -sX POST $CONFIGURE_APIHOST/$IndexName/_mapping \
test "${FILE%.json}" == "$FILE" && continue
curl -sX DELETE $CONFIGURE_APIHOST/$IndexName
curl -sX POST $CONFIGURE_APIHOST/$IndexName \
-H "Content-Type: application/json" \
-T "$CONFIGURE_CSARDIR/$FILE"
done <<< "$DAs"
......
......@@ -12,7 +12,7 @@ fn_pkginfo() {
# configure
fn_configure() {
while read -rd ';' TUPLE; do FILE="${TUPLE#*,}"
test "${FILE#*.json}" == "$FILE" && continue
test "${FILE%.json}" == "$FILE" && continue
curl -sX POST $CONFIGURE_APIHOST/$IndexName/_mapping \
-H "Content-Type: application/json" \
-T "$CONFIGURE_CSARDIR/$FILE"
......
......@@ -12,7 +12,7 @@ fn_pkginfo() {
# configure
fn_configure() {
while read -rd ';' TUPLE; do FILE="${TUPLE#*,}"
test "${FILE#*.json}" == "$FILE" && continue
test "${FILE%.json}" == "$FILE" && continue
curl -sX POST $CONFIGURE_APIHOST/$IndexName/_mapping \
-H "Content-Type: application/json" \
-T "$CONFIGURE_CSARDIR/$FILE"
......
......@@ -15,7 +15,7 @@ fn_configure() {
sudo rm $CONFIGURE_CONFDIR/default
while read -rd ';' TUPLE; do FILE="${TUPLE#*,}"
test "${FILE#*.$CONFIGURE_PACKAGE}" == "$FILE" && continue
test "${FILE%.$CONFIGURE_PACKAGE}" == "$FILE" && continue
sudo cp $CONFIGURE_CSARDIR/$FILE $CONFIGURE_CONFDIR
done <<< "$DAs"
}
......
......@@ -15,7 +15,7 @@ fn_configure() {
sudo rm $CONFIGURE_CONFDIR/default
while read -rd ';' TUPLE; do FILE="${TUPLE#*,}"
test "${FILE#*.$CONFIGURE_PACKAGE}" == "$FILE" && continue
test "${FILE%.$CONFIGURE_PACKAGE}" == "$FILE" && continue
sudo cp $CONFIGURE_CSARDIR/$FILE $CONFIGURE_CONFDIR
done <<< "$DAs"
}
......
......@@ -70,7 +70,7 @@
</Properties>
</Properties>
<DeploymentArtifacts>
<DeploymentArtifact xmlns:dch_artifacttypes="http://dch.uni-koeln.de/tosca/artifacttypes" xmlns:dch_artifacttemplates="http://dch.uni-koeln.de/tosca/artifacttemplates" name="CouchDB" artifactType="dch_artifacttypes:DataArtifact" artifactRef="dch_artifacttemplates:MusicalCompetitionsDatabase-DA-CouchDB_0.0.1-w1-wip1"/>
<DeploymentArtifact xmlns:artifacttypes="http://opentosca.org/artifacttypes" xmlns:dch_artifacttemplates="http://dch.uni-koeln.de/tosca/artifacttemplates" name="CouchDB" artifactType="artifacttypes:ConfigurationArtifact" artifactRef="dch_artifacttemplates:MusicalCompetitionsDatabase-DA-CouchDB_0.0.1-w1-wip1"/>
</DeploymentArtifacts>
</NodeTemplate>
<NodeTemplate xmlns:dch_nodetypes="http://dch.uni-koeln.de/tosca/nodetypes" name="OpenJDK-JRE_8u212-w1-wip1" minInstances="1" maxInstances="1" type="dch_nodetypes:OpenJDK-JRE_8u212-w1-wip1" id="OpenJDK-JRE_8u212-w1-wip1" winery:x="100" winery:y="375"/>
......@@ -90,7 +90,7 @@
</Properties>
</Properties>
<DeploymentArtifacts>
<DeploymentArtifact xmlns:dch_artifacttypes="http://dch.uni-koeln.de/tosca/artifacttypes" xmlns:dch_artifacttemplates="http://dch.uni-koeln.de/tosca/artifacttemplates" name="Elasticsearch" artifactType="dch_artifacttypes:DataArtifact" artifactRef="dch_artifacttemplates:MusicalCompetitionsDatabase-DA-Elasticsearch_0.0.1-w1-wip1"/>
<DeploymentArtifact xmlns:artifacttypes="http://opentosca.org/artifacttypes" xmlns:dch_artifacttemplates="http://dch.uni-koeln.de/tosca/artifacttemplates" name="Elasticsearch" artifactType="artifacttypes:ConfigurationArtifact" artifactRef="dch_artifacttemplates:MusicalCompetitionsDatabase-DA-Elasticsearch_0.0.1-w1-wip1"/>
</DeploymentArtifacts>
</NodeTemplate>
<RelationshipTemplate xmlns:ToscaBaseTypes="http://docs.oasis-open.org/tosca/ns/2011/12/ToscaBaseTypes" name="ConnectsTo" type="ToscaBaseTypes:ConnectsTo" id="con_ConnectsTo_0">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment