peony 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f262ec4efc34944d8ffb10213889b4edd99bc900
-  data.tar.gz: 709a46b4578ffecc5283a7fe320181fb3a321969
+  metadata.gz: a2f2690dc7f3f57027f444f0dfe0350126e6c8fe
+  data.tar.gz: 4c900dfe23657197d6c40d7a133b2820d09d051a
 SHA512:
-  metadata.gz: b3e8a5eb0ff257735b9080c57edc225e5519b49592453de6639e0c76ec835d8c57ff4a06bc60a2ad3504af06e33753680609b51ff86d2e42e943c2a579a7db68
-  data.tar.gz: 0b263394882b1f72022fa79dac4740591318df2490926a912ec6988ce5a78f744d03163b3c2c1d5f16e9406c59dda58393714706a29358da3cc1a4f4737b73b7
+  metadata.gz: 0d5630993d11566de692e044066864dbc5ecfdcf01696b477d1dd8158d078f769c1699be21af9f43f9274b0306cd8178ef150bc704c2869ecb8d59a117266880
+  data.tar.gz: b171294b70532269cb07bca37bb33c04e0ea344aa25b07ae61bafed68ab553e5312388267024ebafce4042a64894c87fb88606622e71f8db51f7a2e070bd983b

data/README.md

@@ -1,6 +1,7 @@
 # Peony
 
 Local Script Management System Using Rake
+(是不是为记不住经常用的脚本和配置而烦恼！ 让Peony把你的脚本和配置记录下来。)
 
 ## Installation
 
@@ -21,7 +22,7 @@ Peony inherits from Rake, and added many useful methods for you to write rake sc
 
 If you want to run nginx server on your local server, you can add the following to your Rakefile
     
-    set :base_dir, "/opt"
+    set :base_dir, "/u"
     set_default :www_http_port, 80
     set :www_paths, {
       "/homebrew" => "/Library/Caches/Homebrew"
@@ -48,6 +49,37 @@ you can just add the following code to your Rakefile
     modules.each do|f|
       load f
     end
+    
+
+## Directory Convension
+<pre>
+
+  |--u
+    |--bin
+    |--etc
+       |--my.cnf
+       |--nginx
+       |--mongo
+       |--httpd
+       |--elasticsearch
+       |--...
+    |--share
+       |--apache-tomcat-6.0.32
+       |--php-5.3.10
+       |--...
+    |--var
+       |--data
+          |--mysql
+          |--pgsql
+          |--mongo
+          |--elasticsearch
+          |--redis
+       |--log
+       |--run
+       |--tmp
+       |--www
+</pre>
+
 
 
 ## Contributing

data/lib/peony/default.rb

@@ -3,6 +3,7 @@ set_default :var_dir, ->{"#{base_dir}/var"}
 set_default :etc_dir, ->{"#{base_dir}/etc"}
 set_default :share_dir, ->{"#{base_dir}/share"}
 set_default :run_dir, ->{"#{var_dir}/run"}
+set_default :tmp_dir, ->{"#{var_dir}/tmp"}
 set_default :log_dir, ->{"#{var_dir}/log"}
 set_default :www_dir, ->{"#{var_dir}/www"}
 set_default :data_dir, ->{"#{var_dir}/data"}

data/lib/peony/version.rb

@@ -1,3 +1,3 @@
 module Peony
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/recipes/httpd.rake

@@ -17,8 +17,8 @@ set_default :auth_user, "admin"
 namespace :httpd do 
   desc "Initialize httpd config files."
   task :init do
+    mkdir_p(httpd_etc_dir, "#{httpd_etc_dir}/extra", httpd_log_dir, webdav_dir)
     search_paths.each do|sp|
-      mkdir_p(httpd_etc_dir, "#{httpd_etc_dir}/extra", httpd_log_dir, webdav_dir)
       Dir["#{sp}/httpd/**/*.erb"].each do|fn|
         target = fn.sub("#{sp}/httpd", "#{httpd_etc_dir}").sub(/.erb$/, "")
         template(fn, target) unless File.exists?(target)

data/recipes/nginx.rake

@@ -8,6 +8,7 @@ set_default :worker_processes, 8
             
 set_default :upstreams, [
   {name: :fastcgi_server, servers: ["127.0.0.1:6666"]}, 
+  {name: :catalina_server, servers: ["127.0.0.1:8080"]}
 ]
 
 set_default :server_name, "localhost"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: peony
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - James Zhan