From 1999a8eb48dd1dc912b9f96f87f6bf96dd9498b7 Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Fri, 22 Apr 2016 02:26:18 -0400
Subject: [PATCH 1/2] Ensure mosh, screen, and tmux are available

These are great tools that are even better together and make remote
administration an absolute delight.
---
 admin/init.sls | 10 ++++++++++
 top.sls        |  1 +
 2 files changed, 11 insertions(+)
 create mode 100644 admin/init.sls

diff --git a/admin/init.sls b/admin/init.sls
new file mode 100644
index 00000000..f11cf433
--- /dev/null
+++ b/admin/init.sls
@@ -0,0 +1,10 @@
+admin-packages:
+  pkg.installed:
+    - pkgs:
+      - tmux
+      {% if grains['os'] != 'MacOS' %}
+      - mosh
+      - screen # Installed by default on OS X
+      {% else %}
+      - mobile-shell
+      {% endif %}
diff --git a/top.sls b/top.sls
index 737167fd..203b2f3b 100644
--- a/top.sls
+++ b/top.sls
@@ -2,6 +2,7 @@
 
 base:
   '*':
+    - admin
     - common
     - salt.common
 

From bf74aa6f9bab26709c9913ba65ac35e9bed9da1b Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Fri, 22 Apr 2016 04:07:54 -0400
Subject: [PATCH 2/2] Make sqlite3 available for Homu debugging

---
 homu/init.sls | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/homu/init.sls b/homu/init.sls
index b901589b..be681b81 100644
--- a/homu/init.sls
+++ b/homu/init.sls
@@ -5,6 +5,11 @@ python3:
     - pkgs:
       - python3
 
+homu-debugging-packages:
+  pkg.installed:
+    - pkgs:
+      - sqlite3
+
 homu:
   virtualenv.managed:
     - name: /home/servo/homu/_venv