make the example apache configuration file ready for copy with EDGE i…

…nstallation script

INSTALL.sh

@@ -1506,6 +1506,7 @@ else
 fi
 
 sed -i.bak 's,%EDGE_HOME%,'"$rootdir"',g' $rootdir/edge_ui/cgi-bin/edge_config.tmpl
+sed -i.bak 's,%EDGE_HOME%,'"$rootdir"',g' $rootdir/edge_ui/apache_conf/edge_apache.conf
 
 TOLCPU=`cat /proc/cpuinfo | grep processor | wc -l`;
 if [ $TOLCPU -gt 0 ]

edge_ui/apache_conf/edge_apache.conf

@@ -1,7 +1,6 @@
-
 <IfModule mod_alias.c>
- ScriptAlias /edge_ui/cgi-bin/ /opt/apps/edge/edge_ui/cgi-bin/
- <Directory "/opt/apps/edge/edge_ui/cgi-bin">
+ ScriptAlias /edge_ui/cgi-bin/ %EDGE_HOME%/edge_ui/cgi-bin/
+ <Directory "%EDGE_HOME%/edge_ui/cgi-bin">
  AllowOverride None
  Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
  AddHandler cgi-script .cgi .pl
@@ -11,28 +10,23 @@
 </IfModule>
 
 <IfModule alias_module>
- Alias /edge_ui/ "/opt/apps/edge/edge_ui/"
- <Directory "/opt/apps/edge/edge_ui">
+ Alias /edge_ui "%EDGE_HOME%/edge_ui"
+ <Directory "%EDGE_HOME%/edge_ui">
  Options Indexes FollowSymlinks
  AllowOverride None
  Require all granted
  </Directory>
 </IfModule>
 
-<Files ~ "\.(fast?|gbk|gff|faa|ffn|fna|fsa|tbl)$">
+<Files ~ "\.(fastq|fasta|fa|gbk|gff|faa|ffn|fna|fsa|tbl)$">
  ForceType application/octet-stream
  Header set Content-Disposition attachment
 </Files>
 
-<Directory /opt/apps/edge/edge_ui/*/>
+<Directory %EDGE_HOME%/edge_ui/*/>
  Options -Indexes
 </Directory>
 
-<Directory /var/www/edge_ui/>
- Order allow,deny
- Allow from all
-</Directory>
-
 # for user management tomcat server to be visible on port 80
 ProxyPass /userManagement http:https://localhost:8080/userManagement
 ProxyPassReverse /userManagement http:https://localhost:8080/userManagement
@@ -54,6 +48,6 @@ AddType application/octet-stream .bam .bami
  </FilesMatch>
 </IfModule>
 
-<Directory /var/www/edge_ui/JBrowse/>
+<Directory %EDGE_HOME%/edge_ui/JBrowse/>
  AllowOverride FileInfo
 </Directory>