From 147a57d45b3cdbecaa5883f1246e05e7bda4b441 Mon Sep 17 00:00:00 2001 From: Javier Herrero Date: Fri, 8 Apr 2016 11:56:24 +0100 Subject: [PATCH] Fixing deployment instructions for v1.2 --- webserver/INSTALL | 45 ++++++++++++++++++++++++--------------------- webserver/cgi-bin/index.pl | 7 ++++--- 2 files changed, 28 insertions(+), 24 deletions(-) diff --git a/webserver/INSTALL b/webserver/INSTALL index 8548b77..a2c92fa 100644 --- a/webserver/INSTALL +++ b/webserver/INSTALL @@ -25,6 +25,7 @@ webserver. wget http://eforge.cs.ucl.ac.uk/files/eforge.db wget http://eforge.cs.ucl.ac.uk/files/eforge_1.1.db + wget http://eforge.cs.ucl.ac.uk/files/eforge_1.2.db wget http://eforge.cs.ucl.ac.uk/files/mvp_450k_bins wget http://eforge.cs.ucl.ac.uk/files/mvp_27k_bins @@ -74,27 +75,29 @@ server by the server itself. 3.b. Create some directories for hosting the code, log and result files: - sudo mkdir /var/www/eFORGE.v1.1/ - cd /var/www/eFORGE.v1.1/ + sudo mkdir /var/www/eFORGE.v1.2/ + cd /var/www/eFORGE.v1.2/ sudo mkdir -p bin log cgi-bin html html/files sudo chown apache log html/files # the user under which you run apache (see the line "User" in # /etc/httpd/conf/httpd.conf) 3.c. Copy the webserver files to the right directories - sudo rsync -avPL ~/eFORGE/webserver/cgi-bin/ /var/www/eFORGE.v1.1/cgi-bin/ - sudo rsync -avPL ~/eFORGE/webserver/bin/ /var/www/eFORGE.v1.1/bin/ - sudo rsync -avPL ~/eFORGE/webserver/html/ /var/www/eFORGE.v1.1/html/ - sudo rsync -avPL ~/eFORGE/eforge.db /var/www/eFORGE.v1.1/bin/ - sudo rsync -avPL ~/eFORGE/eforge_1.1.db /var/www/eFORGE.v1.1/bin/ - sudo rsync -avPL ~/eFORGE/mvp_450k_bins /var/www/eFORGE.v1.1/bin/ - sudo rsync -avPL ~/eFORGE/mvp_27k_bins /var/www/eFORGE.v1.1/bin/ + sudo rsync -avPL ~/eFORGE/webserver/cgi-bin/ /var/www/eFORGE.v1.2/cgi-bin/ + sudo rsync -avPL ~/eFORGE/webserver/bin/ /var/www/eFORGE.v1.2/bin/ + sudo rsync -avPL ~/eFORGE/webserver/html/ /var/www/eFORGE.v1.2/html/ + sudo rsync -avPL ~/eFORGE/eforge.db /var/www/eFORGE.v1.2/bin/ + sudo rsync -avPL ~/eFORGE/eforge_1.1.db /var/www/eFORGE.v1.2/bin/ + sudo rsync -avPL ~/eFORGE/eforge_1.2.db /var/www/eFORGE.v1.2/bin/ + sudo rsync -avPL ~/eFORGE/mvp_450k_bins /var/www/eFORGE.v1.2/bin/ + sudo rsync -avPL ~/eFORGE/mvp_27k_bins /var/www/eFORGE.v1.2/bin/ 3.e. Add links to the database files for the Downloads page: - cd /var/www/eFORGE.v1.1/html/files + cd /var/www/eFORGE.v1.2/html/files sudo ln -s ../../bin/eforge.db . sudo ln -s ../../bin/eforge_1.1.db . + sudo ln -s ../../bin/eforge_1.2.db . sudo ln -s ../../bin/mvp_450k_bins . sudo ln -s ../../bin/mvp_27k_bins . @@ -103,7 +106,7 @@ server by the server itself. These files contain a list of arrays and dataset included in the database. They are used by the web server to know what it can offer without having to query the DB every time. - cd /var/www/eFORGE.v1.1/bin + cd /var/www/eFORGE.v1.2/bin perl eforge.pl -data ? > data.conf perl eforge.pl -bkgd ? > bkgd.conf @@ -114,22 +117,22 @@ folder (like http://blic.cs.ucl.ac.uk/eFORGE). OPTION 1 -- Configure an Apache VirtualHost for eFORGE: - cat > /etc/http/conf.d/eforge.v1.1.conf + cat > /etc/http/conf.d/eforge.v1.2.conf ServerName eforge.cs.ucl.ac.uk - DocumentRoot /var/www/eFORGE/html - ScriptAlias /cgi-bin/ /var/www/eFORGE.v1.1/cgi-bin/ + DocumentRoot /var/www/eFORGE.v1.2./html + ScriptAlias /cgi-bin/ /var/www/eFORGE.v1.2/cgi-bin/ DirectoryIndex index.html /cgi-bin/index.pl - + Order allow,deny Allow from all - + AllowOverride None Options None Order allow,deny @@ -140,18 +143,18 @@ OPTION 1 -- Configure an Apache VirtualHost for eFORGE: OPTION 2 -- Configure an Apache VirtualHost for eFORGE: - cat > /etc/http/conf.d/eforge.v1.1.conf -ScriptAlias /eFORGE.v1.1/cgi-bin/ /var/www/eFORGE.v1.1/cgi-bin/ -Alias "/eFORGE.v1.1" "/var/www/eFORGE.v1.1/html" + cat > /etc/http/conf.d/eforge.v1.2.conf +ScriptAlias /eFORGE.v1.2/cgi-bin/ /var/www/eFORGE.v1.2/cgi-bin/ +Alias "/eFORGE.v1.2" "/var/www/eFORGE.v1.2/html" - + Order allow,deny Allow from all DirectoryIndex index.html cgi-bin/index.pl - + AllowOverride None Options None Order allow,deny diff --git a/webserver/cgi-bin/index.pl b/webserver/cgi-bin/index.pl index 3d664c3..1aceb44 100755 --- a/webserver/cgi-bin/index.pl +++ b/webserver/cgi-bin/index.pl @@ -25,13 +25,13 @@ ## # The location of the HTML pages for this server on the filesystem -my $DOCUMENT_ROOT = "/var/www/eFORGE.v1.1/html"; +my $DOCUMENT_ROOT = "/var/www/eFORGE.v1.2/html"; # The base URL (without the server name) for this server. For instance: # Running on http://server.org/ -> $WEB_ROOT = "" # Running on http://server.org/tool/ -> $WEB_ROOT = "/tool" # IMPORTANT - DO NOT INCLUDE A TRAILING '/' -my $WEB_ROOT = "/eFORGE.v1.1"; +my $WEB_ROOT = "/eFORGE.v1.2"; # The location of the files w.r.t. the base URL (DO NOT CHANGE) my $WEB_OUTDIR = "/files"; @@ -47,7 +47,7 @@ my $colour="bright-blue"; my $plot_colour="#29A6C9"; -my $title = "eFORGE v1.1"; +my $title = "eFORGE v1.2"; my $bkgd_conf = read_conf_file("$BIN_DIR/bkgd.conf"); @@ -1036,6 +1036,7 @@ sub print_download_page { "Additional files you will require: "); print Template::content_box("License",