Merge branch 'master' of baltig.sandia.gov:scot/SCOT

Author: brymon68

.gitignore

@@ -19,3 +19,5 @@ package-lock.json
 #scot.js
 scot-debug.js
 .idea/
+scot-ui/build/static/js/
+scot-ui/build/

.gitlab-ci.yml

@@ -0,0 +1,13 @@
+---
+stages:
+  - test
+
+before_script:
+  - export http_proxy=http://wwwproxy.sandia.gov:80
+  - export https_proxy=http://wwwproxy.sandia.gov:80
+  - export no_proxy=*.sandia.gov
+test:
+  stage: test
+  script:
+    - perl -MDevel::Cover t/api/all.t
+  coverage: /Total\s+.+\s(\d+\.\d+?)$/

Dockerfile-Apache

@@ -24,8 +24,6 @@ ENV  APACHE_RUN_USER=www-data \
 COPY ./docker-configs/apache/run.sh /scripts/
 RUN chmod +x /scripts/run.sh
 
-
-
 RUN apt-get update && \
   apt-get install -y apache2 libldap2-dev libsasl2-dev libssl-dev apache2 libapache2-mod-wsgi \
   apache2 libapache2-mod-authnz-external libapache2-mod-rpaf && \

Dockerfile-Flair

@@ -9,9 +9,4 @@ COPY bin/flairer.pl /opt/scot/bin/
 COPY install/src/scot /opt/scot/etc/
 COPY docker-configs/flair/flair.cfg.pl /opt/scot/etc/
 
-RUN groupadd -g 2060 scot && \
-    useradd -r -u 1060 -g scot scot
-
-
-USER scot
 CMD ["/usr/bin/perl", "/opt/scot/bin/flairer.pl"]

Dockerfile-Game

@@ -10,9 +10,4 @@ COPY lib/Scot/App/Game.pm /opt/scot/lib/
 COPY install/src/scot /opt/scot/etc/
 COPY docker-configs/game/game.cfg.pl /opt/scot/etc/
 
-
-RUN groupadd -g 2060 scot && \
-    useradd -r -u 1060 -g scot scot
-
-USER scot
 CMD ["/usr/bin/perl", "/opt/scot/bin/game.pl"]

Dockerfile-Mail

@@ -10,10 +10,4 @@ COPY docker-configs/mail/Mail.pm /opt/scot/lib/Scot/App/
 COPY install/src/scot /opt/scot/etc/
 COPY docker-configs/mail/alert.cfg.pl /opt/scot/etc/
 
-
-RUN groupadd -g 2060 scot && \
-    useradd -r -u 1060 -g scot scot
-
-#USER scot
-
 CMD ["/usr/bin/perl", "/opt/scot/bin/alert.pl"]

Dockerfile-Mongodb

@@ -48,4 +48,3 @@ USER mongodb:mongodb
 
 
 CMD ["/run.sh"]
-

Dockerfile-Perl

@@ -16,10 +16,9 @@ ENV no_proxy="elastic,mongodb,scot,activemq,apache"
 ENV NO_PROXY="elastic,mongodb,scot,activemq,apache"
 
 
-
 RUN apt-get update && \
     apt-get -qy upgrade && \
-    apt-get install -qy perl build-essential cpanminus perl-doc perl-base perl-modules \ 
+    apt-get install -qy perl build-essential cpanminus perl-doc perl-base perl-modules curl vim ssmtp \ 
     perlmagick perltidy libcurses-perl libmagic-dev libxml-perl libyaml-perl libwww-mechanize-perl \
     libjson-perl libmath-gmp-perl librose-db-perl libtree-simple-perl libtask-weaken-perl libtree-simple-visitorfactory-perl \
     libalgorithm-c3-perl libapparmor-perl libarchive-zip-perl libauthen-krb5-simple-perl libauthen-sasl-perl \

Dockerfile-Reflair

@@ -10,10 +10,4 @@ COPY install/src/scot /opt/scot/etc/
 COPY docker-configs/reflair/reflair.cfg.pl /opt/scot/etc/
 COPY docker-configs/scot/scot.cfg.pl /opt/scot/etc/
 
-RUN groupadd -g 2060 scot && \
-    useradd -r -u 1060 -g scot scot
-
-
-USER scot
-
 CMD ["/usr/bin/perl", "/opt/scot/bin/reflair.pl"]

Dockerfile-Scot

@@ -6,8 +6,7 @@ ENV DEBIAN_FRONTEND="noninteractive" \
 
 
 RUN apt-get update && \
