diff --git a/README.md b/README.md index 9103903..b9eb291 100644 --- a/README.md +++ b/README.md @@ -18,8 +18,6 @@ mysql::db { 'mydb': } ## Environment -**ATTENTION** Boxen uses a non standard **13306** port to avoid collisions. - Once installed, you can access the following variables in your environment, projects, etc: * BOXEN_MYSQL_PORT: the configured MySQL port diff --git a/data/Darwin.yaml b/data/Darwin.yaml index 4c9bc8c..ed2a9d5 100644 --- a/data/Darwin.yaml +++ b/data/Darwin.yaml @@ -10,7 +10,7 @@ mysql::servicename: "dev.mysql" mysql::user: "%{::boxen_user}" mysql::host: "127.0.0.1" -mysql::port: "13306" +mysql::port: "3306" mysql::socket: "%{::boxen::config::datadir}/socket" mysql::package: boxen/brews/mysql diff --git a/spec/classes/mysql__config_spec.rb b/spec/classes/mysql__config_spec.rb index 7af23f8..040692a 100644 --- a/spec/classes/mysql__config_spec.rb +++ b/spec/classes/mysql__config_spec.rb @@ -12,7 +12,7 @@ "executable" => "/test/boxen/homebrew/bin/mysql", "logdir" => "/test/boxen/log/mysql", "host" => "127.0.0.1", - "port" => "13306", + "port" => "3306", "socket" => "/test/boxen/sockets/mysql", "user" => "boxenuser" } diff --git a/spec/defines/db_spec.rb b/spec/defines/db_spec.rb index 24a2576..418a202 100644 --- a/spec/defines/db_spec.rb +++ b/spec/defines/db_spec.rb @@ -14,7 +14,7 @@ it "creates the database" do should contain_exec("create mysql db #{title}"). with( - :command => "/test/boxen/homebrew/bin/mysqladmin -h127.0.0.1 -uroot -p13306 create #{title} --password=''", + :command => "/test/boxen/homebrew/bin/mysqladmin -h127.0.0.1 -uroot -p3306 create #{title} --password=''", :creates => "/test/boxen/data/mysql/#{title}" ) end @@ -31,7 +31,7 @@ it "destroys the database" do should contain_exec("delete mysql db #{title}"). with( - :command => "/test/boxen/homebrew/bin/mysqladmin -h127.0.0.1 -uroot -p13306 drop #{title} --password=''" + :command => "/test/boxen/homebrew/bin/mysqladmin -h127.0.0.1 -uroot -p3306 drop #{title} --password=''" ) end end diff --git a/spec/defines/user_spec.rb b/spec/defines/user_spec.rb index c24cc3b..13d2128 100644 --- a/spec/defines/user_spec.rb +++ b/spec/defines/user_spec.rb @@ -14,7 +14,7 @@ it "creates the user" do should contain_exec("create mysql user #{title}"). with( - :command => "/test/boxen/homebrew/bin/mysql -h127.0.0.1 -uroot -p13306 --password=''\ + :command => "/test/boxen/homebrew/bin/mysql -h127.0.0.1 -uroot -p3306 --password=''\ -e \"create user '#{title}'@'localhost' identified by '';\"" ) end @@ -31,7 +31,7 @@ it "destroys the database" do should contain_exec("delete mysql user #{title}"). with( - :command => "/test/boxen/homebrew/bin/mysql -h127.0.0.1 -uroot -p13306 --password='' -e 'drop user #{title}'" + :command => "/test/boxen/homebrew/bin/mysql -h127.0.0.1 -uroot -p3306 --password='' -e 'drop user #{title}'" ) end end diff --git a/spec/fixtures/hiera/test.yaml b/spec/fixtures/hiera/test.yaml index a54a7a2..533b40a 100644 --- a/spec/fixtures/hiera/test.yaml +++ b/spec/fixtures/hiera/test.yaml @@ -7,4 +7,4 @@ mysql::executable: "/test/boxen/homebrew/bin/mysqld_safe" mysql::logdir: "/test/boxen/log/mysql" mysql::host: "127.0.0.1" -mysql::port: "13306" +mysql::port: "3306"