WebSVN – camp_sysinfo_client_3 – Diff – /trunk/install.pl

 # Version 1.1.7 20161010 RWR
 # Added ability to validate required libraries are installed
+#
 # version 1.2 20170327 RWR
 # did some major modifications to correctly work on BSD systems also
+#
+# version 2.0 20190330 RWR
+# changed it so all configs are YAML
-our $VERSION = '1.2';
+our $VERSION = '2.0';
 # find our location and use it for searching for libraries
 BEGIN {
    use FindBin;
    use File::Spec;
    use lib File::Spec->catdir($FindBin::Bin);
+}
 use sysinfoconf;
+#use YAML::Tiny; # moved to after the call to check on libraries
-use YAML::Tiny;
+use Data::Dumper;
 use File::Basename;
 use Getopt::Long;
 Getopt::Long::Configure ("bundling"); # allow -vd --os='debian'
 # $verbose can have the following values
                  'default group' => 'root',
                  'default owner' => 'root',
                  'default permission' => '0700',
                  'configuration' => {
                           'configurator' => '<bindir>/configure.pl',
-                          'configuration file' => '<confdir>/sysinfo-client.conf',
+                          'configuration file' => '<confdir>/sysinfo-client.yaml',
-                          'configuration seed file' => 'sysinfo-client.seed',
+                          'configuration seed file' => 'sysinfo-client.seed.yaml',
+                          'old configuration file' => '<confdir>/sysinfo-client.conf',
                           'permission' => '700',
                           'owner'      => '<default owner>',
                           'target'     => '<confdir>'
                             },
                  'files' => {
                                  'type' => 'file',
                                  'permission' => '600',
                                  'owner' => '<default owner>:<default group>',
                                  'target' =>  '<bindir>'
                               },
-                           'sysinfo-client.conf.template' => {
+                           'sysinfo-client.conf.template.yaml' => {
                                  'type' => 'file',
                                  'permission' => '600',
                                  'owner' => '<default owner>:<default group>',
                                  'target' =>  '<bindir>'
                               },
                                  'type' => 'file',
                                  'permission' => '600',
                                  'owner' => '<default owner>:<default group>',
                                  'target' =>  '<bindir>'
                               },
-                           'sysinfo-client.seed.example' => {
+                           'sysinfo-client.seed.example.yaml' => {
                                  'type' => 'file',
                                  'permission' => '600',
                                  'owner' => '<default owner>:<default group>',
                                  'target' =>  '<bindir>'
                               },
                      'crontab' => 'ln -s <bindir>/sysinfo-client /etc/periodic/daily/sysinfo-client',
                      'modules' => '((bsd)|(unix)|(all))',
                     'default group' => 'wheel',
                     'default owner' => 'root',
                   },
+                  'opnsense' => {
+                     'fileexists' => '/conf/config.xml',
+                     'bindir' => '/usr/local/opt/camp/sysinfo-client',
+                     'confdir' => '/usr/local/etc/camp/sysinfo-client',
+                     'crontab' => 'ln -s <bindir>/sysinfo-client /etc/periodic/daily/sysinfo-client',
+                     'modules' => '((bsd)|(unix)|(all))',
+                    'default group' => 'wheel',
+                    'default owner' => 'root',
+                 },
                 );
 my %configuration;
                   'Exporter' => { 'debian' => 'apt-get -y install perl-base' },
                   'LWP' => {
                              'debian' => 'apt-get -y install libwww-perl',
                              'freebsd' => 'pkg install -y p5-libwww'
                            },
+                  'YAML::Tiny' => {
+                              'debian' => 'apt-get -y install libyaml-tiny-perl',
+                              'freebsd' => 'installYAML.pl'
+                           },
                 );
 # utilities md5sum
 # freebsd isomd5sum
                             join( ' ', @missingLibs ) .
                             "\nand I don't know how to do this. Abort?" );
+      }
    } # if
 } # validateLibraries