-    apt-get install apt-utils ca-certificates curl vim ssmtp -y -f  && \
-    update-ca-certificates && \ 
+    apt-get install ssmtp -y -f  && \
     apt-get autoclean && \
     apt-get --purge -y autoremove && \ 
     rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/*
@@ -29,6 +28,12 @@ COPY docker-configs/scot/backup.cfg.pl /opt/scot/etc/
 COPY docker-configs/scot/restore.cfg.pl /opt/scot/etc/
 
 
+RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10 && \
+    echo "deb http://repo.mongodb.org/apt/ubuntu $(cat /etc/lsb-release | grep DISTRIB_CODENAME | cut -d= -f2)/mongodb-org/3.2 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-3.2.list && \
+    apt-get update && \
+    apt-get install -y --force-yes --allow-downgrades  pwgen mongodb-org-shell mongodb-org-tools  && \
+    echo "mongodb-org-shell hold" | dpkg --set-selections 
+
 RUN groupadd -g 2060 scot && \
     useradd -r -u 1060 -g scot scot
 

Dockerfile-Stretch

@@ -9,8 +9,4 @@ COPY bin/ /opt/scot/bin/
 COPY install/src/scot /opt/scot/etc/
 COPY docker-configs/stretch/stretch.cfg.pl /opt/scot/etc/
 
-RUN groupadd -g 2060 scot && \
-    useradd -r -u 1060 -g scot scot
-
-USER scot
 CMD ["/usr/bin/perl", "/opt/scot/bin/stretch.pl"]

bin/abm.pl

@@ -2,7 +2,7 @@
 
 use strict;
 use warnings;
-use v5.18;
+use v5.16;
 
 use lib '../../Scot-Internal-Modules/lib';
 use lib '../lib';

bin/add_first_response.pl

@@ -2,7 +2,7 @@
 
 use strict;
 use warnings;
-use v5.18;
+use v5.16;
 
 use lib '/opt/scot/lib';
 use lib '../../Scot-Internal-Modules/lib';

bin/add_ip_bits.pl

@@ -2,7 +2,7 @@
 
 use strict;
 use warnings;
-use v5.18;
+use v5.16;
 
 use lib '/opt/scot/lib';
 use lib '../../Scot-Internal-Modules/lib';

bin/alert.pl

@@ -2,7 +2,7 @@
 
 use strict;
 use warnings;
-use v5.18;
+use v5.16;
 
 use lib '../../Scot-Internal-Modules/lib';
 use lib '../lib';

bin/amq_queue_read_test.pl

@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 
 use lib '../lib';
-use v5.18;
+use v5.16;
 
 use strict;
 use warnings;

bin/amq_queue_send_test.pl

@@ -3,7 +3,7 @@
 use Data::Dumper;
 use JSON;
 use Net::STOMP::Client;
-use v5.18;
+use v5.16;
 
 my $stomp = Net::STOMP::Client->new(
     host    => '127.0.0.1',

bin/backup.pl

@@ -2,7 +2,7 @@
 
 use strict;
 use warnings;
-use v5.18;
+use v5.16;
 use lib '../lib';
 use lib '/opt/scot/lib';
 

bin/beamup.pl

@@ -6,7 +6,7 @@
 use lib '../../lib';
 use lib '../../Scot-Internal-Modules/lib';
 use lib '/opt/scot/lib';
-use v5.18;
+use v5.16;
 use Scot::App::Responder::BeamUp;
 use Scot::Env;
 

bin/check_configs.pl

@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 
-use v5.18;
+use v5.16;
 
 use lib '../lib';
 use Scot::Env;

bin/create_apikey.pl

@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use v5.18;
+use v5.16;
 use lib '../lib';
 use lib '/opt/scot/lib';
 

bin/dailybrief.pl

@@ -2,7 +2,7 @@
 
 use strict;
 use warnings;
-use v5.18;
+use v5.16;
 
 # use lib '../../Scot-Internal-Modules/lib';
 use lib '../lib';

bin/david.pl

@@ -2,7 +2,7 @@
 
 use strict;
 use warnings;
-use v5.18;
+use v5.16;
 
 use lib '../lib';
 use Scot::Env;

bin/dedup_tag_source.pl

@@ -3,7 +3,7 @@
 use lib '../lib';
 use strict;
 use warnings;
-use v5.18;
+use v5.16;
 
 use Test::More;
 use Test::Mojo;

bin/deduplinks.pl

@@ -2,7 +2,7 @@
 
 use MongoDB;
 use Data::Dumper;
-use v5.18;
+use v5.16;
 
 my $mongo           = MongoDB->connect->db('scot-prod');
 my $collection      = $mongo->get_collection('link');

bin/download_public_suffix.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+URL="https://raw.githubusercontent.com/publicsuffix/list/master/public_suffix_list.dat"
+
+cd /opt/scot/etc
+wget $URL
+

bin/entity_link_update.pl

@@ -2,7 +2,7 @@
 
 use MongoDB;
 use Data::Dumper;
-use v5.18;
+use v5.16;
 
 #my $env = Scot::Env->new({
 #    config_file => "../../Scot-Internal-Modules/etc/elu.cfg.pl",

bin/esquery.pl

@@ -2,7 +2,7 @@
 
 use strict;
 use warnings;
-use v5.18;
+use v5.16;
 
 use lib '../../Scot-Internal-Modules/lib';
 use lib '../lib';

bin/fedrec.pl

@@ -6,7 +6,7 @@
 use lib '../../lib';
 use lib '../../Scot-Internal-Modules/lib';
 use lib '/opt/scot/lib';
-use v5.18;
+use v5.16;
 use Scot::App::FedRec;
 use Data::Dumper;
 

bin/fedup.pl

@@ -6,7 +6,7 @@
 use lib '../../lib';
 use lib '../../Scot-Internal-Modules/lib';
 use lib '/opt/scot/lib';
-use v5.18;
+use v5.16;
 use Scot::App::Responder::FederateUp;
 use Data::Dumper;
 

bin/find_cidr.pl

@@ -2,7 +2,7 @@
 
 use strict;
 use warnings;
-use v5.18;
+use v5.16;
 
 use lib '/opt/scot/lib';
 use lib '../../Scot-Internal-Modules/lib';

bin/fix_alert_stat.pl

@@ -4,7 +4,7 @@
 use lib '/opt/scot/lib';
 use Data::Dumper;
 use Scot::Env;
-use v5.18;
+use v5.16;
 
 my $env   = Scot::Env->new(config_file=>'/opt/scot/etc/scot.cfg.pl');
 my $mongo = $env->mongo;