WebSVN – camp_sysinfo_client_3 – Diff – /install.pl

+#
 # Version 1.1.7 20161010 RWR
 # Added ability to validate required libraries are installed
+#
-our $VERSION = '1.1.6';
+our $VERSION = '1.1.7';
 # find our location and use it for searching for libraries
 BEGIN {
    use FindBin;
    use File::Spec;
                   'ipfire' => {
                      'bindir' => '/opt/camp/sysinfo-client',
                      'confdir' => '/etc/camp/sysinfo-client',
                      'crontab' => 'ln -s <bindir>sysinfo-client /etc/fcron.daily/sysinfo-client.fcron',
                      'modules' => '((ipfire)|(unix))',
-                  }
+                  },
+                  'freebsd' => {
+                     '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))',
-                  );
+                  },
+                );
 # list of libraries used by the system. We will offer to install them if
 # we know how. NOTE: I have chosen to put the full installation command
 # for each library. This allows us to use the package selector OR a different
 # piece of code on a per-library basis, but results in something like
 #      apt-get -y install libwww-perl perl-modules
 # flexibility vs efficiency in this case.
 my %libraries = (
                   'File::Basename' => { 'debian' => 'apt-get -y install perl-modules' },
                   'Exporter' => { 'debian' => 'apt-get -y install perl-base' },
-                  'LWP' => { 'debian' => 'apt-get -y install libwww-perl' },
+                  'LWP' => { 'debian' => 'apt-get -y install libwww-perl',
+                             'freebsd' => 'pkg install p5-libwww' },
                 );
+# utilities md5sum
+# freebsd isomd5sum
 # validates the libraries needed exist
 # simply eval's each library. If it doesn't exist, creates a list of
 # commands to be executed to install it, and displays missing libraries
 # offering to install them if possible.
 sub validateLibraries {
             );
    } # foreach file
    return 1;
+}
+sub makeConfig {
+   my @configFileNames = @_;
+   my %config;
+   my $clientName;
+   my $serialNumber;
+   my $hostname;
+   my @moduleDirs;
+   my @scriptDirs;
+   my $transports = {};
+   foreach my $config ( @configFileNames ) {
+      open CONF,"<$config" or die "could not open $config: $!\n";
+      my $contents = join( '', <CONF> );
+      close CONF;
+      # now, eval the information we just read.
+      # NOTE: we must turn off strict while doing this, and we die if something breaks.
+      no strict "vars"; eval( $contents ); use strict "vars"; die "Error during eval: $@\n" if $@;
+   }
+   $config{'clientName'} = $clientName;
+   $config{'serialNumber'} = $serialNumber;
+   $config{'hostname'} = $hostname;
+   $config{'moduleDirs'} = [ @moduleDirs ];
+   $config{'scriptDirs'} = [ @scriptDirs ];
+   $config{'transports'} = $transports;
+   return \%config;
+}
 sub postInstall {
    my $install = shift;
    # set up crontab, if necessary
    &runCommand( $$install{'crontab'} ) if defined ( $$install{'crontab'} );
    # seed configuration, if needed
    if ( $$install{'build config'} ) {
-      my %config;
+      my $config;
+      my @fileList;
       my $seedFile = $$install{'configuration'}{'configuration seed file'};
       my $confFile = $$install{'configuration'}{'configuration file'};
-      my $content;
-      my $clientName;
-      my $serialNumber;
-      my $hostname;
-      my @moduleDirs;
-      my @scriptDirs;
-      my $transports = {};
       if ( -f $seedFile  && &yesno( 'Add installation seed file? ' ) ) {
-         print "Loading seed file $seedFile\n";
+         push @fileList, $seedFile;
-         open SEED, "<$seedFile" or die "Could not open $seedFile: $!\n";
-         $content = join( '', <SEED> );
-         close SEED;
-         # now, eval the information we just read.
-         # NOTE: we must turn off strict while doing this, and we die if something breaks.
-         no strict "vars"; eval( $content ); use strict "vars"; die "Error during eval: $@\n" if $@;
       } # if preload seed file
       if (  -f $confFile  ) {
-         print "Loading configuration file $confFile\n";
+         push @fileList, $confFile;
-         open SEED, "<$confFile" or die "Could not open $confFile: $!\n";
-         $content = join( '', <SEED> );
-         close SEED;
-         # now, eval the information we just read.
-         # NOTE: we must turn off strict while doing this, and we die if something breaks.
-         no strict "vars"; eval( $content ); use strict "vars"; die "Error during eval: $@\n" if $@;
+      }
-      $config{'clientName'} = $clientName;
-      $config{'serialNumber'} = $serialNumber;
-      $config{'hostname'} = $hostname;
-      $config{'moduleDirs'} = [ @moduleDirs ];
+      $config = makeConfig( @fileList );
-      $config{'scriptDirs'} = [ @scriptDirs ];
-      $config{'transports'} = $transports;
-      $content = &showConf( \%config );
+      my $content = &showConf( $config );
       print $content;
       print &writeConfig( $$install{'configuration'}{'configuration file'} , $content ) . "\n"
          if ( &yesno( "Write the above configuration to $$install{'configuration'}{'configuration file'}?" ) );
    } # if we are building/merging configuration
 # figure out if we know our operating system
 $os = &getOS( \%install, \%operatingSystems, $os );
 &validateLibraries( \%libraries, $os );
-die;
 $installType = &getInstallActions( \%install );
 # based on the defaults, flesh out the install hash
 $status = &populateSourceDir( \%install, $sourceDir );

Subversion Repositories camp_sysinfo_client_3

(root)/install.pl @ 44 – Rev 42 → 43