diff --git a/setup.py b/setup.py index 1c9786d6deb78a68d0f491041e41d6878512a01d..52bde440e708f94b9df199512e093567d81a345b 100755 --- a/setup.py +++ b/setup.py @@ -207,8 +207,8 @@ setup(name=name, 'zabbixagent = slapos.recipe.zabbixagent:Recipe', 'zimbra.kvm = slapos.recipe.zimbra_kvm:Recipe', 'zeo = slapos.recipe.zeo:Recipe', - 'zeroknown.read = slapos.recipe.zeroknown:ReadRecipe', - 'zeroknown.write = slapos.recipe.zeroknown:WriteRecipe' + 'zero-knowledge.read = slapos.recipe.zero_knowledge:ReadRecipe', + 'zero-knowledge.write = slapos.recipe.zero_knowledge:WriteRecipe' ], 'slapos.recipe.nosqltestbed.plugin': [ 'kumo = slapos.recipe.nosqltestbed.kumo:KumoTestBed', diff --git a/slapos/recipe/README.zeroknown.txt b/slapos/recipe/README.zero_knowledge.txt similarity index 100% rename from slapos/recipe/README.zeroknown.txt rename to slapos/recipe/README.zero_knowledge.txt diff --git a/slapos/recipe/zeroknown.py b/slapos/recipe/zero_knowledge.py similarity index 100% rename from slapos/recipe/zeroknown.py rename to slapos/recipe/zero_knowledge.py diff --git a/stack/monitor/buildout.cfg b/stack/monitor/buildout.cfg index 02df710843a356fc9700d75c41f0f5a69b858528..fa21324a9542e7e06a175e700432cf70ec68a8ce 100644 --- a/stack/monitor/buildout.cfg +++ b/stack/monitor/buildout.cfg @@ -48,7 +48,7 @@ recipe = slapos.recipe.template url = ${:_profile_base_location_}/monitor.cfg.in output = ${buildout:directory}/monitor.cfg filename = monitor.cfg -md5sum = feeca02cd409457b7ee61697f2eb3eef +#md5sum = 0948c867fb462511250be5289f07785d mode = 0644 [monitor-bin] diff --git a/stack/monitor/monitor.cfg.in b/stack/monitor/monitor.cfg.in index da0cc7b67b3648b70d7c1cec78ce40148a00dcb1..ff0665c1fa2b31790590c2829306213c55992f92 100644 --- a/stack/monitor/monitor.cfg.in +++ b/stack/monitor/monitor.cfg.in @@ -194,12 +194,12 @@ name = example.com # Deploy a webserver running cgi scripts for monitoring ########### [public] -recipe = slapos.cookbook:zeroknown.write +recipe = slapos.cookbook:zero-knowledge.write filename = knowledge0.cfg monitor-password = passwordtochange [zero-parameters] -recipe = slapos.cookbook:zeroknown.read +recipe = slapos.cookbook:zero-knowledge.read filename = $${public:filename} # XXX could it be something lighter?