From 17fddf207920d259d24e47022e6123db807324dc Mon Sep 17 00:00:00 2001 From: Jean-Marie RENOUARD Date: Fri, 25 Aug 2017 11:12:10 +0200 Subject: [PATCH] Issue #341 debian credentials not overridable from commandline --- Vagrant/Vagrantfile_for_MariaDB10.2 | 107 ++++++++++++++++++++++++++++ Vagrant/Vagrantfile_for_MariaDB10.3 | 106 +++++++++++++++++++++++++++ mysqltuner.pl | 13 ++-- 3 files changed, 220 insertions(+), 6 deletions(-) create mode 100644 Vagrant/Vagrantfile_for_MariaDB10.2 create mode 100644 Vagrant/Vagrantfile_for_MariaDB10.3 diff --git a/Vagrant/Vagrantfile_for_MariaDB10.2 b/Vagrant/Vagrantfile_for_MariaDB10.2 new file mode 100644 index 0000000..650866f --- /dev/null +++ b/Vagrant/Vagrantfile_for_MariaDB10.2 @@ -0,0 +1,107 @@ +# -*- mode: ruby -*- +# vi: set ft=ruby : + +# All Vagrant configuration is done below. The "2" in Vagrant.configure +# configures the configuration version (we support older styles for +# backwards compatibility). Please don't change it unless you know what +# you're doing. +Vagrant.configure(2) do |config| + # The most common configuration options are documented and commented below. + # For a complete reference, please see the online documentation at + # https://docs.vagrantup.com. + + # Every Vagrant development environment requires a box. You can search for + # boxes at https://atlas.hashicorp.com/search. + config.vm.box = "fc23-mariadb10-1" + config.vm.box_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/23/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-23-20151030.x86_64.vagrant-virtualbox.box" + # Disable automatic box update checking. If you disable this, then + # boxes will only be checked for updates when the user runs + # `vagrant box outdated`. This is not recommended. + # config.vm.box_check_update = false + config.vbguest.auto_update = true + # Create a forwarded port mapping which allows access to a specific port + # within the machine from a port on the host machine. In the example below, + # accessing "localhost:8080" will access port 80 on the guest machine. + # config.vm.network "forwarded_port", guest: 80, host: 8080 + + # Create a private network, which allows host-only access to the machine + # using a specific IP. + # config.vm.network "private_network", ip: "192.168.0.115" + config.hostmanager.enabled = true + config.hostmanager.manage_host = true + config.hostmanager.ignore_private_ip = false + config.hostmanager.include_offline = true + + # Create a public network, which generally matched to bridged network. + # Bridged networks make the machine appear as another physical device on + # your network. + config.vm.network "public_network" + config.vm.hostname = 'dev.app' + config.hostmanager.aliases = %w(dev.app.localdomain dev.app.local) + # Share an additional folder to the guest VM. The first argument is + # the path on the host to the actual folder. The second argument is + # the path on the guest to mount the folder. And the optional third + # argument is a set of non-required options. + config.vm.synced_folder "./data", "/data" + + # Provider-specific configuration so you can fine-tune various + # backing providers for Vagrant. These expose provider-specific options. + # Example for VirtualBox: + # + config.vm.provider "virtualbox" do |vb| + # # Display the VirtualBox GUI when booting the machine + # vb.gui = false + # + # # Customize the amount of memory on the VM: + vb.memory = "1024" + end + # + # View the documentation for the provider you are using for more + # information on available options. + + # Define a Vagrant Push strategy for pushing to Atlas. Other push strategies + # such as FTP and Heroku are also available. See the documentation at + # https://docs.vagrantup.com/v2/push/atlas.html for more information. + # config.push.define "atlas" do |push| + # push.app = "YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME" + # end + + # Enable provisioning with a shell script. Additional provisioners such as + # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the + # documentation for more information about their specific syntax and use. + config.vm.provision "shell", inline: <<-SHELL + sudo yum -y update + echo "secret" | sudo passwd --stdin root + sudo cp -pr ~vagrant/.ssh /root + sudo chown -R root.root /root/.ssh + sudo yum -y install git python + sudo pip install --upgrade pip + if [ ! -d "/data/MySQLTuner-perl" ]; then + cd /data + sudo git clone https://github.com/major/MySQLTuner-perl.git + fi + + echo "# MariaDB 10.1 Fedora repository list - created 2016-01-25 13:11 UTC +# http://mariadb.org/mariadb/repositories/ +[mariadb] +name = MariaDB +baseurl = http://yum.mariadb.org/10.2/fedora23-amd64 +gpgkey=https://yum.mariadb.org/RPM-GPG-KEY-MariaDB +gpgcheck=1" >> /etc/yum.repos.d/mariadb.repo + sudo yum -y install perl-WWW-Mechanize-GZip perl-App-cpanminus perl-List-MoreUtils + sudo cpanm install File::Util + + sudo yum -y install MariaDB-server MariaDB-client wget + sudo systemctl start mariadb.service + mysql -e 'select version();' + cd /data + sudo wget "https://launchpad.net/test-db/employees-db-1/1.0.6/+download/employees_db-full-1.0.6.tar.bz2" + sudo tar xvjf employees_db-full-1.0.6.tar.bz2 + cd employees_db + cat employees.sql | mysql + cd .. + cd MySQLTuner-perl + perl mysqltuner.pl --idxstat --dbstat + SHELL + config.vm.provision :hostmanager +end diff --git a/Vagrant/Vagrantfile_for_MariaDB10.3 b/Vagrant/Vagrantfile_for_MariaDB10.3 new file mode 100644 index 0000000..0dfac2c --- /dev/null +++ b/Vagrant/Vagrantfile_for_MariaDB10.3 @@ -0,0 +1,106 @@ +# -*- mode: ruby -*- +# vi: set ft=ruby : + +# All Vagrant configuration is done below. The "2" in Vagrant.configure +# configures the configuration version (we support older styles for +# backwards compatibility). Please don't change it unless you know what +# you're doing. +Vagrant.configure(2) do |config| + # The most common configuration options are documented and commented below. + # For a complete reference, please see the online documentation at + # https://docs.vagrantup.com. + + # Every Vagrant development environment requires a box. You can search for + # boxes at https://atlas.hashicorp.com/search. + config.vm.box = "centos/7" + # Disable automatic box update checking. If you disable this, then + # boxes will only be checked for updates when the user runs + # `vagrant box outdated`. This is not recommended. + # config.vm.box_check_update = false + config.vbguest.auto_update = true + # Create a forwarded port mapping which allows access to a specific port + # within the machine from a port on the host machine. In the example below, + # accessing "localhost:8080" will access port 80 on the guest machine. + # config.vm.network "forwarded_port", guest: 80, host: 8080 + + # Create a private network, which allows host-only access to the machine + # using a specific IP. + # config.vm.network "private_network", ip: "192.168.0.115" + config.hostmanager.enabled = true + config.hostmanager.manage_host = true + config.hostmanager.ignore_private_ip = false + config.hostmanager.include_offline = true + + # Create a public network, which generally matched to bridged network. + # Bridged networks make the machine appear as another physical device on + # your network. + config.vm.network "public_network" + config.vm.hostname = 'dev.app' + config.hostmanager.aliases = %w(dev.app.localdomain dev.app.local) + # Share an additional folder to the guest VM. The first argument is + # the path on the host to the actual folder. The second argument is + # the path on the guest to mount the folder. And the optional third + # argument is a set of non-required options. + config.vm.synced_folder "./data", "/data" + + # Provider-specific configuration so you can fine-tune various + # backing providers for Vagrant. These expose provider-specific options. + # Example for VirtualBox: + # + config.vm.provider "virtualbox" do |vb| + # # Display the VirtualBox GUI when booting the machine + # vb.gui = false + # + # # Customize the amount of memory on the VM: + vb.memory = "1024" + end + # + # View the documentation for the provider you are using for more + # information on available options. + + # Define a Vagrant Push strategy for pushing to Atlas. Other push strategies + # such as FTP and Heroku are also available. See the documentation at + # https://docs.vagrantup.com/v2/push/atlas.html for more information. + # config.push.define "atlas" do |push| + # push.app = "YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME" + # end + + # Enable provisioning with a shell script. Additional provisioners such as + # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the + # documentation for more information about their specific syntax and use. + config.vm.provision "shell", inline: <<-SHELL + sudo yum -y update + echo "secret" | sudo passwd --stdin root + sudo cp -pr ~vagrant/.ssh /root + sudo chown -R root.root /root/.ssh + sudo yum -y install git python + sudo pip install --upgrade pip + if [ ! -d "/data/MySQLTuner-perl" ]; then + cd /data + sudo git clone https://github.com/major/MySQLTuner-perl.git + fi + + echo "# MariaDB 10.1 Fedora repository list - created 2016-01-25 13:11 UTC +# http://mariadb.org/mariadb/repositories/ +[mariadb] +name = MariaDB +baseurl = http://yum.mariadb.org/10.3/fedora23-amd64 +gpgkey=https://yum.mariadb.org/RPM-GPG-KEY-MariaDB +gpgcheck=1" >> /etc/yum.repos.d/mariadb.repo + sudo yum -y install perl-WWW-Mechanize-GZip perl-App-cpanminus perl-List-MoreUtils + sudo cpanm install File::Util + + sudo yum -y install MariaDB-server MariaDB-client wget + sudo systemctl start mariadb.service + mysql -e 'select version();' + cd /data + sudo wget "https://launchpad.net/test-db/employees-db-1/1.0.6/+download/employees_db-full-1.0.6.tar.bz2" + sudo tar xvjf employees_db-full-1.0.6.tar.bz2 + cd employees_db + cat employees.sql | mysql + cd .. + cd MySQLTuner-perl + perl mysqltuner.pl --idxstat --dbstat + SHELL + config.vm.provision :hostmanager +end diff --git a/mysqltuner.pl b/mysqltuner.pl index 515bb1d..84bbb8f 100755 --- a/mysqltuner.pl +++ b/mysqltuner.pl @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# mysqltuner.pl - Version 1.7.3 +# mysqltuner.pl - Version 1.7.4 # High Performance MySQL Tuning Script # Copyright (C) 2006-2017 Major Hayden - major@mhtx.net # @@ -56,7 +56,7 @@ $Data::Dumper::Pair = " : "; #use Env; # Set up a few variables for use in the script -my $tunerversion = "1.7.3"; +my $tunerversion = "1.7.4"; my ( @adjvars, @generalrec ); # Set defaults @@ -801,7 +801,7 @@ sub mysql_setup { exit 1; } } - elsif ( -r "/etc/mysql/debian.cnf" and $doremote == 0 ) { + elsif ( -r "/etc/mysql/debian.cnf" and $doremote == 0 and $opt{'defaults-file'} eq '' ) { # We have a debian maintenance account, use it $mysqllogin = "--defaults-file=/etc/mysql/debian.cnf"; @@ -813,11 +813,12 @@ sub mysql_setup { } else { badprint -"Attempted to use login credentials from debian maintenance account, but they failed."; +"Attempted to use login credentials from debian maintena +nce account, but they failed."; exit 1; } } - elsif ( $opt{'defaults-file'} ne 0 and -r "$opt{'defaults-file'}" ) { + elsif ( $opt{'defaults-file'} ne '' and -r "$opt{'defaults-file'}" ) { # defaults-file debugprint "defaults file detected: $opt{'defaults-file'}"; @@ -6123,7 +6124,7 @@ __END__ =head1 NAME - MySQLTuner 1.7.3 - MySQL High Performance Tuning Script + MySQLTuner 1.7.4 - MySQL High Performance Tuning Script =head1 IMPORTANT USAGE GUIDELINES