Changeset 1682 in genapp for sbin

Timestamp:

Mar 20, 2019, 8:03:18 AM (3 years ago)

Author:

ehb

Message:

Fixes for 18.04 & setconfig issue

Location:

sbin

Files:

• install.pl (modified) (2 diffs)
• setconfig.pl (modified) (5 diffs)

sbin/install.pl

@@ -525 +525 @@
 }
 
-# ------ centos 7.2,7.3,7.4,7.5 -------
+# ------ centos 7.2,7.3,7.4,7.5,7.6-------
 if ( $os eq 'centos' && $os_release =~ /^7\.(2|3|4|5|6)/ ) {
 
@@ -910 +910 @@
     runcmd( "sudo add-apt-repository -y ppa:ondrej/php && sudo apt-get -y update" );
     runcmd( "sudo apt-get -y install mlocate build-essential apache2 php5.6-dev libapache2-mod-php5.6 php5.6-xml pkg-config re2c libzmq${zmqv}-dev uuid-dev abiword wget mongodb libmagickwand-6.q16-dev" );
+
+    # need zeromq from source :(
+
+    runcmd( "rm -fr /tmp/libzmq 2>/dev/null; cd /tmp && git clone git://github.com/zeromq/libzmq.git && cd libzmq && ./autogen.sh && ./configure && make -j$CPUS && make -j$CPUS check && sudo make -j$CPUS install && cat <<_EOF > /etc/ld.so.conf.d/zeromq.conf
+/usr/local/lib
+_EOF
+sudo ldconfig
+ " ) if !-e "/usr/local/lib/libzmq.so" || !-e "/etc/ld.so.conf.d/zeromq.conf";
 
 # php-pear php-imagick php-mail php-mail-mime php-mongodb mongodb" );

sbin/setconfig.pl

@@ -41 +41 @@
  -pj                           print resulting config.json
  -https                        use https and wss
+ -publicport                   specify a public port (used for websockets)
  -webroot webroot              specify the webroot directory
  -mongossl hostname cafile     specify the hostname and certificate file for mongod
@@ -80 +81 @@
         die "$0: option $option requries an argument\n" . $notes if !@ARGV;
         $webroot = shift @ARGV;;
+        next;
+    }
+    if ( $option =~ /^-publicport$/ ) {
+        die "$0: option $option requries an argument\n" . $notes if !@ARGV;
+        $publicport = shift @ARGV;;
         next;
     }
@@ -285 +291 @@
 
 my $wssport    = $https ? 443 : 80;
+$wssport    = $publicport if $publicport;
 my $wsport     = 30777;
 my $zmqport    = 30778;
@@ -440 +447 @@
     }
 } else {
-    $$json{'mongo'}{'url'} = $mongourl;
+    if ( $mongourl ) {
+        $$json{'mongo'}{'url'} = $mongourl;
+    } else {
+        delete $$json{'mongo'};
+    }
 }
 
@@ -451 +462 @@
     }
 } else {
-    $$json{'mongo'}{'cafile'} = $mongocafile;
+    if ( $mongocafile ) {
+        $$json{'mongo'}{'cafile'} = $mongocafile;
+    } else {
+        delete $$json{'mongo'};
+    }
 }