Fix git ssh proxying

shasoco · Dec 15, 2015 · 2eee115 · 2eee115
1 parent e892d0c
commit 2eee115
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 6 deletions.
diff --git a/compose/proxy.yml b/compose/proxy.yml
@@ -14,7 +14,25 @@ proxy:
      - gitlab
      - redmine
      - vault
+    expose:
+     - 80
+     - 443
     environment:
      - DEFAULT_SSL_CERT=<%=sslcert%>
-     - TCP_PORTS=80,443,22/ssl
-     - EXCLUDE_PORTS=1936
+     - FORCE_SSL=YES
+     - TCP_PORTS=80,443
+     - EXCLUDE_PORTS=22,1936
+
+proxyssh:
+    image: tutum/haproxy:0.2.1
+    hostname: proxyssh.<%=domain%>
+    restart: always
+    links:
+     - gitlab
+    expose:
+     - 22
+    environment:
+     - TCP_PORTS=22
+     - MODE=tcp
+     - TIMEOUT=connect 30s, client 24h, server 24h
+     - EXCLUDE_PORTS=80,443,1936
diff --git a/lib/command/inspect.js b/lib/command/inspect.js
@@ -38,6 +38,7 @@ cmd.action = function(options, cb) {
         'gitSshPort',
         'sslcertselfsigned',
         'version',
+        'rootpassword',
         'adminpassword',
         'status',
         'vaultpath'

diff --git a/lib/command/prepare.js b/lib/command/prepare.js
@@ -16,7 +16,7 @@ cmd.register = function(program) {
 
 cmd.registerFull = function(program) {
     return program.arguments('<deploy-id>')
-        .option('--no-pull', 'Do not pull images');
+        .option('--pull', 'Also pull docker images');
 };
 
 cmd.action = function(options, cb) {

diff --git a/lib/metaproxy.js b/lib/metaproxy.js
@@ -35,9 +35,13 @@ metaproxy.deactivate = function(domain, cb) {
 
 metaproxy.containerConfig = function(conf) {
     var cname = mods.deploys.composeName(conf.id) + "_proxy_" + 1;
+    var cnamessh = mods.deploys.composeName(conf.id) + "_proxyssh_" + 1;
     return {
         Image: metaproxy.image,
-        Links: [ cname + ":" + cname ],
+        Links: [
+          cname + ":" + cname,
+          cnamessh + ":" + cnamessh
+        ],
         PortBindings: {
             "80/tcp":  [{ HostPort: conf.httpPort + "/tcp" }],
             "443/tcp": [{ HostPort: conf.httpsPort + "/tcp" }],
@@ -50,7 +54,7 @@ metaproxy.containerConfig = function(conf) {
         },
         Env: [
           "MODE=tcp",
-          "TIMEOUT=connect 10s, client 1h, server 1h"
+          "TIMEOUT=connect 10s, client 24h, server 24h"
         ],
         name: metaproxy.name(conf.domain)
     };

diff --git a/lib/service/proxy.js b/lib/service/proxy.js
@@ -2,5 +2,5 @@ var service = module.exports = {};
 
 service.name = "proxy";
 service.composeFile = "proxy.yml";
-service.computes = [ "proxy" ];
+service.computes = [ "proxy", "proxyssh" ];
 service.volumes = [];