dockersitter 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ba0a14022751c138b33fda40bea3f716aa4e045
-  data.tar.gz: 9f78b5ae483c9435530013652f052d0a4707ce6b
+  metadata.gz: 89d3334696ea7dc741c3ca772685124f79c33655
+  data.tar.gz: e936e5a47c0017cb200e0a1dd980900973fca9e4
 SHA512:
-  metadata.gz: f5ade506282a7c307c477d6df4db279ecb437b68a2893b62a7bc6f1de97e499bf9f8b6d39c9585041abc6ab44fce3454a9e59abe9e16bff2b08ea5eb337e9f09
-  data.tar.gz: 9d04163d4c640f23a8195271586e2110b9f115c99c910a637d54c956ffaac4258b6968e38b82c7bd28758005325d7ae5fff25043d0ca99054b864861ee3f8840
+  metadata.gz: d2c4e9b173621119953d35078898be6b827b39d5ea06f2049f5b466ddde18952fcab0f450864da0f75ba73529cfe3813c8309f231877b5b26048eaa87b8fae31
+  data.tar.gz: 89d05cd37919da618b2982209c4ab7756a77ae596f050b6890be7bfeda0eb717a8d2dc8b668aa5d6135b1cc52ee8ed2ba2fceb652917861ae07a1a3cd69bb054

data/gemspec.yml

@@ -8,7 +8,7 @@ homepage: https://rubygems.org/gems/docker-mgr
 
 development_dependencies:
   bundler: ~> 1.0
-  rake: ~> 0.8
+  rake: ~> 10.4
   rdoc: ~> 3.0
   rspec: ~> 2.4
   rubygems-tasks: ~> 0.2

data/lib/commands/init.rb

@@ -1,8 +1,10 @@
 require "thor/group"
 require 'fileutils'
+require 'util'
 
 class Init < Thor::Group
   include Thor::Actions
+  include DockerMgr::Util
     
   def self.source_root
     File.expand_path('../templates',__dir__)
@@ -17,12 +19,17 @@ class Init < Thor::Group
     empty_directory "docker/ci_runner"
     empty_directory "docker/proxy/certs"
     empty_directory "docker/proxy/vhosts.d"
-    create_file "docker/.gitignore","**/*.key"
+    copy_file "gitignore","docker/.gitignore"
     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
+    chmod 'docker/admin/ca/rootCA.key',0600
+    chmod 'docker/admin/ca/sign.sh',0755
     puts `git init docker`
+    FileUtils.cd 'docker' do 
+      puts FileUtils.pwd
+      generate_ca_installer
+    end
   end
 
 end

data/lib/docker_mgr/version.rb

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

data/lib/templates/gitignore

@@ -0,0 +1,3 @@
+**/*.key
+**/*.tar*
+

data/lib/templates/install_certificate/add_ca.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+cert="$(dirname $0)/rootCA.crt"
+
+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*) 
+      echo "hier"
+      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/util.rb

@@ -59,7 +59,7 @@ module DockerMgr
     end
 
     def vhost_dir
-      "#{proxy_dir}/vhost.d"
+      "#{proxy_dir}/vhosts.d"
     end
 
     def config 
@@ -147,5 +147,22 @@ module DockerMgr
       extract_git_variable("user.name")
     end
 
+    def generate_ca_installer
+      directory "install_certificate","#{root_dir}/install_certificate"
+      FileUtils.cp "#{admin_dir}/ca/rootCA.crt","install_certificate"
+      package_tar "install_certificate"
+      FileUtils.rm_rf "install_certificate"
+    end
+
+    def package_tar(dir_name,current_dir = nil)
+      if current_dir
+        `tar -cf #{dir_name}.tar -C #{current_dir} #{dir_name}` 
+      else
+        `tar -cf #{dir_name}.tar #{dir_name}` 
+      end
+    end
+
+
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockersitter
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Rene Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -117,6 +117,7 @@ files:
 - bin/dockersitter
 - docker_mgr.gemspec
 - gemspec.yml
+- install_certificate.tar
 - lib/command_router.rb
 - lib/commands/backup_app.rb
 - lib/commands/config.rb
@@ -149,6 +150,8 @@ files:
 - lib/templates/before_all_restore.erb
 - lib/templates/build.erb
 - lib/templates/docker-compose.yml.erb
+- lib/templates/gitignore
+- lib/templates/install_certificate/add_ca.sh
 - lib/templates/restore.erb
 - lib/util.rb
 - spec/docker_mgr_spec.rb