diff options
| author | Andreas Maunz <andreas@maunz.de> | 2011-04-07 16:31:38 +0200 |
|---|---|---|
| committer | Andreas Maunz <andreas@maunz.de> | 2011-04-07 16:31:38 +0200 |
| commit | 1e9174342a0bae9b7e00c6d81a8271934a90baf7 (patch) | |
| tree | c3ba54f4e1e7b2722075c354c170c3f87d75556b | |
| parent | 1e43bd895e9e46bd1570cd80840f6f8cf18761ed (diff) | |
Fixed replacing WWW_DEST
| -rwxr-xr-x | opentox-ruby.sh | 4 | ||||
| -rw-r--r-- | production.yaml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/opentox-ruby.sh b/opentox-ruby.sh index b27ef85..692cc61 100755 --- a/opentox-ruby.sh +++ b/opentox-ruby.sh @@ -67,8 +67,8 @@ fi mkdir -p "$HOME/.opentox/config" >>$LOG 2>&1 mkdir -p "$HOME/.opentox/log" >>$LOG 2>&1 -cmd="sed -e \"s/SERVERNAME/$servername/;s/ESCAPEDSERVER/$escapedserver/;s/LOGGER/$logger/;s/AA/$aa/\" production.yaml > $HOME/.opentox/config/production.yaml" && run_cmd "$cmd" "Config 1" -cmd="sed -e \"s/SERVERNAME/$servername/;s/ESCAPEDSERVER/$escapedserver/;s/LOGGER/$logger/;s/AA/$aa/\" aa-local.yaml >> $HOME/.opentox/config/production.yaml" && run_cmd "$cmd" "Config 2" +cmd="sed -e \"s,SERVERNAME,$servername,;s,ESCAPEDSERVER,$escapedserver,;s,LOGGER,$logger,;s,AA,$aa,;s,WWW_DEST,$WWW_DEST,\" production.yaml > $HOME/.opentox/config/production.yaml" && run_cmd "$cmd" "Config 1" +cmd="sed -e \"s,SERVERNAME,$servername,;s,ESCAPEDSERVER,$escapedserver,;s,LOGGER,$logger,;s,AA,$aa,;s,WWW_DEST,$WWW_DEST,\" aa-$OT_INSTALL.yaml >> $HOME/.opentox/config/production.yaml" && run_cmd "$cmd" "Config 1" if [ "$OT_BRANCH" = "development" ]; then mkdir -p $WWW_DEST/opentox >>$LOG 2>&1 diff --git a/production.yaml b/production.yaml index 0e77ddd..35dd577 100644 --- a/production.yaml +++ b/production.yaml @@ -1,4 +1,4 @@ -:base_dir: /var/www/opentox/ +:base_dir: WWW_DEST :services: # make sure to enter a full uri (including training slash) |