dockersitter 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecd7654d00eb850033444a96ff9741164b1981b5
-  data.tar.gz: a7c0da589330e67c89179fa79330d85b3323cc66
+  metadata.gz: 9ba0a14022751c138b33fda40bea3f716aa4e045
+  data.tar.gz: 9f78b5ae483c9435530013652f052d0a4707ce6b
 SHA512:
-  metadata.gz: 56dd3526fb7ed823669cfafa3bc767728d6da621ad407f2f58ceead9740651330070ee86a4742f4c8573a53cef143ad5ff584d2fdf8ed7338246c8b7bb6e11bb
-  data.tar.gz: 741f14abc3f287116e67acb17256b86ef0fe33813f894007b8390c00f04d82e44215a2d8c0d661324fa2997b6a25ec7e41bde04eb6cd528d02e6af9ff9a954b7
+  metadata.gz: f5ade506282a7c307c477d6df4db279ecb437b68a2893b62a7bc6f1de97e499bf9f8b6d39c9585041abc6ab44fce3454a9e59abe9e16bff2b08ea5eb337e9f09
+  data.tar.gz: 9d04163d4c640f23a8195271586e2110b9f115c99c910a637d54c956ffaac4258b6968e38b82c7bd28758005325d7ae5fff25043d0ca99054b864861ee3f8840

data/lib/commands/create.rb

@@ -48,12 +48,10 @@ class Create < Thor
          :type => :string
 
   def app(app_name)
-    subdomain = options[:subdomain] ? options[:subdomain] : app_name.gsub(/\s/,"-").downcase
-    puts config[:host]
+    subdomain = options.fetch(subdomain,app_name.gsub(/\s/,"-").downcase)
     @domain = "#{subdomain}.#{config[:host]}"
     @app_name = app_name
-    @user_email = config[:email]
-    @user_name = config[:name]
+    @user_email,@user_name = config.values_at(:email,:name)
     app_path = "#{apps_dir}/#{@app_name}"
     template "docker-compose.yml.erb","#{app_path}/docker-compose.yml"
     empty_directory "#{app_path}/administration/installation"
@@ -74,8 +72,10 @@ class Create < Thor
     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`
+      FileUtils.cd "#{admin_dir}/ca" do
+	      puts "#{admin_dir}/ca/sign.sh"
+	      puts `./sign.sh #{@domain}`
+      end
     end
   end
   

data/lib/commands/init.rb

@@ -1,4 +1,5 @@
 require "thor/group"
+require 'fileutils'
 
 class Init < Thor::Group
   include Thor::Actions
@@ -14,8 +15,13 @@ 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/certs"
     empty_directory "docker/proxy/vhosts.d"
+    create_file "docker/.gitignore","**/*.key"
+    FileUtils.cd 'docker/admin/ca' do 
+      puts `openssl req -x509 -newkey rsa:4096 -keyout rootCA.key -out rootCA.crt -days 7800 -sha256`
+    end
+    chmod 'docker/admin/ca/sign.sh',755
     puts `git init docker`
   end
 

data/lib/docker_mgr/version.rb

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

data/lib/templates/add_ca.sh.erb

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+cert="$(dirname $0)/rootCA.pem"
+
+function mac {
+  sudo security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.keychain $cert
+}
+
+function linux {
+  distribution=$(find /etc/*-release -type f | xargs cat | grep  'ID' | head -n1 | awk -F'=' '{gsub(/"/,"",$2); print tolower($2)}')
+  echo $distribution
+  case $distribution in 
+    debian|ubuntu|linuxmint*|elementary*) 
+      sudo mkdir -p /usr/local/share/ca-certificates
+      sudo cp $cert /usr/local/share/ca-certificates/richterrettich.crt
+      sudo update-ca-certificates;;
+    fedora|centos) 
+      sudo cp $cert /etc/pki/ca-trust/source/anchors
+      sudo update-ca-trust;;
+  esac
+}
+
+
+case $OSTYPE in 
+  darwin*) mac
+    ;; 
+  linux-gnu*) linux
+    ;;
+esac
+
+

data/lib/templates/admin/ca/sign.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+openssl genrsa -out ${1}.key 4096
+openssl req -new -subj "/CN=$1" -nodes -sha256 -key ${1}.key -out ${1}.csr
+openssl x509 -req -in ${1}.csr -sha256 -CA rootCA.crt -CAkey rootCA.key -CAcreateserial -out ${1}.crt -days 7800
+mv ${1}.* ../../proxy/certs/

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockersitter
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Rene Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-18 00:00:00.000000000 Z
+date: 2015-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -130,6 +130,8 @@ files:
 - lib/docker_mgr.rb
 - lib/docker_mgr/version.rb
 - lib/templates/Dockerfile.erb
+- lib/templates/add_ca.sh.erb
+- lib/templates/admin/ca/sign.sh
 - lib/templates/admin/examples/postgres_backup
 - lib/templates/admin/examples/postgres_restore
 - lib/templates/admin/installation_scripts/install_derby.sh