capistrano-froxlor 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6603d672f2bc8b30ddca9f2b128f1c79aac625a
-  data.tar.gz: 0e290f0b33fedeae91bd08e36104285c009e5bf3
+  metadata.gz: 98d79e9ff5b3ee9bf0567a506ae49f2e1c5b3273
+  data.tar.gz: b54e88440ef51b5322e7f828ab9ab5d75fb5c8fc
 SHA512:
-  metadata.gz: 089d64238decc4588007608b2682c9ff8741c8d55c9205774f5689bb39f9a481346f81aa13ee9f1dc9142b50cf3d6ccb84048f896eb51024757ebc0e390a854a
-  data.tar.gz: 1865d6f93a70dfd1af7b52889575a289928ac1f14ad7d4d0c4c7df0f2d128be5980e164808076f211dbca49b707c07a3337ed2197d6e83a111b447339759f9b6
+  metadata.gz: eea161a47cc9ef319614570e34d9c7565450372484b30ebe5b719a9672af02ec59d9a9f6be3a9e789e96684ac5612d6003427bd32e1399350327089aae6fe38c
+  data.tar.gz: 82af267615491e38c5d6dac1f90528a67182e0fff68fea0345154589a964c46f42e35918d3509ae843f46b5e5fa5c9662bf7bfeb779c3310e2daafdaafcf671c

data/LICENSE

@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Pim Snel
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+

data/README.md

@@ -1,6 +1,44 @@
 # Capistrano::Froxlor
 
