lib/util.rb in dockersitter-0.4.0 vs lib/util.rb in dockersitter-0.5.0
- old
+ new
@@ -57,11 +57,11 @@
def cert_dir
"#{proxy_dir}/ca_certs"
end
def vhost_dir
- "#{proxy_dir}/vhost.d"
+ "#{proxy_dir}/vhosts.d"
end
def config
if File.exist? "#{admin_dir}/config.yml"
YAML.load_file "#{admin_dir}/config.yml"
@@ -144,8 +144,25 @@
end
def extract_name
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