[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Derive hostname from directory name

2017-10-01 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/378363 )

Change subject: Derive hostname from directory name
..


Derive hostname from directory name

When multiple terminal windows with SSH sessions to different
Vagrant boxes are open, it's hard to know which is which since
the hostname (and thus the shell prompt) is so generic. Use
a hostname based on the host directory name instead.

Change-Id: If3c314be95395c09f5dea2a3e671945cf3105646
---
M Vagrantfile
M lib/mediawiki-vagrant/environment.rb
2 files changed, 10 insertions(+), 1 deletion(-)

Approvals:
  BryanDavis: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Vagrantfile b/Vagrantfile
index 6506712..b0d5154 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -49,7 +49,7 @@
 settings = mwv.load_settings
 
 Vagrant.configure('2') do |config|
-  config.vm.hostname = 'mediawiki-vagrant.dev'
+  config.vm.hostname = mwv.boxname + '.mediawiki-vagrant.dev'
   config.package.name = 'mediawiki.box'
 
   config.ssh.forward_agent = settings[:forward_agent]
diff --git a/lib/mediawiki-vagrant/environment.rb 
b/lib/mediawiki-vagrant/environment.rb
index 952b347..499d212 100644
--- a/lib/mediawiki-vagrant/environment.rb
+++ b/lib/mediawiki-vagrant/environment.rb
@@ -278,6 +278,15 @@
   end
 end
 
+# name of MWV root directory, sanitized to be usable in a domain name
+#
+# @return [String]
+#
+def boxname
+  @path.basename.to_s.downcase
+.gsub(/[^a-z0-9-]+/, '-')[0..62].gsub(/^-|-/, '')
+end
+
 private
 
 def module_path(*subpaths)

-- 
To view, visit https://gerrit.wikimedia.org/r/378363
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If3c314be95395c09f5dea2a3e671945cf3105646
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Derive hostname from directory name

2017-09-15 Thread Code Review 
Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/378363 )

Change subject: Derive hostname from directory name
..

Derive hostname from directory name

When multiple terminal windows with SSH sessions to different
Vagrant boxes are open, it's hard to know which is which since
the hostname (and thus the shell prompt) is so generic. Use
a hostname based on the host directory name instead.

Change-Id: If3c314be95395c09f5dea2a3e671945cf3105646
---
M Vagrantfile
M lib/mediawiki-vagrant/environment.rb
2 files changed, 10 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/63/378363/1

diff --git a/Vagrantfile b/Vagrantfile
index 4398c72..4c9e177 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -49,7 +49,7 @@
 settings = mwv.load_settings
 
 Vagrant.configure('2') do |config|
-  config.vm.hostname = 'mediawiki-vagrant.dev'
+  config.vm.hostname = mwv.boxname + '.mediawiki-vagrant.dev'
   config.package.name = 'mediawiki.box'
 
   config.ssh.forward_agent = settings[:forward_agent]
diff --git a/lib/mediawiki-vagrant/environment.rb 
b/lib/mediawiki-vagrant/environment.rb
index 952b347..d7f2c9c 100644
--- a/lib/mediawiki-vagrant/environment.rb
+++ b/lib/mediawiki-vagrant/environment.rb
@@ -278,6 +278,15 @@
   end
 end
 
+# name of MWV root directory, sanitized to be usable in a domain name
+#
+# @return [String]
+#
+def boxname
+  @path.basename().to_s.downcase.
+gsub(/[^a-z0-9-]+/, '-')[0..62].gsub(/^-|-/, '')
+end
+
 private
 
 def module_path(*subpaths)

-- 
To view, visit https://gerrit.wikimedia.org/r/378363
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If3c314be95395c09f5dea2a3e671945cf3105646
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits