From ebc41698cdb486414a66ebdba56a2a9a4a5de1fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= <cedric.dsm@tiolive.com>
Date: Tue, 6 Sep 2011 16:04:18 +0200
Subject: [PATCH] Rename osoeslaptraining recipe to lamp

---
 setup.py                                                  | 8 ++++----
 slapos/recipe/{osoeslaptraining => lamp}/__init__.py      | 0
 slapos/recipe/{osoeslaptraining => lamp}/apache.py        | 0
 slapos/recipe/{osoeslaptraining => lamp}/mysql.py         | 0
 .../recipe/{osoeslaptraining => lamp}/template/apache.in  | 0
 .../recipe/{osoeslaptraining => lamp}/template/my.cnf.in  | 0
 .../{osoeslaptraining => lamp}/template/mysqlinit.sql.in  | 0
 .../recipe/{osoeslaptraining => lamp}/template/php.ini.in | 0
 software/lamp-template-static/software.cfg                | 2 +-
 software/lamp-template/software.cfg                       | 2 +-
 software/phpmyadmin/software.cfg                          | 2 +-
 software/wordpress/software.cfg                           | 2 +-
 12 files changed, 8 insertions(+), 8 deletions(-)
 rename slapos/recipe/{osoeslaptraining => lamp}/__init__.py (100%)
 rename slapos/recipe/{osoeslaptraining => lamp}/apache.py (100%)
 rename slapos/recipe/{osoeslaptraining => lamp}/mysql.py (100%)
 rename slapos/recipe/{osoeslaptraining => lamp}/template/apache.in (100%)
 rename slapos/recipe/{osoeslaptraining => lamp}/template/my.cnf.in (100%)
 rename slapos/recipe/{osoeslaptraining => lamp}/template/mysqlinit.sql.in (100%)
 rename slapos/recipe/{osoeslaptraining => lamp}/template/php.ini.in (100%)

diff --git a/setup.py b/setup.py
index 7b33d3b39..4bc6b56c9 100644
--- a/setup.py
+++ b/setup.py
@@ -52,10 +52,10 @@ setup(name=name,
           'mysql = slapos.recipe.mysql:Recipe',
           'nbdserver = slapos.recipe.nbdserver:Recipe',
           'nosqltestbed = slapos.recipe.nosqltestbed:NoSQLTestBed',
-          'osoeslaptraining = slapos.recipe.osoeslaptraining:Request',
-          'osoeslaptraining.request = slapos.recipe.osoeslaptraining:Request',
-          'osoeslaptraining.static = slapos.recipe.osoeslaptraining:Static',
-          'osoeslaptraining.simple = slapos.recipe.osoeslaptraining:Simple',
+          'lamp = slapos.recipe.lamp:Request',
+          'lamp.request = slapos.recipe.lamp:Request',
+          'lamp.static = slapos.recipe.lamp:Static',
+          'lamp.simple = slapos.recipe.lamp:Simple',
           'proactive = slapos.recipe.proactive:Recipe',
           'sheepdogtestbed = slapos.recipe.sheepdogtestbed:SheepDogTestBed',
           'siptester = slapos.recipe.siptester:SipTesterRecipe',
diff --git a/slapos/recipe/osoeslaptraining/__init__.py b/slapos/recipe/lamp/__init__.py
similarity index 100%
rename from slapos/recipe/osoeslaptraining/__init__.py
rename to slapos/recipe/lamp/__init__.py
diff --git a/slapos/recipe/osoeslaptraining/apache.py b/slapos/recipe/lamp/apache.py
similarity index 100%
rename from slapos/recipe/osoeslaptraining/apache.py
rename to slapos/recipe/lamp/apache.py
diff --git a/slapos/recipe/osoeslaptraining/mysql.py b/slapos/recipe/lamp/mysql.py
similarity index 100%
rename from slapos/recipe/osoeslaptraining/mysql.py
rename to slapos/recipe/lamp/mysql.py
diff --git a/slapos/recipe/osoeslaptraining/template/apache.in b/slapos/recipe/lamp/template/apache.in
similarity index 100%
rename from slapos/recipe/osoeslaptraining/template/apache.in
rename to slapos/recipe/lamp/template/apache.in
diff --git a/slapos/recipe/osoeslaptraining/template/my.cnf.in b/slapos/recipe/lamp/template/my.cnf.in
similarity index 100%
rename from slapos/recipe/osoeslaptraining/template/my.cnf.in
rename to slapos/recipe/lamp/template/my.cnf.in
diff --git a/slapos/recipe/osoeslaptraining/template/mysqlinit.sql.in b/slapos/recipe/lamp/template/mysqlinit.sql.in
similarity index 100%
rename from slapos/recipe/osoeslaptraining/template/mysqlinit.sql.in
rename to slapos/recipe/lamp/template/mysqlinit.sql.in
diff --git a/slapos/recipe/osoeslaptraining/template/php.ini.in b/slapos/recipe/lamp/template/php.ini.in
similarity index 100%
rename from slapos/recipe/osoeslaptraining/template/php.ini.in
rename to slapos/recipe/lamp/template/php.ini.in
diff --git a/software/lamp-template-static/software.cfg b/software/lamp-template-static/software.cfg
index 4e6310dfe..dcf92258e 100644
--- a/software/lamp-template-static/software.cfg
+++ b/software/lamp-template-static/software.cfg
@@ -22,7 +22,7 @@ url = Student shall put here url of zipped or tarballed web page or application
 
 [instance-recipe]
 egg = slapos.cookbook
-module = osoeslaptraining.static
+module = lamp.static
 
 [template]
 # Default template for the instance.
diff --git a/software/lamp-template/software.cfg b/software/lamp-template/software.cfg
index df63edada..bf173d634 100644
--- a/software/lamp-template/software.cfg
+++ b/software/lamp-template/software.cfg
@@ -34,7 +34,7 @@ location = Student shall put here relative path to application top level directo
   
 [instance-recipe]
 egg = slapos.cookbook
-module = osoeslaptraining.simple
+module = lamp.simple
 
 [template]
 # Default template for the instance.
diff --git a/software/phpmyadmin/software.cfg b/software/phpmyadmin/software.cfg
index 4791f1270..22a17ba00 100644
--- a/software/phpmyadmin/software.cfg
+++ b/software/phpmyadmin/software.cfg
@@ -39,7 +39,7 @@ location = config.inc.php
 
 [instance-recipe]
 egg = slapos.cookbook
-module = osoeslaptraining.simple
+module = lamp.simple
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
diff --git a/software/wordpress/software.cfg b/software/wordpress/software.cfg
index 3a68fa504..59831f861 100644
--- a/software/wordpress/software.cfg
+++ b/software/wordpress/software.cfg
@@ -30,7 +30,7 @@ location = wp-config.php
   
 [instance-recipe]
 egg = slapos.cookbook
-module = osoeslaptraining.request
+module = lamp.request
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-- 
2.30.9