diff --git a/bin/homestead b/bin/homestead index 87ce57016..3dc18e0ca 100755 --- a/bin/homestead +++ b/bin/homestead @@ -8,7 +8,7 @@ if(is_file( __DIR__.'/../vendor/autoload.php')) { require __DIR__.'/../../../autoload.php'; } -$app = new Symfony\Component\Console\Application('Laravel Homestead', '11.2.2'); +$app = new Symfony\Component\Console\Application('Laravel Homestead', '11.2.4'); $app->add(new Laravel\Homestead\MakeCommand); $app->add(new Laravel\Homestead\WslApplyFeatures); diff --git a/scripts/homestead.rb b/scripts/homestead.rb index f1c21a6c7..403bf2648 100644 --- a/scripts/homestead.rb +++ b/scripts/homestead.rb @@ -19,7 +19,7 @@ def self.configure(config, settings) config.vm.define settings['name'] ||= 'homestead' config.vm.box = settings['box'] ||= 'laravel/homestead' unless settings.has_key?('SpeakFriendAndEnter') - config.vm.box_version = settings['version'] ||= '~> 10.1.1' + config.vm.box_version = settings['version'] ||= '~> 10' end config.vm.hostname = settings['hostname'] ||= 'homestead' @@ -300,9 +300,9 @@ def self.configure(config, settings) if site['wildcard'] == 'yes' config.vm.provision 'shell' do |s| - s.name = 'Creating Wildcard Certificate: *.' + site['map'].partition('.').last + s.name = 'Creating Wildcard Certificate: *.' + site['map'] s.path = script_dir + '/create-certificate.sh' - s.args = ['*.' + site['map'].partition('.').last] + s.args = ['*.' + site['map']] end end @@ -373,23 +373,23 @@ def self.configure(config, settings) if site['use_wildcard'] != 'no' if site['type'] != 'apache' config.vm.provision 'shell' do |s| - s.inline = "sed -i \"s/$1.crt/*.$2.crt/\" /etc/nginx/sites-available/$1" - s.args = [site['map'], site['map'].partition('.').last] + s.inline = "sed -i \"s/$1.crt/*.$1.crt/\" /etc/nginx/sites-available/$1" + s.args = [site['map']] end config.vm.provision 'shell' do |s| - s.inline = "sed -i \"s/$1.key/*.$2.key/\" /etc/nginx/sites-available/$1" - s.args = [site['map'], site['map'].partition('.').last] + s.inline = "sed -i \"s/$1.key/*.$1.key/\" /etc/nginx/sites-available/$1" + s.args = [site['map']] end else config.vm.provision 'shell' do |s| - s.inline = "sed -i \"s/$1.crt/*.$2.crt/\" /etc/apache2/sites-available/$1-ssl.conf" - s.args = [site['map'], site['map'].partition('.').last] + s.inline = "sed -i \"s/$1.crt/*.$1.crt/\" /etc/apache2/sites-available/$1-ssl.conf" + s.args = [site['map']] end config.vm.provision 'shell' do |s| - s.inline = "sed -i \"s/$1.key/*.$2.key/\" /etc/apache2/sites-available/$1-ssl.conf" - s.args = [site['map'], site['map'].partition('.').last] + s.inline = "sed -i \"s/$1.key/*.$1.key/\" /etc/apache2/sites-available/$1-ssl.conf" + s.args = [site['map']] end end end