nginx.sh

4 files changed, 25 insertions, 24 deletions

diff --git a/aa-local.yaml b/aa-local.yaml
index 593ba56..71575b4 100644
--- a/aa-local.yaml
+++ b/aa-local.yaml
@@ -15,24 +15,24 @@
 # Exceptions:
   :free_uris: #request-method for uri not controlled by A&A
     ? - :GET
-    : - !ruby/regexp /http:\/\/ESCAPEDSERVERNAME\/algorithm/
+    : - !ruby/regexp /http:\/\/ESCAPEDSERVER\/algorithm/
       - "http://SERVERNAME/model"
       - "http://SERVERNAME/validation"
-      - !ruby/regexp /http:\/\/ESCAPEDSERVERNAME\/validation\/[a-z,A-Z,\/,_\-]*$/
+      - !ruby/regexp /http:\/\/ESCAPEDSERVER\/validation\/[a-z,A-Z,\/,_\-]*$/
     ? - :GET
       - :POST
-    : - !ruby/regexp /http:\/\/ESCAPEDSERVERNAME\/toxcreate/
-      - !ruby/regexp /http:\/\/ESCAPEDSERVERNAME\/task/
-      - !ruby/regexp /http:\/\/ESCAPEDSERVERNAME\/compound/
+    : - !ruby/regexp /http:\/\/ESCAPEDSERVER\/toxcreate/
+      - !ruby/regexp /http:\/\/ESCAPEDSERVER\/task/
+      - !ruby/regexp /http:\/\/ESCAPEDSERVER\/compound/
 
     ? - :PUT
-    : - !ruby/regexp /http:\/\/ESCAPEDSERVERNAME\/task/
+    : - !ruby/regexp /http:\/\/ESCAPEDSERVER\/task/
 
   :authorize_exceptions: #request-method for uri only authenticated, no authorization
     ? - :POST
-    : - !ruby/regexp /http:\/\/ESCAPEDSERVERNAME\/algorithm/
+    : - !ruby/regexp /http:\/\/ESCAPEDSERVER\/algorithm/
       - "http://SERVERNAME/dataset"
       - "http://SERVERNAME/model"
       - "http://SERVERNAME/validation"
-      - !ruby/regexp /http\:\/\/ESCAPEDSERVERNAME\/validation\/[a-z,A-Z,\/,_\-]*$/
+      - !ruby/regexp /http\:\/\/ESCAPEDSERVER\/validation\/[a-z,A-Z,\/,_\-]*$/
  
diff --git a/aa-server.yaml b/aa-server.yaml
index 593ba56..71575b4 100644
--- a/aa-server.yaml
+++ b/aa-server.yaml
@@ -15,24 +15,24 @@
 # Exceptions:
   :free_uris: #request-method for uri not controlled by A&A
     ? - :GET
-    : - !ruby/regexp /http:\/\/ESCAPEDSERVERNAME\/algorithm/
+    : - !ruby/regexp /http:\/\/ESCAPEDSERVER\/algorithm/
       - "http://SERVERNAME/model"
       - "http://SERVERNAME/validation"
-      - !ruby/regexp /http:\/\/ESCAPEDSERVERNAME\/validation\/[a-z,A-Z,\/,_\-]*$/
+      - !ruby/regexp /http:\/\/ESCAPEDSERVER\/validation\/[a-z,A-Z,\/,_\-]*$/
     ? - :GET
       - :POST
-    : - !ruby/regexp /http:\/\/ESCAPEDSERVERNAME\/toxcreate/
-      - !ruby/regexp /http:\/\/ESCAPEDSERVERNAME\/task/
-      - !ruby/regexp /http:\/\/ESCAPEDSERVERNAME\/compound/
+    : - !ruby/regexp /http:\/\/ESCAPEDSERVER\/toxcreate/
+      - !ruby/regexp /http:\/\/ESCAPEDSERVER\/task/
+      - !ruby/regexp /http:\/\/ESCAPEDSERVER\/compound/
 
     ? - :PUT
-    : - !ruby/regexp /http:\/\/ESCAPEDSERVERNAME\/task/
+    : - !ruby/regexp /http:\/\/ESCAPEDSERVER\/task/
 
   :authorize_exceptions: #request-method for uri only authenticated, no authorization
     ? - :POST
-    : - !ruby/regexp /http:\/\/ESCAPEDSERVERNAME\/algorithm/
+    : - !ruby/regexp /http:\/\/ESCAPEDSERVER\/algorithm/
       - "http://SERVERNAME/dataset"
       - "http://SERVERNAME/model"
       - "http://SERVERNAME/validation"
-      - !ruby/regexp /http\:\/\/ESCAPEDSERVERNAME\/validation\/[a-z,A-Z,\/,_\-]*$/
+      - !ruby/regexp /http\:\/\/ESCAPEDSERVER\/validation\/[a-z,A-Z,\/,_\-]*$/
  
diff --git a/config b/config
index b5dabcc..e72242b 100644
--- a/config
+++ b/config
@@ -5,10 +5,6 @@
 # Linux distribution (currently only debian)
 distribution=debian
 
-# Choose a root password for the MySQL database
-# Please insert the correct password if mysql-server is already installed
-mysql_root=opentox
-
 # Installation type
 # Options:
 # gem	  installs only the opentox-ruby gem (useful, if you want to use external services with the opentox-ruby DSL)
diff --git a/nginx.sh b/nginx.sh
index 5cd4853..7b0e2ba 100755
--- a/nginx.sh
+++ b/nginx.sh
@@ -17,6 +17,7 @@ if [ ! -e "$PIN" ]; then
 fi
 
 source ./config.sh
+source ./utils.sh
 
 echo "This installs Nginx."
 echo "Press <Return> to continue, or <Ctrl+C> to abort."
@@ -37,12 +38,16 @@ else
 fi
 
 if ! $NGINX_DONE; then
-  $PIN --auto-download --auto --prefix="$NGINX_DEST"
-  cd "$RUBY_DEST/lib/ruby/gems/1.8/gems/"
+  if ! $PIN --auto-download --auto --prefix="$NGINX_DEST">>$LOG 2>&1
+    printf "%25s%15s\n" "'Install'" "FAIL"
+    exit 1
+  fi
+  printf "%25s%15s\n" "'Install'" "DONE"
+  cd "$RUBY_DEST/lib/ruby/gems/1.8/gems/" >>$LOG 2>&1
   passenger=`ls -d passenger*`;
-  cd -
+  cd - >>$LOG 2>&1
   servername=`hostname`
-  sed -e "s/PASSENGER/$passenger/;s/SERVERNAME/$servername/;s/RUBY_DEST/$RUBY_DEST/" ./nginx.conf > $NGINX_DEST/nginx.conf
+  sed -e "s/PASSENGER/$passenger/;s/SERVERNAME/$servername/;s/RUBY_DEST/$RUBY_DEST/" ./nginx.conf > $NGINX_DEST/nginx.conf 2>>$LOG 
 fi
 
 cd "$DIR"