+# checks various flags to
+sub determineOS {
-# attempt to locate the operating system.
+   my $operatingSystems = shift;
+   my $osType;
-# if found, will set some defaults for it.
+   # first, look through our entries for fileexists
-sub getOS {
+   unless ( $os ) {
-   my ( $install, $operatingSystems, $os ) = @_;
+      foreach $osType ( keys %operatingSystems ) {
+         next unless defined $operatingSystems->{$osType}->{'fileexists'};
-   if ( ! $os ) { # we don't know, so we must try to figure it out
+         if (  -e $operatingSystems->{$osType}->{'fileexists'} ) {
+            return $osType;
+         } # if
+      } # foreach
+   } # unless
+   # next, look for uname and see if that gives us a clue
+   unless ( $os ) {
       my $osString = `uname -a`;
-      foreach my $osType ( keys %$operatingSystems ) {
+      foreach $osType ( keys %$operatingSystems ) {
+         next unless defined $operatingSystems->{$osType}->{'regex'};
          print "Checking if OS is $osType in $osString\n" if $verbose > 2;
-         next unless $osString =~ m/$$operatingSystems{$osType}{'regex'}/i;
+         if ( $osString =~ m/$$operatingSystems{$osType}{'regex'}/i ) {
-         print "Yes, it is $osType\n" if $verbose > 2;
+            print "Yes, it is $osType\n" if $verbose > 2;
-         # We found the OS, set up some defaults
+            return $osType;
-         $os = $osType;
+         }
       } # foreach
+   } # unless
+   return '';
-   }
+}
+# attempt to locate the operating system.
+# if found, will set some defaults for it.
+sub setUpOperatingSystemSpecific {
+   my ( $install, $operatingSystems, $os ) = @_;
+   $os = &determineOS( $operatingSystems ) unless $os;
    if ( $os ) {
+      # We found the OS, set up some defaults
       $$install{'os'} = $os;
       print "Setting keys for operating system\n" if $verbose > 2;
       foreach my $key ( keys %{$$operatingSystems{ $os }} ) {
          $$install{$key} = $operatingSystems{ $os }{$key};
       } # if it is a known OS
    # seed configuration, if needed
    if ( $$install{'build config'} ) {
       my $config;
       my @fileList;
-      my $seedFile = $$install{'configuration'}{'configuration seed file'};
-      my $confFile = $$install{'configuration'}{'configuration file'};
+      # the order is important here as, if multiple files exist, latter ones can
+      # overwrite values in the previous. We do a push so the first value pushed
+      # is processed last, ie has higher priority.
+      push @fileList, $install->{'configuration'}->{'old configuration file'};
+      push @fileList, $install->{'configuration'}->{'configuration file'};
+      my $seedFile = $install->{'configuration'}->{'configuration seed file'};
-      if ( -f $seedFile  && &yesno( 'Add installation seed file? ' ) ) {
+      if ( -e $seedFile  && &yesno( 'Add installation seed file? ' ) ) {
          push @fileList, $seedFile;
       } # if preload seed file
-      if (  -f $confFile  ) {
-         push @fileList, $confFile;
-      }
       $config = &makeConfig( @fileList );
       # if ScriptDirs and moduleDirs not populated, do so from our configuration
       if ( ! $$config{'scriptDirs'} || ! scalar @{ $$config{'scriptDirs'} }  ) {
 #         my @temp = ( $$install{'files'}{'scripts'}{'target'} );
 #         $$config{'scriptDirs'} = \@temp;
 if ( $help ) { &help() ; exit; }
 if ( $version ) { print "$0 version $VERSION\n"; exit; }
 &setDryRun( $dryRun ); # tell the library whether this is a dry run or not
-# figure out if we know our operating system
+# figure out if we know our operating system and set up special stuff for it
-$os = &getOS( \%install, \%operatingSystems, $os );
+$os = &setUpOperatingSystemSpecific( \%install, \%operatingSystems, $os );
 &validateLibraries( \%libraries, $os );
+use YAML::Tiny;
 $installType = &getInstallActions( \%install );
 # based on the defaults, flesh out the install hash
 $status = &populateSourceDir( \%install, $sourceDir );
 $status = &getVersions( \%install );
 &showWork( \%install );
 die unless &yesno( "Ready to run? Select No to abort." );
+#my $config = &makeConfig( $install{'configuration'}{'configuration seed file'}, $install{'configuration'}{'configuration file'}, $install{'configuration'}{'old configuration file'} );
+#print Dumper( $config );
+#die;
 $status = &doInstall( \%install );
 $status = &postInstall( \%install );
 # create uninstaller script
 # find the last non-space string in the crontab value. This is the target of the link
 $install{'crontab'} =~ m/([^ ]+)$/;
-my $uninstall = "#! /usr/bin/env sh\n\n# Uninstall syinfo\nrm -fR $install{'bindir'} $install{'confdir'} $1\n";
+my $uninstall = "#! /usr/bin/env sh\n\n# Uninstall syinfo\nrm -fR $install{'bindir'} $1\n";
 my $outFileName = $install{'bindir'} . '/uninstall';
 open UNINSTALL, ">$outFileName" or die "could not write to $outFileName: $!\n";
 print UNINSTALL $uninstall;
 close UNINSTALL;
 qx ( chmod 700 $outFileName );

Subversion Repositories camp_sysinfo_client_3

(root)/trunk/install.pl @ 95 – Rev 92 → 94