Open Build Service

rubygem-bender-vhng.changes Changed

rubygem-bender-vhng.spec Changed

bender-vhng-2.1.0.gem/data/lib/bender/classes/Plugins/Webserver/90-AWStats.rb Deleted

@@ -1,117 +0,0 @@
-require 'bender/classes/Plugin'
-require 'bender/tools/Templates'
-
-$pluginClass = :AWStats
-
-class AWStats < ICPlugin
-  def provision(args)
-    host = args:host
-    service = args:service
-    env = args:env
-
-    mkMandPath(host, service, env)
-    containerConfig(host, service, env)
-    hostConfig(host, service, env)
-  end
-
-  def update(args)
-    host = args:host
-    service = args:service
-    env = args:env
-
-    containerConfig(host, service, env)
-    hostConfig(host, service, env)
-  end
-
-  def maintain(args)
-    host = args:host
-    service = args:service
-    env = args:env
-
-    stats(host, service, env)
-  end
-
-  protected
-
-  def hostConfig(host, service, env)
-    basePath = baseConfig.get_entry('/ICSystemConf/BaseDir')
-    storagePath = service.host_storagePath(host)
-    logPath     = service.host_logPath(host)
-
-    data = {}
-
-    data:logfile     = File.join(logPath, service.mySvcConf('ConfigDefaults/AccessLog'))
-    data:stats_dir   = service.mySvcConf('/ServicePaths/UserSpace/StatsPath')
-    data:logfile_ext = service.mySvcConf('/AWStats/AWStatsTempFile')
-    data:stats_path  = File.join(storagePath, data:stats_dir)
-
-    data:host = host
-
-    template = File.join(bender_root, 'templates', service.serviceName, "awstats.erb")
-
-    fname = File.join(basePath, service.mySvcConf("/AWStats/AWStatsHostConfigDir"),
-        "awstats.%s.conf" % host.service.servername)
-
-    out = service.render(template, data)
-    service.write(fname, out)
-  end
-
-  def containerConfig(host, service, env)
-    basePath = baseConfig.get_entry('/ICSystemConf/BaseDir')
-    storagePath = service.containerVHostRoot(host)
-    logPath     = File.join(storagePath, service.mySvcConf('/ContainerPaths/AccessLogPath'))
-
-    data = {}
-
-    data:logfile     = File.join(logPath, service.mySvcConf('ConfigDefaults/AccessLog'))
-    data:stats_dir   = service.mySvcConf('/ServicePaths/UserSpace/StatsPath')
-    data:logfile_ext = service.mySvcConf('/AWStats/AWStatsTempFile')
-    data:stats_path  = File.join(storagePath, data:stats_dir)
-
-    data:host = host
-
-    template = File.join(bender_root, 'templates', service.serviceName, "awstats.erb")
-
-    fname = File.join(basePath, service.mySvcConf("/AWStats/AWStatsContainerConfigDir"),
-        "awstats.%s.conf" % host.service.servername)
-
-    ctFname = File.join(service.mySvcConf("/ContainerPaths/AWStatsConfigPath"),
-        "awstats.%s.conf" % host.service.servername)
-
-    env:configs:awstats_conf = {host: fname, container: ctFname}
-
-    out = service.render(template, data)
-    service.write(fname, out)
-  end
-
-  def mkMandPath(host, service, env)
-
-    basePath = baseConfig.get_entry('/ICSystemConf/BaseDir')
-    awConf = File.join(basePath, service.mySvcConf("/AWStats/AWStatsHostConfigDir"))
-    ctAwConf = File.join(basePath, service.mySvcConf("/AWStats/AWStatsContainerConfigDir"))
-
-    begin
-      SystemInterface.verifyPath(awConf, true, '0755', 'root', 'root' )
-    rescue SystemCallError => e
-      log.error("AWstats: error in adding path '#{awConf}: #{e.message}'")
-    end
-
-    begin
-      SystemInterface.verifyPath(ctAwConf, true, '0755', 'root', 'root' )
-    rescue SystemCallError => e
-      log.error("AWstats: error in adding path '#{ctAwConf}: #{e.message}'")
-    end
-  end
-
-  def stats(host, service, env)
-    awcmd = service.mySvcConf("/AWStats/AWStatsUpdate")
-    vhost = host.service.servername
-
-    if(FileTest::executable?(awcmd))
-      log.debug(" + Running AWStats Update for #{vhost}")
-      `#{awcmd} -config=#{vhost}`
-    else
-      log.warn("Unable to run AWStats Update for #{vhost}")
-    end
-  end
-end

bender-vhng-2.1.0.gem/checksums.yaml.gz -> bender-vhng-2.1.1.gem/checksums.yaml.gz Changed

bender-vhng-2.1.0.gem/data/lib/bender/classes/Plugins/Webserver/90-Logrotate.rb -> bender-vhng-2.1.1.gem/data/lib/bender/classes/Plugins/Webserver/90-Logrotate.rb Changed

@@ -22,50 +22,46 @@
           'Dec' => '12'}
 
     host = env:host
-    service = env:service 		
+    service = env:service
 
     basePath =  baseConfig.get_entry('/ICSystemConf/BaseDir')
     loghome = service.host_logPath(host)
-    
+
     arcloghome =  loghome + '/' + service.mySvcConf('/Logs/LogArchivePath') + '/'
 
 
     logs.each { |thisLog|
       logname = service.mySvcConf("/ConfigDefaults/#{thisLog}")
       filename = loghome + '/' + logname
-    
+
       if(thisLog == 'ErrorLog')
         regex = Regexp.compile('^\.{3} (.{3}) (.{2}) .{15} (.{4})\.*$')
       else
         regex = Regexp.compile('^.*?\(.{2})\/(.{3})\/(.{4}).*$')
       end
-    
+
       log.debug(" + processing log #{filename}")
       next unless(FileTest::exists?(filename))
-    
+
       FileUtils.cp(filename, filename + '.tmp')
 
       #truncate
       File.open(filename, "w+") {}
-      
-      if(thisLog == 'AccessLog')
-        FileUtils.cp(filename + '.tmp', filename + '.webstats')
-      end
-      
+
       ## dispatch lines in the appropriate log
-    
+
       File.open(filename + '.tmp', 'r') { |file |
-      
+
         file.each_line { |line |
           match = regex.match(line)
           if(thisLog == 'ErrorLog')
             outfile = "#{logname}-#{match3}#{monthsmatch1}#{match2}"
           else
             outfile = "#{logname}-#{match3}#{monthsmatch2}#{match1}"
-          end			
+          end
           open(arcloghome + '/' + outfile, 'a') { |f| f.puts line }
         }
-      }		
+      }
     }
 
     # skip today and yesterday logs
@@ -108,7 +104,7 @@
 
   def provision(env)
   end
-    
+
   def update(env)
   end

bender-vhng-2.1.0.gem/data/lib/bender/templates/webserver/apache24-compat.erb -> bender-vhng-2.1.1.gem/data/lib/bender/templates/webserver/apache24-compat.erb Changed

bender-vhng-2.1.0.gem/metadata.gz -> bender-vhng-2.1.1.gem/metadata.gz Changed

Changes of Revision 11