dockersitter 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b66d83198523735ec8b22316d22c0f3562573f40
-  data.tar.gz: 8428081f2e8a8f140bb3157de233e46af7a4e7c4
+  metadata.gz: ecd7654d00eb850033444a96ff9741164b1981b5
+  data.tar.gz: a7c0da589330e67c89179fa79330d85b3323cc66
 SHA512:
-  metadata.gz: 32db508f80366bf7a22f4f903c80edcffc7536ad5b586a1185cc68bc6d78f6cbe152a45aca92fa8e3ca6e0becaa9c63b0447067edabf0c617d82eb3c623ad603
-  data.tar.gz: dd3798c4870e519974e8c63290f5ebc3f53f154f32b32711a6d9d662270fffeac476efb4c122a7ecb205d6a1fdf05161fb240bf8328d670833b28fd3a4becbf4
+  metadata.gz: 56dd3526fb7ed823669cfafa3bc767728d6da621ad407f2f58ceead9740651330070ee86a4742f4c8573a53cef143ad5ff584d2fdf8ed7338246c8b7bb6e11bb
+  data.tar.gz: 741f14abc3f287116e67acb17256b86ef0fe33813f894007b8390c00f04d82e44215a2d8c0d661324fa2997b6a25ec7e41bde04eb6cd528d02e6af9ff9a954b7

data/.gitignore

@@ -2,3 +2,4 @@ Gemfile.lock
 html/
 pkg/
 vendor/cache/*.gem
+config.yml

data/bin/dockersitter

@@ -2,5 +2,4 @@
 require 'command_router'
 require 'thor'
 
-
 CommandRouter::Main.start ARGV

data/lib/commands/create.rb

@@ -40,15 +40,26 @@ class Create < Thor
     :desc => 'the volumes your data-container will mount',
     :aliases => 'v',
     :default => ["/var"]
+  option :cert,
+         :desc => "creates a ssl certificate for this app",
+         :aliases => 'c'
+  option :subdomain,
+         :desc => "the subdomain for this app",
+         :type => :string
+
   def app(app_name)
+    subdomain = options[:subdomain] ? options[:subdomain] : app_name.gsub(/\s/,"-").downcase
+    puts config[:host]
+    @domain = "#{subdomain}.#{config[:host]}"
     @app_name = app_name
-    @user_email = extract_email
-    @user_name = extract_name
+    @user_email = config[:email]
+    @user_name = config[:name]
     app_path = "#{apps_dir}/#{@app_name}"
     template "docker-compose.yml.erb","#{app_path}/docker-compose.yml"
     empty_directory "#{app_path}/administration/installation"
     empty_directory "#{app_path}/administration/hooks/backup.d"
     empty_directory "#{app_path}/administration/hooks/restore.d"
+
     template "Dockerfile.erb","#{app_path}/Dockerfile" if options[:dockerfile]
     unless options[:packages].empty?
       options[:packages].each do |package|
@@ -58,8 +69,14 @@ class Create < Thor
 
       FileUtils.ln("#{install_dir}/scriptrunner.sh", 
                    "#{app_path}/administration/scriptrunner.sh")
+      
     end
     append_to_file "#{routine_dir}/backup_routine", "docker_mgr backup_app #{app_name}"
+    create_file "#{vhost_dir}/#{app_name}"
+    if options[:cert]
+      app_cert = "#{cert_dir}/#{@domain}"
+      puts `openssl req -x509 -newkey rsa:4096 -subj '/CN=#{config[:host]}' -nodes -keyout #{app_cert}.key -out #{app_cert}.crt`
+    end
   end
   
   desc "image IMAGE_NAME","creates a new image."

data/lib/commands/init.rb

@@ -14,6 +14,8 @@ class Init < Thor::Group
     empty_directory "docker/base_images"
     directory "admin","docker/admin"
     empty_directory "docker/ci_runner"
+    empty_directory "docker/proxy/ca_certs"
+    empty_directory "docker/proxy/vhosts.d"
     puts `git init docker`
   end
 

data/lib/docker_mgr/version.rb

@@ -1,4 +1,4 @@
 module DockerMgr
   # docker_mgr version
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/lib/templates/docker-compose.yml.erb

@@ -3,7 +3,7 @@ app:
   volumes_from:
     - appdata
   environment: 
-    VIRTUAL_HOST: <%=@app_name%>.rene-richter.de
+    VIRTUAL_HOST: <%=@domain%>
     <%options[:env].each do | var |%><%=var.gsub('=',': ')%>
     <%end%>  
 appdata:

data/lib/util.rb

@@ -18,6 +18,7 @@ module DockerMgr
     end
 
 
+
     def backup_dir
       "#{root_dir}/backup" 
     end
@@ -47,6 +48,37 @@ module DockerMgr
       "#{admin_dir}/installation_scripts"
     end
 
+    def proxy_dir
+      "#{root_dir}/proxy"
+    end
+
+
+    
+    def cert_dir
+      "#{proxy_dir}/ca_certs"
+    end
+
+    def vhost_dir
+      "#{proxy_dir}/vhost.d"
+    end
+
+    def config 
+      if File.exist? "#{admin_dir}/config.yml"
+        YAML.load_file "#{admin_dir}/config.yml"
+      else
+        result = Hash.new
+        result[:email] = extract_email
+        result[:name] = extract_name
+        host = "#{result[:name].gsub(/\s/,'-').downcase}.de"
+        puts "pleas enter your host-name (#{host})"
+        choice = STDIN.gets.chomp
+        result[:host] = choice.empty? ? host : choice
+        File.write "#{admin_dir}/config.yml", result.to_yaml
+        result
+      end
+    end
+
+
     def extract_date(entry)
       /_\d+\./.match(entry).to_s.chop[1..-1].to_i
     end
@@ -98,12 +130,11 @@ module DockerMgr
 
 
     def extract_git_variable(name)
-      config = `git config --list`
-      result = config.lines.grep(/#{Regexp.quote(name)}/).map{|e| e.split('=')[1].chomp }.first
+      git_config = `git config --list`
+      result = git_config.lines.grep(/#{Regexp.quote(name)}/).map{|e| e.split('=')[1].chomp }.first
       unless result
         puts "please enter your #{name.split('.')[1]}"
         result = STDIN.gets.chomp
-        `git config --global #{name} #{result}`
       end
       result
     end

data/test.rb

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+
+require 'yaml'
+
+
+if File.exist? "config.yml"
+  config = YAML.load_file("config.yml")
+  puts config.inspect
+else
+  config = Hash.new
+  puts "pleas enter your email"
+  config[:email] = STDIN.gets.chomp
+  puts "please enter your name"
+  config[:name] = STDIN.gets.chomp
+  puts "pleas enter your host-name (leave blank if you don't have one)"
+  config[:host] = STDIN.gets.chomp
+  File.write "config.yml",config.to_yaml
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockersitter
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Rene Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-17 00:00:00.000000000 Z
+date: 2015-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -151,6 +151,7 @@ files:
 - lib/util.rb
 - spec/docker_mgr_spec.rb
 - spec/spec_helper.rb
+- test.rb
 homepage: https://rubygems.org/gems/docker-mgr
 licenses:
 - GPL