dev-lxc 2.6.2 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfde3ab281b55c796489c6b5802be1edeba85706
-  data.tar.gz: 32c6f84b6e4b4dc77cbceeab0d02139cdae7309f
+  metadata.gz: f8e0e276b0a71f81db3d3e2c9ce69f30f248273e
+  data.tar.gz: dc862739ae2bc74fbf31cebcfabec2e908320c76
 SHA512:
-  metadata.gz: a8194fc5a89e1189271547b71b53452f8944b6bf22229d12f6b011c7ce95506d44910f87cd7a5b2e05010b6e0f30aa2a372c9aa7d73e3e3e8b1aed74f4a54cde
-  data.tar.gz: 83167ff2b66615c1e7f0e02cda05cfdf667fb8d58867f9bc88faceebfd1c3d180245ca78b26cf2144840bc3b906cea5ea4e231e614d3e6b7a2090e85a06b57f7
+  metadata.gz: 71f30ee18b6f27a0e6d1dde77024e110e6fc91f37509ae5b6f7b938472b1d1a19eef5bb72d58051313bbd99e7dfb7d15292d07ecf258d467aeba34b1ccc76871
+  data.tar.gz: ae7596695df5c5a63b876c5ccdcef354205564118aba80a3e7ae54d6754675230902b2f17dd77f4c21a63db7a85124d8e6677a6d4e97bc7d4b0ce460c7bc9f62

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # dev-lxc Change Log
 
+## 2.7.0 (2017-03-03)
+
+* Make chef-repo command only create .chef directory
+
 ## 2.6.2 (2017-02-21)
 
 * Replace unicode dash with ascii hyphen

data/README.md

@@ -37,7 +37,7 @@ Additional dev-lxc related documentation can be found in the [docs folder](docs)
 The dev-lxc tool is used in a system that has been configured by the dev-lxc-platform cookbook.
 
 The easiest way to build a dev-lxc-platform system is to download the dev-lxc-platform repository
