From 7f460113cc9c7eca91935549c25d78a9393e0977 Mon Sep 17 00:00:00 2001 From: Pjotr Date: Mon, 28 Sep 2026 14:48:57 +0000 Subject: container: deployment fixes for the Guix container/VM Changes previously carried as bnw-container-paths.patch in guix-bioinformatics, now applied to the source directly: * unify data directories on /var/lib/genenet/bnw (was /tmp/bnw and ./data/ mixed) * make the shell_exec paths __DIR__-relative and the example/octave helper scripts location-independent, so php-fpm can run them from any working directory * use core-octave randn/exp instead of the statistics-package normrnd/normpdf (not available in the container's octave) * nnodes: strtrim before strfind so the node count parses with the container's octave output * python3 instead of a hardcoded /home/jziebart path * add diag.php, a debug page showing the request and data state * bn_genenet.php: serve the GeneNetwork (GN2) handshake server-side; the My_Gennenet POST is converted (commas -> tabs, semicolons -> newlines) in PHP and the prepared-data page is returned in ONE request. This removes the raw-echo of into a JavaScript string (an XSS hole on public deployments) and is backward compatible for GN2 (same POST, better response). --- sourcecodes/remove_variables.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'sourcecodes/remove_variables.php') diff --git a/sourcecodes/remove_variables.php b/sourcecodes/remove_variables.php index 04d2ce9a..94a4156a 100644 --- a/sourcecodes/remove_variables.php +++ b/sourcecodes/remove_variables.php @@ -7,8 +7,8 @@ include("runtime_check.php"); include("input_validate.php"); $keyval=$_GET["My_key"]; -//$dir="./data/"; -$dir="/tmp/bnw/"; +//$dir="/var/lib/genenet/bnw/"; +$dir="/var/lib/genenet/bnw/"; $type_n=array(); @@ -838,8 +838,8 @@ function getcombineDescription(ntiers,ban_from,ban_to,white_from,white_to,keyv) { ntiers = 1; var tier=getNodesInTiers(ntiers); - // var txtFile="./data/"+keyv+"del_var.txt"; - var txtFile="/tmp/bnw/"+keyv+"del_var.txt"; + // var txtFile="/var/lib/genenet/bnw/"+keyv+"del_var.txt"; + var txtFile="/var/lib/genenet/bnw/"+keyv+"del_var.txt"; //var file = new File(txtFile); //file.open("w"); //file.write(tier); @@ -856,8 +856,8 @@ function getcombineDescriptionDefault(ntiers,ban_from,ban_to,white_from,white_to { ntiers = 1; var tier=getNodesInTiers(ntiers); - var txtFile="/tmp/bnw/"+keyv+"del_var.txt"; - //var txtFile="./data/"+keyv+"del_var.txt"; + var txtFile="/var/lib/genenet/bnw/"+keyv+"del_var.txt"; + //var txtFile="/var/lib/genenet/bnw/"+keyv+"del_var.txt"; //var file = new File(txtFile); //file.open("w"); //file.write(tier); -- cgit 1.4.1