diff options
| author | mh <mh@immerda.ch> | 2008-07-14 21:25:49 +0000 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2008-07-14 21:25:49 +0000 |
| commit | 741a6ba1f6ae8491e1abc8814b2af1e2ab3df089 (patch) | |
| tree | 393c80f6c48a909ff46e5f4f3e8ee12a4d116227 | |
| parent | 495fad450d0b9748593fa1e5aadd4c848a79c81d (diff) | |
merged with immerda, added data directory to be default
| -rw-r--r-- | files/backup/mysql_backup.cron | 2 | ||||
| -rw-r--r-- | files/config/CentOS/setmysqlpass.sh | 2 | ||||
| -rw-r--r-- | files/config/my.cnf.CentOS | 2 | ||||
| -rw-r--r-- | manifests/init.pp | 7 |
4 files changed, 10 insertions, 3 deletions
diff --git a/files/backup/mysql_backup.cron b/files/backup/mysql_backup.cron index fed14fb..388f8ea 100644 --- a/files/backup/mysql_backup.cron +++ b/files/backup/mysql_backup.cron @@ -1 +1 @@ -00 01 * * * root /usr/bin/mysqldump --all-databases --all | gzip > /var/lib/mysql/mysqldump.sql.gz && chmod 600 /var/lib/mysql/mysqldump.sql.gz +00 01 * * * root /usr/bin/mysqldump --all-databases --all | gzip > /var/lib/mysql/data/mysqldump.sql.gz && chmod 600 /var/lib/mysql/data/mysqldump.sql.gz diff --git a/files/config/CentOS/setmysqlpass.sh b/files/config/CentOS/setmysqlpass.sh index ec53584..d762a20 100644 --- a/files/config/CentOS/setmysqlpass.sh +++ b/files/config/CentOS/setmysqlpass.sh @@ -4,7 +4,7 @@ test $# -gt 0 || exit 1 /sbin/service mysqld stop -/usr/libexec/mysqld --skip-grant-tables --user=root --datadir=/var/lib/mysql --log-bin=/var/lib/mysql/mysql-bin & +/usr/libexec/mysqld --skip-grant-tables --user=root --datadir=/var/lib/mysql/data --log-bin=/var/lib/mysql/mysql-bin & sleep 5 echo "USE mysql; UPDATE user SET Password=PASSWORD('$1') WHERE User='root' AND Host='localhost';" | mysql -u root killall mysqld diff --git a/files/config/my.cnf.CentOS b/files/config/my.cnf.CentOS index ac58098..2bc6884 100644 --- a/files/config/my.cnf.CentOS +++ b/files/config/my.cnf.CentOS @@ -1,5 +1,5 @@ [mysqld] -datadir=/var/lib/mysql +datadir=/var/lib/mysql/data log-bin=/var/lib/mysql/mysql-bin socket=/var/lib/mysql/mysql.sock # Default to using old password format for compatibility with mysql 3.x diff --git a/manifests/init.pp b/manifests/init.pp index 7c6ca71..1058310 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -50,6 +50,13 @@ class mysql::server::base { owner => root, group => 0, mode => 0644; } + file{'/var/lib/mysql/data': + ensure => directory, + require => Package[mysql-server], + before => Service[mysql], + owner => mysql, group => mysql, mode => 0755; + } + case $mysql_rootpw { '': { fail("You need to define a mysql root password! Please set \$mysql_rootpw in your site.pp or host config") } } |