rename parameters and reorganise instance_*.cfg

setup.py

@@ -109,8 +109,8 @@ setup(name=name,
           'simplelogger = slapos.recipe.simplelogger:Recipe',
           'slaprunner = slapos.recipe.slaprunner:Recipe',
           'slapmonitor = slapos.recipe.slapmonitor:Recipe',
-	  'slapreport = slapos.recipe.slapreport:Recipe',
-	  'sshkeys_authority = slapos.recipe.sshkeys_authority:Recipe',
+          'slapreport = slapos.recipe.slapreport:Recipe',
+          'sshkeys_authority = slapos.recipe.sshkeys_authority:Recipe',
           'sshkeys_authority.request = slapos.recipe.sshkeys_authority:Request',
           'sphinx= slapos.recipe.sphinx:Recipe',
           'stunnel = slapos.recipe.stunnel:Recipe',

slapos/recipe/slapmonitor/__init__.py

@@ -25,9 +25,6 @@
 #
 ##############################################################################
 from slapos.recipe.librecipe import GenericBaseRecipe
-import binascii
-import os
-import sys
 
 class Recipe(GenericBaseRecipe):
   """
@@ -35,7 +32,6 @@ class Recipe(GenericBaseRecipe):
   """
 
   def __init__(self, buildout, name, options):
-    #options['key'] = binascii.hexlify(os.urandom(24))
     return GenericBaseRecipe.__init__(self, buildout, name, options)
 
   def install(self):

slapos/recipe/slapreport/__init__.py

@@ -25,9 +25,6 @@
 #
 ##############################################################################
 from slapos.recipe.librecipe import GenericBaseRecipe
-import binascii
-import os
-import sys
 
 class Recipe(GenericBaseRecipe):
   """
@@ -35,19 +32,18 @@ class Recipe(GenericBaseRecipe):
   """
 
   def __init__(self, buildout, name, options):
-    #options['key'] = binascii.hexlify(os.urandom(24))
     return GenericBaseRecipe.__init__(self, buildout, name, options)
 
   def install(self):
     config = dict(
       pid_file_path=self.options['pid-file'],
-      consumption_log_file=self.options['consumption-log-path'],
+      consumption_log_path=self.options['consumption-log-path'],
       database_path=self.options['database-path'],
       slapreport_path = self.options['slapreport-path'],
-      logbox_ip = self.options['log-server-ip'],
-      logbox_port = self.options['log-server-port'],
-      logbox_login = self.options['log-server-login'],
-      logbox_password = self.options['log-server-password'],
+      logbox_ip = self.options['logbox-ip'],
+      logbox_port = self.options['logbox-port'],
+      logbox_user = self.options['logbox-user'],
+      logbox_passwd = self.options['logbox-passwd'],
       shell_path=self.options['shell-path'],
     )
 

slapos/recipe/slapreport/template/slapreport_run.in

@@ -2,4 +2,4 @@
 # BEWARE: This file is operated by slapgrid
 # BEWARE: It will be overwritten automatically
 #
-exec %(slapreport_path)s %(pid_file_path)s %(consumption_log_file)s %(database_path)s %(logbox_ip)s %(logbox_port)s %(logbox_login)s %(logbox_password)s
+exec %(slapreport_path)s %(pid_file_path)s %(consumption_log_path)s %(database_path)s %(logbox_ip)s %(logbox_port)s %(logbox_user)s %(logbox_passwd)s

stack/lamp/buildout.cfg

@@ -69,7 +69,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-apache-php.cfg
 output = ${buildout:directory}/template-apache-php.cfg
-md5sum = 166cc6dc2b5b4e54ad743748a55ad94c
+md5sum = 3bdba795df03affe6a62201019b995a4 
 mode = 0644
 
 [template-apache-backup]
@@ -90,7 +90,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-mariadb.cfg
 output = ${buildout:directory}/template-mariadb.cfg
-md5sum = 8a0f5a567726b3e32f4b43b1d9bfc52c
+md5sum = ba5ebecbfe9fbb96d48f2baa43c37065  
 mode = 0644
 
 [template-mariadb-pbsready]

stack/lamp/instance-apache-php.cfg

@@ -71,12 +71,12 @@ path = $${basedirectory:services}/slapmonitor
 [slapreport]
 recipe = slapos.cookbook:slapreport
 pid-file = $${basedirectory:run}/apache.pid
-consumption-log-path = $${basedirectory:log}/instance_consumption.log
-log-server-ip = 192.168.1.139
-log-server-port = 5122
-log-server-login = admin
-log-server-password = passer
 database-path = $${basedirectory:log}/slapmonitor.db
+consumption-log-path = $${basedirectory:log}/instance_consumption.log
+logbox-ip = 87.98.152.12
+logbox-port = 5122
+logbox-user = admin
+logbox-passwd = passer
 shell-path = ${dash:location}/bin/dash
 slapreport-path = ${buildout:bin-directory}/slapreport
 path = $${basedirectory:services}/slapreport
@@ -217,3 +217,10 @@ stunnel-conf = $${rootdirectory:etc}/stunnel/
 cronstamps = $${rootdirectory:etc}/cronstamps/
 cron-entries = $${rootdirectory:etc}/cron.d/
 crontabs = $${rootdirectory:etc}/crontabs/
+
+[slap-parameter]
+#Default  value if no ssh parameters specified
+logbox-ip =
+logbox-port =
+logbox-user =
+logbox-passwd =

stack/lamp/instance-mariadb.cfg

@@ -63,11 +63,11 @@ path = $${basedirectory:services}/slapmonitor
 recipe = slapos.cookbook:slapreport
 pid-file = $${basedirectory:run}/mariadb.pid
 consumption-log-path = $${basedirectory:log}/instance_consumption.log
-log-server-ip = 192.168.1.139
-log-server-port = 5122
-log-server-login = admin
-log-server-password = passer
 database-path = $${basedirectory:log}/slapmonitor.db
+logbox-ip = 87.98.152.12
+logbox-port = 5122
+logbox-user = admin
+logbox-passwd = passer
 shell-path = ${dash:location}/bin/dash
 slapreport-path = ${buildout:bin-directory}/slapreport
 path = $${basedirectory:services}/slapreport
@@ -207,3 +207,10 @@ mariadb-data = $${rootdirectory:srv}/mariadb/
 logrotate-backup = $${basedirectory:backup}/logrotate/
 stunnel-conf = $${rootdirectory:etc}/stunnel/
 logrotate-entries = $${rootdirectory:etc}/logrotate.d/
+
+[slap-parameter]
+#Default  value if no ssh parameters specified
+logbox-ip =
+logbox-port =
+logbox-user =
+logbox-passwd =