Skip to content

Commit be52307

Browse files
brymon68brymon68
committed
Merge branch 'master' of baltig.sandia.gov:scot/SCOT
2 parents 28ee11c + e9855d0 commit be52307

File tree

104 files changed

+196424
-3164
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+196424
-3164
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ package-lock.json
1818
#compiled scot.js
1919
#scot.js
2020
scot-debug.js
21+
.idea/

‎Dockerfile-Perl‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ RUN cpanm --force IO::AIO AnyEvent::AIO Array::Split Data::Dumper Data::Dumper::
6767
MIME::Base64 IPC::Run IO::Prompt Log::Log4perl Mail::IMAPClient Mail::IMAPClient::BodyStructure [email protected] MongoDB::[email protected] \
6868
MongoDB::GridFS::[email protected] MongoDB::[email protected] Meerkat Mojo MojoX::Log::Log4perl Mojolicious::Plugin::WithCSRFProtection \
6969
Mojolicious::Plugin::TagHelpers XML::Smart Config::Auto Data::GUID File::LibMagic List::Uniq Domain::PublicSuffix Mozilla::PublicSuffix \
70-
Crypt::PBKDF2 Config::Crontab Test::JSON Math::Int128 GeoIP2 Search::Elasticsearch Term::ANSIColor Courriel Statistics::Descriptive Net::SSH::Perl Net::SFTP Lingua::EN::StopWords Data::Clone XML::Twig
70+
Crypt::PBKDF2 Config::Crontab Test::JSON Math::Int128 GeoIP2 Search::Elasticsearch Term::ANSIColor Courriel Statistics::Descriptive Net::SSH::Perl \
71+
Net::SFTP Lingua::EN::StopWords Data::Clone XML::Twig Mail::Send SVG::Sparkline
7172

7273
#Mongo stuff
7374

‎Dockerfile-Scot‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ENV DEBIAN_FRONTEND="noninteractive" \
66

77

