diff --git a/slapos/recipe/mysql/__init__.py b/slapos/recipe/mysql/__init__.py index cedae4254944afade3b78226fce7c90368327864..08a0508363eea04111361f1b71ccea8f38abd602 100644 --- a/slapos/recipe/mysql/__init__.py +++ b/slapos/recipe/mysql/__init__.py @@ -34,9 +34,6 @@ from slapos.recipe.librecipe import filehash class Recipe(GenericBaseRecipe): - def _options(self, options): - options['password'] = self.generatePassword() - def install(self): path_list = [] diff --git a/stack/lamp/buildout.cfg b/stack/lamp/buildout.cfg index 886b7db7e7636a7489c885b1c8b77b37988b1ac4..a62b8a3d6e9a6ed1711d6cf2e1ded794deace4b7 100644 --- a/stack/lamp/buildout.cfg +++ b/stack/lamp/buildout.cfg @@ -74,7 +74,7 @@ mode = 0644 recipe = slapos.recipe.template url = ${:_profile_base_location_}/apache/instance-apache-php.cfg.in output = ${buildout:directory}/instance-apache-php.cfg -md5sum = 480a7197e679dd06b666c0573211cd40 +md5sum = af0d52de4c10d5a3a64f7c92283ad959 mode = 0644 [instance-apache-import] @@ -117,7 +117,7 @@ mode = 0644 recipe = slapos.recipe.template url = ${:_profile_base_location_}/mariadb/instance-mariadb.cfg.in output = ${buildout:directory}/instance-mariadb.cfg -md5sum = b214f56ede1a9d10f243c245c804d3a5 +md5sum = c328d11f76373f8c5928afedf2178afd mode = 0644 [instance-mariadb-import] diff --git a/stack/lamp/mariadb/instance-mariadb.cfg.in b/stack/lamp/mariadb/instance-mariadb.cfg.in index 9bb6ed326383b258d4c286c4c7ac70cd0848d4af..a6944a1ba04710dfc267a60b87ddb0bd9c3b6dd9 100644 --- a/stack/lamp/mariadb/instance-mariadb.cfg.in +++ b/stack/lamp/mariadb/instance-mariadb.cfg.in @@ -194,7 +194,8 @@ recipe = slapos.cookbook:mysql # Options recovering = false user = user -port = 3306 +password = $${mysql-password:passwd} +port = 33060 ip = $${slap-network-information:local-ipv4} database = db @@ -216,6 +217,11 @@ mysql-install-binary = ${mariadb:location}/scripts/mysql_install_db mysql-upgrade-binary = ${mariadb:location}/bin/mysql_upgrade mysqld-binary = ${mariadb:location}/bin/mysqld +[mysql-password] +recipe = slapos.cookbook:generate.password +storage-path = $${rootdirectory:etc}/.passwd +bytes = 4 + #---------------- #--