Permalink
Browse files

Merge pull request #15 from shabiel/master

TLS support + foreground debugging + internal socket offload for GT.M >= 6.2
  • Loading branch information...
lparenteau committed Nov 4, 2015
2 parents 4d912f0 + f0c3980 commit 96da4aebe1f5e0f5a863a73e7d8de2b80521f222
Showing with 299 additions and 261 deletions.
  1. +1 −0 .gitignore
  2. +15 −9 conf/default.conf
  3. +9 −0 conf/tls-conf.libconf
  4. +263 −252 r/databallet.m
  5. +6 −0 r/debug.m
  6. +5 −0 script/debug-databallet.sh
View
@@ -0,0 +1 @@
+V6.2-002A_x86_64/
View
@@ -18,9 +18,9 @@
# Setup GT.M
# Running path, containing M source code.
-export gtmdir=`readlink -e "$PWD/\`dirname $0\`/.."`
+export gtmdir="/var/www/DataBallet/"
# Version used
-export gtmver="V6.0-003_x86_64"
+export gtmver="V6.2-002A_x86_64"
# Install path
export gtm_dist="/usr/lib/fis-gtm/$gtmver"
# Temporary directory
@@ -34,7 +34,12 @@ export gtm_prompt="DataBallet>"
# Global directory
export gtmgbldir="$gtmdir/$gtmver/g/gtm.gld"
# M routines
-export gtmroutines="$gtmdir/$gtmver/o($gtmdir/$gtmver/r $gtmdir/r) $gtm_dist/libgtmutil.so $gtm_dist"
+export gtmroutines="$gtmdir/$gtmver/o*($gtmdir/$gtmver/r $gtmdir/r) $gtm_dist/libgtmutil.so $gtm_dist"
+# Autorelink
+export gtm_link="recursive"
+# TLS Config
+export gtmcrypt_config="$gtmdir/conf/tls-conf.libconf"
+export gtmtls_passwd_tls="AAA"
# Create directories, if needed
mkdir -p $gtmdir/$gtmver/r $gtmdir/$gtmver/g $gtmdir/$gtmver/o $gtm_tmp $gtm_log
@@ -56,6 +61,7 @@ userconf;
set conf("serverstring")="full"
; Listening port
set conf("listenon","http")=8080
+ set conf("listenon","https")=8081
; Default document name
set conf("index")="index.html"
; Error log file
@@ -65,16 +71,16 @@ userconf;
; Extended Log Format file
set conf("extlog")="$gtm_log/databallet_extended.log"
;
- ; Globals configuration
- ;
- set TMP="^TMP"
- set CACHE="^CACHE"
- set SESSION="^SESSION"
+ ; Globals configuration
+ ;
+ set TMP="^TMP"
+ set CACHE="^CACHE"
+ set SESSION="^SESSION"
;
; Routing configuration
;
; Default document root, with static file serving.
- set conf("routing","*","/")="do handle^static(""/var/www/localhost/htdocs/"")"
+ set conf("routing","*","/")="do handle^static(""/var/www/"")"
; Example: Disabling default host
; set conf("routing","*","/")="do handle^static(""/dev/null"")"
; Example: Adding a virtual host
View
@@ -0,0 +1,9 @@
+tls: {
+ verify-depth: 7;
+ CAfile: "/etc/ssl/mycerts/ca-bundle.pem";
+ tls : {
+ format: "PEM";
+ cert: "/etc/ssl/mycerts/ssl.crt";
+ key: "/etc/ssl/mycerts/ssl.key";
+ };
+};
Oops, something went wrong.

0 comments on commit 96da4ae

Please sign in to comment.