-TODO: Write a gem description
+[![Gem Version](https://badge.fury.io/rb/capistrano-froxlor.svg)](http://badge.fury.io/rb/capistrano-froxlor)
+
+Add Froxlor cli functions to capistrano. This gem does not deploy Froxlor itself.
+
+# Requirements
+
+capistrano 3.x
+
+## Cap configuration
+
+```ruby
+set :frx_db_auth, 'froxlor:froxlor_db_password@localhost'
+
+set :frx_customer, 'customer_user_name'
+set :frx_domains, -> do
+  [
+    "subdomain2.parent_domain.com" => {
+      :customer => 'customer_user_name',
+      :domain_docroot => "/var/customers/webs/customer_user_name/mywebroot",
+      :openbasedir_path_home => true,
+      :sub_domain_parent => 'parent_domain.com'
+    },
+    'subdomain2.parent_domain.com' => {
+      :customer => 'customer_user_name',
+      :domain_docroot => "/var/customers/webs/customer_user_name/mywebroot",
+      :openbasedir_path_home => true,
+      :sub_domain_parent => 'parent_domain.com'
+    }
+  ]
+end
+```
+
+## Usage
+
+```bash
+cap froxlor:admin:master_cronjob     # run master cron job
+cap froxlor:customer:create_db       # create db for customer based on latest name
+cap froxlor:customer:create_domains  # create or recreate (sub)domains
+```
 
 ## Installation
 
@@ -18,9 +56,11 @@ Or install it yourself as:
 
     $ gem install capistrano-froxlor
 
-## Usage
+Add this line to your Capfile
 
-TODO: Write usage instructions here
+```ruby
+require 'capistrano/froxlor'
+```
 
 ## Contributing
 

data/lib/capistrano/froxlor/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Froxlor
-    VERSION = "0.0.1"
+    VERSION = "0.0.3"
   end
 end

data/lib/capistrano/tasks/froxlor.cap

@@ -35,14 +35,24 @@ namespace :froxlor do
         charset = "abcdefghjkmnpqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ#{'0123456789' * 5}".split(//)
         new_db_password = (0...10).map{ charset[rand(charset.size)] }.join
 
-        customer_id = capture "mysql -p#{dbpass} -u#{dbuser} -h#{dbhost} #{dbname} --execute='select customerid from panel_customers where loginname =\"userdev\";' -B -N".strip
+        customer_id = capture "mysql -p#{dbpass} -u#{dbuser} -h#{dbhost} #{dbname} --execute='select customerid from panel_customers where loginname =\"#{customer}\";' -B -N".strip
 
         execute "echo \"" \
-          "CREATE USER #{new_db_name}@localhost IDENTIFIED BY '#{new_db_password}';" \
-          "CREATE DATABASE #{new_db_name};" \
-          "GRANT ALL PRIVILEGES ON #{new_db_name}.* TO #{new_db_name};" \
-          "INSERT INTO panel_databases (customerid, databasename, description, dbserver, apsdb) VALUES (#{customer_id}, '#{new_db_name}', '#{fetch(:application)}:#{fetch(:stage).to_s} (auto created by capfroxlor)', 0, 0);" \
-          "\" | mysql  -p#{dbpass} -u#{dbuser} -h#{dbhost} #{dbname}"
+          "CREATE USER #{new_db_name}@localhost IDENTIFIED BY '#{new_db_password}';\"" \
+          "| mysql  -p#{dbpass} -u#{dbuser} -h#{dbhost} #{dbname}"
+
+        execute "echo \"" \
+          "CREATE DATABASE #{new_db_name};\"" \
+          "| mysql  -p#{dbpass} -u#{dbuser} -h#{dbhost} #{dbname}"
+
+        execute "echo \"" \
+          "GRANT ALL PRIVILEGES ON #{new_db_name}.* TO #{new_db_name};\"" \
+          "| mysql  -p#{dbpass} -u#{dbuser} -h#{dbhost} #{dbname}"
+
+        execute "echo \"" \
+          "INSERT INTO panel_databases (customerid, databasename, description, dbserver, apsdb)" \
+          "VALUES (#{customer_id}, '#{new_db_name}', '#{fetch(:application)}:#{fetch(:stage).to_s} (auto created by capfroxlor)', 0, 0);\"" \
+          "| mysql  -p#{dbpass} -u#{dbuser} -h#{dbhost} #{dbname}"
 
           open("config/deploy/#{fetch(:stage).to_s}.rb", 'a') { |f|
             f.puts "### ----- ALERT"
@@ -59,7 +69,6 @@ namespace :froxlor do
     task :create_domains do
       on roles(:all) do
 
-
         run_master_job=false
 
         customer = fetch(:frx_customer)
@@ -69,7 +78,7 @@ namespace :froxlor do
         dbpass = dbcon[1].split('@')[0]
         dbhost = dbcon[1].split('@')[1]
 
-        customer_id = capture "mysql -p#{dbpass} -u#{dbuser} -h#{dbhost} #{dbname} --execute='select customerid from panel_customers where loginname =\"userdev\";' -B -N".strip
+        customer_id = capture "mysql -p#{dbpass} -u#{dbuser} -h#{dbhost} #{dbname} --execute='select customerid from panel_customers where loginname =\"#{customer}\";' -B -N".strip
 
         fetch(:frx_domains).each do |dom|
           dom.each do | dname,dsettings|
@@ -100,7 +109,7 @@ namespace :froxlor do
                 if new_dom_id.to_i > 0
                   #update
                   run_master_job = true
-                  sql = "UPDATE panel_domains SET domain=\"#{dname}\", customerid = #{customer_id.to_i}, documentroot=\"#{dsettings[:domain_docroot]}\" WHERE id = #{new_dom_id}"
+                  sql = "UPDATE panel_domains SET domain=\"#{dname}\", customerid = #{customer_id.to_i}, documentroot=\"#{dsettings[:domain_docroot]}\", ipandport = #{fetch(:frx_ip_and_port)} WHERE id = #{new_dom_id}"
                 else
                   run_master_job = true
                   sql = "INSERT INTO panel_domains ("\
@@ -109,7 +118,7 @@ namespace :froxlor do
                     " wwwserveralias, parentdomainid, openbasedir, openbasedir_path, speciallogfile, specialsettings,"\
                     " deactivated, bindserial, add_date, registration_date, phpsettingid, mod_fcgid_starter, mod_fcgid_maxrequests, ismainbutsubto)  " \
                     " VALUES " \
-                    "(\"#{dname}\", 0, #{customer_id.to_i}, NULL, \"#{dsettings[:domain_docroot]}\", 2, 0, 0,"\
+                    "(\"#{dname}\", 0, #{customer_id.to_i}, NULL, \"#{dsettings[:domain_docroot]}\", #{fetch(:frx_ip_and_port)}, 0, 0,"\
                     " 0, 0, 0, 1, \"\", 0, 0, \"\", \"\","\
                     " 1, #{parent_dom_id}, 0, 1, 0, \"\","\
                     " 0, \"2000010100\", 0, \"0000-00-00\", 1, -1, -1, 0);"

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-froxlor
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Pim Snel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2014-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 description: Add Froxlor cli functions to capistrano. This gem does not deploy Froxlor
@@ -46,8 +46,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
+- LICENSE
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -65,17 +66,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Froxlor cli functionality for capistrano 3