88
RUN apt-get update && \
9-
apt-get install apt-utils ca-certificates curl vim -y -f && \
9+
apt-get install apt-utils ca-certificates curl vim ssmtp -y -f && \
1010
update-ca-certificates && \
1111
apt-get autoclean && \
1212
apt-get --purge -y autoremove && \
@@ -28,6 +28,7 @@ COPY docker-scripts/* /opt/scot/bin/
2828
COPY docker-configs/scot/backup.cfg.pl /opt/scot/etc/
2929
COPY docker-configs/scot/restore.cfg.pl /opt/scot/etc/
3030

31+
3132
RUN groupadd -g 2060 scot && \
3233
useradd -r -u 1060 -g scot scot
3334

‎bin/amq_queue_read_test.pl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
use DateTime;
1414

1515

16-
my $stomp = AnyEvent::STOMP::Client->new("localhost");
16+
my $stomp = AnyEvent::STOMP::Client->new("localhost", 61613, {login=>"scot", passcode=>"scot1234"});
1717

1818
$stomp->connect();
1919
$stomp->on_connected(

‎bin/amq_queue_send_test.pl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
host => '127.0.0.1',
1010
port => 61613,
1111
);
12-
$stomp->connect;
12+
$stomp->connect(login => "scot", passcode => "scot1234");
1313

1414
for my $i (1..10) {
1515

@@ -26,7 +26,7 @@
2626

2727
my $json = encode_json $href;
2828
$stomp->send(
29-
destination => "/queue/coe",
29+
destination => "/queue/incoming",
3030
body => $json,
3131
);
3232

‎bin/backup.pl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# $env has
2121
#
2222
# pidfile = the pid file for runnign dump
23-
# location = directory to dump the mongodump
23+
# bkuplocation = directory to dump the mongodump
2424
# tarloc = directory to place tar file
2525
# cleanup = true if you wish to remove the dumped directory
2626
# user = if needed, set to user name for db access
@@ -42,7 +42,7 @@
4242
print $pidfh "$$";
4343
close $pidfh;
4444

45-
my $dumpdir = $env->location;
45+
my $dumpdir = $env->bkuplocation;
4646
unless ($dumpdir) {
4747
warn "$dumpdir is missing! Setting to /tmp/dump";
4848
$dumpdir = "/tmp/dump";
@@ -197,8 +197,8 @@
197197
print "removing $esdir\n";
198198
system("rm -rf $esdir/*");
199199
}
200-
print "finding and removing old ".$env->location."\n";
201-
system("find ".$env->location." -ctime 7 -print0 | xargs -0 /bin/rm -f");
200+
print "finding and removing old ".$env->bkuplocation."\n";
201+
system("find ".$env->bkuplocation." -ctime 7 -print0 | xargs -0 /bin/rm -f");
202202
print "done";
203203
system("rm -f $pidfile");
204204

‎bin/check_configs.pl‎

Lines changed: 237 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,237 @@
1+
#!/usr/bin/env perl
2+
3+
use v5.18;
4+
5+
use lib '../lib';
6+
use Scot::Env;
7+
use Try::Tiny;
8+
use Data::Compare;
9+
use Data::Dumper;
10+
11+
12+
13+
my @required = (
14+
{
15+
config_file => "/opt/scot/etc/scot.cfg.pl",
16+
install_ver => "../install/src/scot/scot.cfg.pl",
17+
attributes => [
18+
"location",
19+
"site_identifier",
20+
"default_share_policy",
21+
"log_config",
22+
"modules",
23+
"get_method",
24+
"default_groups",
25+
"group_mode",
26+
"mode",
27+
"default_groups",
28+
"federation",
29+
"row_limit",
30+
"session_expiration",
31+
"admin_group",
32+
"file_store_root",
33+
"epoch_cols",
34+
"int_cols",
35+
"mojo_defaults",
36+
"entry_actions",
37+
"forms"
38+
],
39+
},
40+
{
41+
config_file => "/opt/scot/etc/alert.cfg.pl",
42+
install_ver => "../install/src/scot/scot.cfg.pl",
43+
attributes => [
44+
"location",
45+
"site_identifier",
46+
"default_share_policy",
47+
"time_zone",
48+
"log_config",
49+
"modules",
50+
"leave_unseen",
51+
"verbose",
52+
"max_processes",
53+
"fetch_mode",
54+
"since",
55+
"approved_alert_domains",
56+
"approved_accounts",
57+
"parser_dir",
58+
"default_groups",
59+
"default_owner",
60+
],
61+
},
62+
{
63+
config_file => "/opt/scot/etc/flair.cfg.pl",
64+
install_ver => "../install/src/scot/flair.cfg.pl",
65+
attributes => [
66+
"location",
67+
"site_identifier",
68+
"default_share_policy",
69+
"time_zone",
70+
"servername",
71+
"username",
72+
"password",
73+
"authtype",
74+
"log_config",
75+
"modules",
76+
"stomp_host",
77+
"stomp_port",
78+
"topic",
79+
"max_workers",
80+
"default_owner",
81+
],
82+
},
83+
{
84+
config_file => "/opt/scot/etc/reflair.cfg.pl",
85+
install_ver => "../install/src/scot/reflair.cfg.pl",
86+
attributes => [
87+
"location",
88+
"site_identifier",
89+
"time_zone",
90+
"servername",
91+
"username",
92+
"password",
93+
"authtype",
94+
"log_config",
95+
"modules",
96+
"stomp_host",
97+
"stomp_port",
98+
"topic",
99+
"max_workers",
100+
],
101+
},
102+
{
103+
config_file => "/opt/scot/etc/backup.cfg.pl",
104+
install_ver => "../install/src/scot/backup.cfg.pl",
105+
attributes => [
106+
"location",
107+
"log_config",
108+
"dbname",
109+
"pidfile",
110+
"bkuplocation",
111+
"cacheimg",
112+
"tarloc",
113+
"cleanup",
114+
"es_server",
115+
"es_backup_location",
116+
],
117+
},
118+
{
119+
config_file => "/opt/scot/etc/restore.cfg.pl",
120+
install_ver => "../install/src/scot/restore.cfg.pl",
121+
attributes => [
122+
"location",
123+
"log_config",
124+
"dbname",
125+
"pidfile",
126+
"bkuplocation",
127+
"cacheimg",
128+
"tarloc",
129+
"cleanup",
130+
"es_server",
131+
"es_backup_location",
132+
],
133+
},
134+
{
135+
config_file => "/opt/scot/etc/game.cfg.pl",
136+
install_ver => "../install/src/scot/game.cfg.pl",
137+
attributes => [
138+
"location",
139+
"log_config",
140+
"days_ago",
141+
"modules",
142+
],
143+
},
144+
{
145+
config_file => "/opt/scot/etc/metrics.cfg.pl",
146+
install_ver => "../install/src/scot/metrics.cfg.pl",
147+
attributes => [
148+
"time_zone",
149+
"log_config",
150+
"modules",
151+
],
152+
},
153+
{
154+
config_file => "/opt/scot/etc/stretch.cfg.pl",
155+
install_ver => "../install/src/scot/stretch.cfg.pl",
156+
attributes => [
157+
"location",
158+
"time_zone",
159+
"log_config",
160+
"max_workers",
161+
"stomp_host",
162+
"stomp_port",
163+
"topic",
164+
"default_owner",
165+
"modules",
166+
],
167+
},
168+
);
169+
170+
my @attrs_needed = ();
171+
172+
foreach my $req (@required) {
173+
174+
my $default = load_config($req->{install_ver});
175+
my $actual = load_config($req->{config_file});
176+
177+
foreach my $attr (@{$req->{attributes}}) {
178+
179+
180+
say "\nAttribute: ".$attr;
181+
say "------------------------------\n";
182+
183+
try {
184+
185+
my $value = $actual->{$attr};
186+
my $default = $default->{$attr};
187+
188+
if ( defined $value ) {
189+
say " attribute exists.";
190+
}
191+
else {
192+
push @attrs_needed, {
193+
config => $req->{config_file},
194+
attribute => $attr,
195+
};
196+
}
197+
198+
if ( examine($default, $value) ) {
199+
say " attribute has default value";
200+
}
201+
else {
202+
say " attribure has changed value";
203+
}
204+
}
205+
catch {
206+
say " ERROR: attribute does not exist in ".
207+
$req->{config_file};
208+
};
209+
}
210+
}
211+
212+
say "________________________________________________";
213+
say "Missing Attributes in configs";
214+
say "________________________________________________";
215+
say Dumper(\@attrs_needed);
216+
217+
sub examine {
218+
my $def = shift;
219+
my $val = shift;
220+
return Compare($def, $val);
221+
}
222+
223+
sub load_config {
224+
my $file = shift;
225+
unless ( -r $file ) {
226+
die "Config file not readable!\n";
227+
};
228+
no strict 'refs';
229+
my $cont = new Safe 'MCONFIG';
230+
my $result = $cont->rdo($file);
231+
my $hname = 'MCONFIG::environment';
232+
my %copy = %$hname;
233+
my $href = \%copy;
234+
return $href;
235+
}
236+
237+

‎bin/fedrec.pl‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
#!/usr/bin/env perl
2+
3+
use strict;
4+
use warnings;
5+
use lib '../lib';
6+
use lib '../../lib';
7+
use lib '../../Scot-Internal-Modules/lib';
8+
use lib '/opt/scot/lib';
9+
use v5.18;
10+
use Scot::App::FedRec;
11+
use Data::Dumper;
12+
13+
my $config_file = $ENV{'scot_app_flair_config_file'} //
14+
'/opt/scot/etc/fedrec.cfg.pl';
15+
my $env = Scot::Env->new(
16+
config_file => $config_file,
17+
);
18+
19+
$SIG{__DIE__} = sub { our @reason = @_ };
20+
21+
END {
22+
our @reason;
23+
if (@reason) {
24+
say "$0 died because: @reason";
25+
$env->log->error("$0 died because: ",{filter=>\&Dumper, value=>\@reason});
26+
}
27+
}
28+
29+
30+
31+
32+
my $loop = Scot::App::FedRec->new({
33+
env => $env,
34+
});
35+
$loop->run();
36+

‎bin/fedup.pl‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
#!/usr/bin/env perl
2+
3+
use strict;
4+
use warnings;
5+
use lib '../lib';
6+
use lib '../../lib';
7+
use lib '../../Scot-Internal-Modules/lib';
8+
use lib '/opt/scot/lib';
9+
use v5.18;
10+
use Scot::App::Responder::FederateUp;
11+
use Data::Dumper;
12+
13+
my $config_file = $ENV{'scot_app_flair_config_file'} //
14+
'/opt/scot/etc/fedup.cfg.pl';
15+
my $env = Scot::Env->new(
16+
config_file => $config_file,
17+
);
18+
19+
$SIG{__DIE__} = sub { our @reason = @_ };
20+
21+
END {
22+
our @reason;
23+
if (@reason) {
24+
say "$0 died because: @reason";
25+
$env->log->error("$0 died because: ",{filter=>\&Dumper, value=>\@reason});
26+
}
27+
}
28+
29+
30+
31+
32+
my $loop = Scot::App::Responder::FederateUp->new({
33+
env => $env,
34+
});
35+
$loop->run();
36+

0 commit comments

Comments
 (0)