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

                   },
                   'opnsense' => {
                      'fileexists' => '/conf/config.xml',
                      'bindir' => '/usr/local/opt/camp/sysinfo-client',
                      'confdir' => '/usr/local/etc/camp/sysinfo-client',
-                     'crontab' => 'ln -fs <bindir>/sysinfo-client /etc/periodic/daily/sysinfo-client',
+                     #'crontab' => 'ln -fs <bindir>/sysinfo-client /etc/periodic/daily/sysinfo-client',
                      'modules' => '((bsd)|(unix)|(all))',
                     'default group' => 'wheel',
                     'default owner' => 'root',
                     'files' => {
-                              'YAML' => {
-                                    'type' => 'directory',
-                                    'permission' => '777',
-                                    'owner' => '<default owner>:<default group>',
-                                    'target' =>  '<bindir>'
-                                 },
-                              'Tiny.pm' => {
-                                    'type' => 'file',
-                                    'permission' => '444',
-                                    'owner' => '<default owner>:<default group>',
-                                    'target' =>  '<bindir>/YAML'
-                                 },
                               'actions_sysinfo.conf' => {
                                     'type' => 'file',
                                     'permission' => '755',
                                     'owner' => '<default owner>:<default group>',
                                     'target' => '/usr/local/opnsense/service/conf/actions.d',
 #      apt-get -y install libwww-perl
 # instead of
 #      apt-get -y install libwww-perl perl-modules
 # flexibility vs efficiency in this case.
 our %libraries = (
+                  'File::Basename' => {
+                     'debian' => {
-                  'File::Basename' => { 'debian' => 'apt-get -y install perl-modules' },
+                        'command'   => 'apt-get -y install',
+                        'parameter' => 'perl-modules'
+                     }
+                  },
+                  'Exporter' => {
+                     'debian' => {
-                  'Exporter' => { 'debian' => 'apt-get -y install perl-base' },
+                        'comand' => 'apt-get -y install',
+                        'parameter' => 'perl-base'
+                     },
+                  },
                   'LWP' => {
+                     'debian' => {
-                             'debian' => 'apt-get -y install libwww-perl',
+                        'command'   => 'apt-get -y install',
+                        'parameter' => 'libwww-perl'
+                     },
+                     'freebsd' => {
+                        'command'   => 'echo y | pkg install',
-                             'freebsd' => 'pkg install -y p5-libwww'
+                        'parameter' => 'p5-libwww'
-                           },
+                     }
+                  },
                   'YAML::Tiny' => {
+                     'debian' => {
-                              'debian' => 'apt-get -y install libyaml-tiny-perl',
+                        'command'   => 'apt-get -y install',
+                        'parameter' => 'libyaml-tiny-perl',
+                     },
+                     'freebsd' => {
-                              'freebsd' => 'echo y | pkg install p5-YAML-Tiny',
+                        'command' => 'echo y | pkg install',
+                        'parameter' => 'p5-YAML-Tiny'
+                     },
+                     'opnsense' => {
+                        'command' => 'cpan -i',
+                        'parameter' => 'YAML::Tiny'
+                     },
+                     'ipfire' => {
+                        'command' => 'cpan -i',
+                        'parameter' => 'YAML::Tiny'
+                     }
+                  },
+                  'Sys::Syslog' => {
+                     'debian' => {
-                              'opnsense' => 'gunzip Tiny.pm.gz ; mkdir YAML ; mv Tiny.pm YAML',
+                        'command' => 'apt-get -y install',
+                        'parameter' => 'libsys-syslog-perl',
+                     },
+                     'freebsd' => {
-                              'ipfire' => 'gunzip Tiny.pm.gz ; mkdir YAML ; mv Tiny.pm YAML'
+                        'command' => 'echo y | pkg install',
+                        'parameter' => 'p5-Unix-Syslog',
-                           }
+                     }
+                  }
                 );
 our %binaries = (
-                   'dmidecode' => {
+                  'dmidecode' => {
+                     'debian' => {
-                                    'debian' => 'apt-get -y install dmidecode',
+                        'command' => 'apt-get -y install',
+                        'parameter' => 'dmidecode'
+                     },
+                     'freebsd' => {
-                                    'freebsd' => 'pkg install -y dmidecode'
+                        'command' => 'echo y | pkg install',
+                        'parameter' => 'dmidecode'
+                     },
-                                  }
+                     'opnsense' => {
+                        'command' => 'echo y | pkg install',
+                        'parameter' => 'dmidecode'
+                     }
+                  }
                );
+# if subroutine &postInstall exists, it is called with a reference to the %install hash
+# postInstall may return, or may call some other script. it is the last thing called by
+# the installer
+sub postInstall {
+   my $install = shift;
+   # We need to open sysinfoconf so we can build the configuration file
+   # using eval, since the installer is responsible for loading YAML::Tiny, so we may not
+   # have it defined when we first start up.
+   eval( 'use sysinfoconf qw/&writeConfig &makeConfig &showConf/;' );
+   &logIt( 'Entering postInstall to build configuration' );
+   # seed configuration, if needed
+   if ( $$install{'build config'} ) {
+      my $config;
+      my @fileList;
+      # 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 ( -e $install->{'configuration seed file'} ) {
+         push @fileList, $install->{'configuration seed file'};
+      } # if preload seed file
+      $config = &makeConfig( @fileList );
+      # if ScriptDirs and moduleDirs not populated, do so from our configuration
+      if ( ! $$config{'scriptDirs'} || ! scalar @{ $$config{'scriptDirs'} }  ) {
+         $config->{'scriptDirs'} = [ $install->{'files'}->{'scripts'}->{'target'} ];
+      }
+      if ( ! $$config{'moduleDirs'} || ! @{ $$config{'moduleDirs'} }  ) {
+         $config->{'moduleDirs'} = [ $install->{'files'}->{'modules'}->{'target'} ];
+      }
+      # We should have a nice combined configuration, so we'll write it to a temporary file
+      my $filename = &writeConfig( '', &showConf( $config ) );
+      my $confFileName = $install{'configuration'}{'configuration file'};
+      # configure.pl is already designed to combine our temp file with our current config file and write it ou
+      # so we'll just use that instead of reinventing the wheel
+      exec( "$install{bindir}/configure.pl -f $filename -o $confFileName" );
+   } # if we are building/merging configuration
+}

Subversion Repositories camp_sysinfo_client_3

(root)/trunk/installer_config.pl @ 144 – Rev 139 → 144