-and use Test Kitchen to build a VirtualBox Vagrant instance or an AWS EC2 instance.
+and use Test Kitchen to build an AWS EC2 instance or a VirtualBox Vagrant instance.
 
 Follow the instructions in the [dev-lxc-platform README](https://github.com/jeremiahsnapp/dev-lxc-platform) to build
 a dev-lxc-platform instance.
@@ -54,23 +54,28 @@ sudo -i
 
 When you are logged in as the root user you should automatically enter a [byobu session](http://byobu.co/).
 
+## Byobu keybindings
+
 Byobu makes it easy to manage multiple terminal windows and panes. You can press `F1` to get help which includes a [list of keybindings](http://manpages.ubuntu.com/manpages/wily/en/man1/byobu.1.html#contenttoc8).
 
-The prefix key is set to `Ctrl+o`
+`C-` refers to the keyboard's `Control` key.
+`M-` refers to the keyboard's `Meta` key which is the `Alt` key on a PC keyboard and the `Option` key on an Apple keyboard.
+
+The prefix key is set to `C-o`
 
-Some of the keys that will be most useful to you are:
+Some of the keyboard shortcuts that will be most useful to you are:
 
-* To switch between Byobu sessions
-  * OS X - `option-Up`, `option-Down`
-  * Linux/Windows - `alt-Up`, `alt-Down`
-* To switch between windows in a session
-  * OS X - `option-Left`, `option-Right`
-  * Linux/Windows - `alt-Left`, `alt-Right`
-* To switch between panes in a window
-  * Linux/OS X/ Windows - `shift-Left`, `shift-Right`, `shift-Up`, `shift-Down`
+* `M-Up`, `M-Down` - switch between Byobu sessions
+* `M-Left`, `M-Right` - switch between windows in a session
+* `shift-Left`, `shift-Right`, `shift-Up`, `shift-Down` - switch between panes in a window
   * Windows users using Conemu must first disable "Start selection with Shift+Arrow" in "Mark/Copy" under the "Keys & Macro" settings
+* `C-o C-s` - synchronize panes
+* `C-o z` - zoom into and out of a pane
+* `C-o M-1` - evenly split panes horizontally
+* `C-o M-2` - evenly split panes vertically
+* `M-pageup`, `M-pagedown` - page up/down in scrollback
 
-Note: `Shift-F2` does not create horizontal splits for Windows users. Use the `Ctrl+o |` key binding instead.
+Note: `Shift-F2` does not create horizontal splits for Windows users. Use the `C-o |` key binding instead.
 
 ## Update dev-lxc gem
 
@@ -93,30 +98,12 @@ dev-lxc help
 dev-lxc help <subcommand>
 ```
 
-### dev-lxc Alias and Subcommands
-
-The dev-lxc command has a `dl` alias for ease of use.
-
-You only have to type enough of a `dev-lxc` subcommand to make it unique.
-
-For example, the following commands are equivalent:
-
-```
-dev-lxc status
-dl st
-```
-
-```
-dev-lxc snapshot
-dl sn
-```
-
 ### Create Base Container
 
 The [base container](docs/base_containers.md) used for the cluster's containers must be created first. Let's use Ubuntu 14.04 for the base container.
 
 ```
-dl create b-ubuntu-1404
+dev-lxc create b-ubuntu-1404
 ```
 
 ### Create Config File
@@ -135,13 +122,13 @@ The following command configures a standalone Chef Server, Supermarket server, C
 Chef Automate server, and a job dispatch runner.
 
 ```
-dl init --chef --compliance --supermarket --automate --runners -f /root/work/clusters/automate/dev-lxc.yml
+dev-lxc init --chef --compliance --supermarket --automate --runners -f /root/work/clusters/automate/dev-lxc.yml
 ```
 
 We can easily append additional configurations to this file. For example, the following command appends an infrastructure node.
 
 ```
-dl init --nodes -a -f /root/work/clusters/automate/dev-lxc.yml
+dev-lxc init --nodes -a -f /root/work/clusters/automate/dev-lxc.yml
 ```
 
 Edit the dev-lxc.yml file:
@@ -170,6 +157,24 @@ See the [usage docs](docs/usage.md) for more information about how to close/kill
 cluster-view /root/work/clusters/automate
 ```
 
+### dev-lxc Alias and Subcommands
+
+The dev-lxc command has a `dl` alias for ease of use.
+
+Also, you only have to type enough of a `dev-lxc` subcommand to make it unique.
+
+For example, the following commands are equivalent:
+
+```
+dev-lxc status
+dl st
+```
+
+```
+dev-lxc snapshot
+dl sn
+```
+
 ### Specifying a Subset of Servers
 
 Many dev-lxc subcommands can act on a subset of the cluster's servers by specifying a regular expression that matches the desired server names.
@@ -201,13 +206,11 @@ At this point all of the cluster's servers should be running.
 
 If you enabled dynamic forwarding (SOCKS v5) in your workstation's SSH config file and configured a web browser to use the SOCKS v5 proxy as described in the dev-lxc-platform README.md then you should be able to browse from your workstation to any dev-lxc server that has a web interface using its FQDN.
 
-Since the cluster has a Chef Server you can use the `chef-repo` subcommand to create a chef-repo directory in the host instance that contains a knife.rb and all of the keys for the users and org validator clients that are defined in dev-lxc.yml. This makes it very easy to use tools such as knife or berkshelf.
+Since the cluster has a Chef Server you can use the `chef-repo` subcommand to create a `.chef` directory in the host instance that contains a knife.rb and all of the keys for the users and org validator clients that are defined in dev-lxc.yml. This makes it very easy to use tools such as knife or berkshelf.
 
 ```
 dl chef
-cd chef-repo
 knife client list
-cd ..
 ```
 
 Since the cluster has a Chef Automate server you can use the `print-automate-credentials` subcommand to see what the login credentials.
@@ -230,9 +233,7 @@ Since the cluster has a Chef Server and an infrastructure node dev-lxc made sure
 
 Run `mitmproxy` in a terminal on the host instance.
 
-Uncomment the `https_proxy` line in the `chef-repo/.chef/knife.rb` or in a node's `/etc/chef/client.rb` so traffic will be proxied through mitmproxy.
-
-Run chef-client in the node or knife commands from the chef-repo directory and watch the HTTP requests appear in the mitmproxy console.
+Uncomment the `https_proxy` line in the chef-repo's `.chef/knife.rb` or in a node's `/etc/chef/client.rb` so traffic from knife commands or chef-client runs will be proxied through mitmproxy making the HTTP requests visible in the mitmproxy console.
 
 If you configured your workstation's SSH config file with LocalForward as described in dev-lxc-platform's README then you should be able to configure the web browser to use "127.0.0.1 8080" for HTTP and HTTPS proxies and watch the HTTP requests appear in the mitmproxy console.
 

data/docs/usage.md

@@ -104,7 +104,7 @@ dev-lxc print-automate-credentials
 
 ### Create chef-repo
 
-Create a local chef-repo with appropriate knife.rb and pem files.
+Create a `.chef` directory in the current directory with appropriate knife.rb and pem files.
 
 Use the `-p` option to also get pivotal.pem and pivotal.rb files.
 
@@ -117,7 +117,6 @@ dev-lxc chef-repo
 Now you can easily use knife to access the cluster.
 
 ```
-cd chef-repo
 knife client list
 ```
 

data/lib/dev-lxc/cli.rb

@@ -314,7 +314,7 @@ nodes:
       container.attach(attach_opts) { system(shell) }
     end
 
-    desc "chef-repo", "Creates a chef-repo in the current directory using files from the cluster's backend /root/chef-repo"
+    desc "chef-repo", "Creates a '.chef' directory in the current directory using files from the cluster's backend /root/chef-repo/.chef"
     option :config, :desc => "Specify a cluster's YAML config file. `./dev-lxc.yml` will be used by default"
     option :force, :aliases => "-f", :type => :boolean, :desc => "Overwrite any existing knife.rb or pivotal.rb files"
     option :pivotal, :aliases => "-p", :type => :boolean, :desc => "Also copy pivotal.rb and pivotal.pem"

data/lib/dev-lxc/cluster.rb

@@ -1092,7 +1092,7 @@ ssl_verify_mode :verify_none
 
     def chef_repo(force=false, pivotal=false)
       chef_server_dot_chef_path = "/root/chef-repo/.chef"
-      dot_chef_path = "./chef-repo/.chef"
+      dot_chef_path = ".chef"
 
       if @config['chef-server'][:bootstrap_backend]
         chef_server = get_server(@config['chef-server'][:bootstrap_backend])
@@ -1124,7 +1124,7 @@ ssl_verify_mode :verify_none
         end
       end
 
-      if File.exists?("./chef-repo/.chef/knife.rb") && ! force
+      if File.exists?("#{dot_chef_path}/knife.rb") && ! force
         puts "Skipping knife.rb because it already exists in `#{dot_chef_path}`"
       else
         create_knife_config(chef_server_fqdn, dot_chef_path)

data/lib/dev-lxc/version.rb

@@ -1,3 +1,3 @@
 module DevLXC
-  VERSION = "2.6.2"
+  VERSION = "2.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dev-lxc
 version: !ruby/object:Gem::Version
-  version: 2.6.2
+  version: 2.7.0
 platform: ruby
 authors:
 - Jeremiah Snapp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-21 00:00:00.000000000 Z
+date: 2017-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler