Skip to content
This repository was archived by the owner on Dec 2, 2020. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion data/Darwin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/mysql__config_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
4 changes: 2 additions & 2 deletions spec/defines/db_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions spec/defines/user_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion spec/fixtures/hiera/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"