superhosting 0.0.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2ZhNTc2Yjg3MjdlM2M5ZTgzYzNiYWYwMmMyNDA5MTZjMDQ4NzQzZA==
+    ZGMyNGQ5ODc3NTdhMGFjMGM4MzFjYjA2YjJiNGRmZjFlODg0NzBiNg==
   data.tar.gz: !binary |-
-    ZDMwZmM4ZTQ1NzhiMWRmNTM2Y2I3MGQ5NjZjNWJkZjM0Yjk3OTA1NA==
+    ZjQwNDM5NzRjOWQzMTY2OGJiNGE2MWVkODI5NzlhOTJjMGYyYzg2OA==
 SHA512:
   metadata.gz: !binary |-
-    MGUxMWE4ODlkMjJkZDFmNjU3YmVmZjJmZWJkMzNhZmU1MTNhYTY3ZDY0ZDdj
-    MjEyNmM1ZTgxOGNmYWZhMzY3YzkxODlkMTkzYjVjMDUzZWExMjUyZTdiYzI5
-    MTdjOTY0NzIwMGY0MzNiZDE2OTY3ZDA5MmM3OTBlMmE5ZjQ2ZjU=
+    MWM1NGU5N2NlNWViNzEyZmNkZTQ0YTNlNDA2YTg4MTkxNGYwZDFlNTcxYWUy
+    NDI5NjIzODIzNDI1ODFmMGZiOGQxYTUxZGIwNGJkYzc0MjY5Y2YwZjRiNDMw
+    MjU1YzI2NWM4MTJhZDFjODQxYTQ1MDExYjg2NGQ3Mzk3MzA2NDM=
   data.tar.gz: !binary |-
-    MTdmNDg1NDNiY2RjYjYwOTQzNjQ2N2FiNDk5YzE2OTUyN2NmYmE2MGM1NGNm
-    ZWJlNzNlODAwNjM2YTQxN2UxYmUwZWZjYTE3N2M1N2E4OTY5YzA0ZjhhMWYy
-    N2ZlNmM2ODM5ZGNiNzRjMWFhNTliZjZjNGM3YzAzYjc5OTNlNjU=
+    YWVlZGVlODE1ZjZjNjZkNjNkYTA2MTAxYTFkOTE0ZDk3Y2MyY2M5YjlkNzcy
+    NDA2Nzk1MzJiMzQ4OTMzZmZkZjljNDk0ZTgwN2Y0ZWQwY2Y0OTY1ZWZmZGMy
+    NDgyYTAxYjg4NGQ5NjczNTEwYjg4ZGQxMjdhNjQ5ZjE4ZTljZGQ=

data/.gitignore

@@ -8,3 +8,4 @@
 /tmp/
 .idea
 /.vagrant
+.tags

data/.travis.yml

@@ -1,6 +1,19 @@
+dist: trusty
+sudo: required
+cache: apt
 language: ruby
 rvm:
 - 2.2.1
+services:
+- docker
+
+before_script:
+- sudo -s source provision/docker.sh
+- sudo -s source provision/pam_docker.sh
+- sudo -s source provision/bootstrap.sh
+script:
+- sudo -E su --preserve-environment -lc 'bundle exec rake spec'
+
 deploy:
   provider: rubygems
   api_key:

data/Gemfile.lock

@@ -1,38 +1,58 @@
 GIT
   remote: https://github.com/flant/net_status.git
-  revision: 50e9cceac16a288f9ffa396c070b2bbfe5f9d01d
+  revision: 5a91caf2daaa74985699ede3bc5a9f8ac60a71d8
   specs:
     net_status (0.0.2)
+      i18n (~> 0.7)
 
 GIT
   remote: https://github.com/flant/path_mapper.git
-  revision: 03d57883e9db7eeb46ef361b3c54002f86b78cd6
+  revision: c307e19264f814041d6f00b0732c51d11708791a
   specs:
     path_mapper (0.0.2)
+      diffy (~> 3.1)
 
 PATH
   remote: .
   specs:
-    superhosting (0.0.1)
+    superhosting (0.0.2)
+      activesupport (~> 4.2, >= 4.2.5.2)
+      highline (~> 1.7, >= 1.7.8)
+      i18n (~> 0.7)
       mixlib-cli (>= 1.5.0, < 2.0)
       mixlib-shellout (>= 2.2.6, < 3.0)
       net_status (>= 0.0.1, < 1.0)
       path_mapper (>= 0.0.1, < 1.0)
+      polling (~> 0.1.5)
+      punycode4r (~> 0.2)
+      strong_password (~> 0.0.5)
+      unicode (~> 0.4)
+      unix-crypt (~> 1.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (4.2.6)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
     addressable (2.4.0)
     backports (3.6.8)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    byebug (8.2.2)
+    byebug (8.2.4)
+    codeclimate-test-reporter (0.5.0)
+      simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.1)
     debug_inspector (0.0.2)
     diff-lcs (1.2.5)
+    diffy (3.1.0)
+    docile (1.1.5)
     ethon (0.8.1)
       ffi (>= 1.3.0)
-    excon (0.47.0)
+    excon (0.49.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.10.0)
@@ -46,16 +66,19 @@ GEM
       net-http-persistent (>= 2.7)
       net-http-pipeline
     highline (1.7.8)
+    i18n (0.7.0)
     json (1.8.3)
     launchy (2.4.3)
       addressable (~> 2.3)
     method_source (0.8.2)
+    minitest (5.8.4)
     mixlib-cli (1.5.0)
     mixlib-shellout (2.2.6)
     multi_json (1.11.2)
     multipart-post (2.0.0)
     net-http-persistent (2.9.4)
     net-http-pipeline (1.0.1)
+    polling (0.1.5)
     pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -66,6 +89,7 @@ GEM
     pry-stack_explorer (0.4.9.2)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
+    punycode4r (0.2.0)
     pusher-client (0.6.2)
       json
       websocket (~> 1.0)
@@ -74,7 +98,7 @@ GEM
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
       rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.3)
+    rspec-core (3.4.4)
       rspec-support (~> 3.4.0)
     rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -83,7 +107,14 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
+    simplecov (0.11.2)
+      docile (~> 1.1.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
     slop (3.6.0)
+    strong_password (0.0.5)
+    thread_safe (0.3.5)
     travis (1.8.2)
       backports
       faraday (~> 0.9)
@@ -95,13 +126,18 @@ GEM
       typhoeus (~> 0.6, >= 0.6.8)
     typhoeus (0.8.0)
       ethon (>= 0.8.0)
-    websocket (1.2.2)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    unicode (0.4.4.2)
+    unix-crypt (1.3.0)
+    websocket (1.2.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 1.7)
+  codeclimate-test-reporter (>= 0.5.0, < 1.0)
   excon (>= 0.45.4, < 1.0)
   net_status!
   path_mapper!

data/LICENSE.txt

@@ -1,4 +1,7 @@
-Copyright (c) 2016 Alexey Igrychev
+Copyright (c) 2016 Dmitry Stolyarov <dmitry.stolyarov@flant.com>
+Copyright (c) 2016 Alexey Igrychev <alexey.igrychev@flant.com>
+Copyright (c) 2016 Timofey Kirillov <timofey.kirillov@flant.com>
+Copyright (c) 2016 Flant CJSC
 
 MIT License
 

data/Vagrantfile

@@ -2,9 +2,12 @@
 # vi: set ft=ruby :
 # vi: set sts=2 ts=2 sw=2 :
 
-VAGRANTFILE_API_VERSION = "2"
+VAGRANTFILE_API_VERSION = '2'
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = "ubuntu/trusty64"
-  config.vm.provision :shell, path: "bootstrap.sh"
+  config.vm.box = 'ubuntu/trusty64'
+  config.vm.provision :shell, path: 'provision/vagrant.sh'
+  config.vm.provision :shell, path: 'provision/docker.sh', args: '/vagrant'
+  config.vm.provision :shell, path: 'provision/pam_docker.sh'
+  config.vm.provision :shell, path: 'provision/bootstrap.sh', args: '/vagrant'
 end

data/bin/sx

@@ -4,7 +4,11 @@ require 'superhosting'
 
 begin
   Superhosting::Cli::Base.start(ARGV)
-rescue Superhosting::Cli::Error::Base => e
-  $stderr.puts([e.net_status[:error], e.net_status[:message]].compact.join(': '))
+rescue NetStatus::Exception => e
+  net_status = e.net_status.net_status_normalize
+  $stderr.puts(net_status[:message] || [net_status[:error], net_status[:code]].compact.join(": "))
+  exit 1
+rescue Interrupt => e
+  $stderr.puts('Interrupted')
   exit 1
 end

data/bootstrap/etc/sx/default_model

@@ -0,0 +1 @@
+fcgi_m

data/bootstrap/etc/sx/models/base/container/docker/command

@@ -0,0 +1 @@
+/bin/bash -lec 'while true ; do date ; sleep 1; done'

data/bootstrap/etc/sx/models/base/container/docker/user.erb

@@ -0,0 +1 @@
+<%= container.name %>:<%= container.name %>

data/bootstrap/etc/sx/models/base/container/docker/volume.erb

@@ -0,0 +1,2 @@
+<%= container.config.path %>/:/.config:ro
+<%= container.lib.web.path %>:<%= container.web.path %>

data/bootstrap/etc/sx/models/bitrix_l/inherit

@@ -0,0 +1,3 @@
+base
+common_bitrix
+common_php_l

data/bootstrap/etc/sx/models/bitrix_m/inherit

@@ -0,0 +1,3 @@
+base
+common_bitrix
+common_php_m

data/bootstrap/etc/sx/models/bitrix_xl/inherit

@@ -0,0 +1,3 @@
+base
+common_bitrix
+common_php_xl

data/bootstrap/etc/sx/models/common_bitrix/abstract

@@ -0,0 +1 @@
+yes

data/bootstrap/etc/sx/models/common_bitrix/container/mux

@@ -0,0 +1 @@
+php-5.5

data/bootstrap/etc/sx/models/common_bitrix/inherit

@@ -0,0 +1 @@
+common_mail

data/bootstrap/etc/sx/models/common_bitrix/site/php/admin_value

@@ -0,0 +1,2 @@
+mbstring.func_overload = 2
+realpath_cache_size = 4096k

data/bootstrap/etc/sx/models/common_bitrix/site/php/flag

@@ -0,0 +1 @@
+display_errors = On

data/bootstrap/etc/sx/models/common_bitrix/site/php/value

@@ -0,0 +1,6 @@
+mbstring.internal_encoding = UTF-8
+post_max_size = 256M
+upload_max_filesize = 256M
+max_file_uploads = 30
+default_socket_timeout = 120
+date.timezone = Europe/Moscow

data/bootstrap/etc/sx/models/common_fcgi/abstract

@@ -0,0 +1 @@
+yes

data/bootstrap/etc/sx/models/common_fcgi/container/config.rb

@@ -0,0 +1,6 @@
+config "#{container.config.path}/supervisor/supervisord.conf"
+
+mkdir "#{container.web.path}/supervisor"
+mkdir "#{container.web.path}/logs/supervisor"
+
+on_reconfig :container_restart

data/bootstrap/etc/sx/models/common_fcgi/container/config_templates/supervisord.conf.erb

@@ -0,0 +1,16 @@
+[unix_http_server]
+file=/web/<%= container.name %>/supervisor.sock
+chmod=0770
+
+[supervisord]
+logfile=/web/<%= container.name %>/logs/supervisord.log
+childlogdir=/web/<%= container.name %>/supervisor
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[supervisorctl]
+serverurl=unix:///web/<%= container.name %>/supervisor.sock
+
+[include]
+files = /etc/supervisor/conf.d/*.conf /web/<%= container.name %>/supervisor/*.conf

data/bootstrap/etc/sx/models/common_fcgi/container/docker/image

@@ -0,0 +1 @@
+superhosting/fcgi

data/bootstrap/etc/sx/models/common_fcgi/container/docker/user.erb

@@ -0,0 +1 @@
+<%= container.name %>_fcgi

data/bootstrap/etc/sx/models/common_fcgi/container/system_users

@@ -0,0 +1 @@
+fcgi

data/bootstrap/etc/sx/models/common_fcgi/site/config.rb

@@ -0,0 +1,4 @@
+conf_name = "#{container.name}-#{site.name}.conf"
+
+config "/etc/nginx/sites/#{conf_name}", source: "nginx_vhost"
+on_reconfig "nginx -t && service nginx reload"

data/bootstrap/etc/sx/models/common_fcgi/site/config_templates/nginx_vhost.erb

@@ -0,0 +1,21 @@
+server {
+  listen 0.0.0.0:80;
+
+  server_name <%= ([site.name] + site.aliases).compact.map(&:punycode).join ' ' %>;
+  set $sx_container "<%= container.name %>";
+  access_log /web/<%= container.name %>/logs/<%= site.name %>_access_nginx.log main;
+  error_log /web/<%= container.name %>/logs/<%= site.name %>_error_nginx.log error;
+
+  location ~* ^\/.+\.(jpg|jpeg|gif|png|svg|ico|css|zip|tgz|gz|rar|bz2|pdf|txt|tar|wav|bmp|rtf|js|flv|swf|html|htm|ttf|eot|woff)$ {
+    root <%= site.web.path.join(site.document_root) %>/;
+    try_files $uri @backend;
+  }
+
+  location / {
+    fastcgi_pass unix:<%= site.web.path %>.sock;
+    fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+    include fastcgi_params;
+  }
+
+  include /etc/nginx/server.conf.d/*.conf;
+}

data/bootstrap/etc/sx/models/common_joomla/abstract

@@ -0,0 +1 @@
+yes

data/bootstrap/etc/sx/models/common_joomla/site/php/flag

@@ -0,0 +1 @@
+display_errors = On

data/bootstrap/etc/sx/models/common_joomla/site/php/value

@@ -0,0 +1,2 @@
+post_max_size = 16M
+upload_max_filesize = 16M

data/bootstrap/etc/sx/models/common_joomla_v2/abstract

@@ -0,0 +1 @@
+yes

data/bootstrap/etc/sx/models/common_joomla_v2/container/mux

@@ -0,0 +1 @@
+php-5.3

data/bootstrap/etc/sx/models/common_joomla_v2/inherit

@@ -0,0 +1,2 @@
+common_joomla
+common_mail

data/bootstrap/etc/sx/models/common_joomla_v3/abstract

@@ -0,0 +1 @@
+yes

data/bootstrap/etc/sx/models/common_joomla_v3/container/mux

@@ -0,0 +1 @@
+php-5.5

data/bootstrap/etc/sx/models/common_joomla_v3/inherit

@@ -0,0 +1,2 @@
+common_joomla
+common_mail

data/bootstrap/etc/sx/models/common_l/abstract

@@ -0,0 +1 @@
+yes

data/bootstrap/etc/sx/models/common_l/container/docker/blkio_weight

@@ -0,0 +1 @@
+4096

data/bootstrap/etc/sx/models/common_l/container/docker/cpu_period

@@ -0,0 +1 @@
+50000

data/bootstrap/etc/sx/models/common_l/container/docker/cpu_quota

@@ -0,0 +1 @@
+25000

data/bootstrap/etc/sx/models/common_l/container/docker/cpu_shares

@@ -0,0 +1 @@
+4096

data/bootstrap/etc/sx/models/common_l/container/docker/memory

@@ -0,0 +1 @@
+256M

data/bootstrap/etc/sx/models/common_l/container/docker/memory_swap

@@ -0,0 +1 @@
+-1

data/bootstrap/etc/sx/models/common_m/abstract

@@ -0,0 +1 @@
+yes

data/bootstrap/etc/sx/models/common_m/container/docker/blkio_weight

@@ -0,0 +1 @@
+2048

data/bootstrap/etc/sx/models/common_m/container/docker/cpu_period

@@ -0,0 +1 @@
+50000

data/bootstrap/etc/sx/models/common_m/container/docker/cpu_quota

@@ -0,0 +1 @@
+12500

data/bootstrap/etc/sx/models/common_m/container/docker/cpu_shares

@@ -0,0 +1 @@
+2048

data/bootstrap/etc/sx/models/common_m/container/docker/memory

@@ -0,0 +1 @@
+128M

data/bootstrap/etc/sx/models/common_m/container/docker/memory_swap

@@ -0,0 +1 @@
+-1

data/bootstrap/etc/sx/models/common_mail/abstract

@@ -0,0 +1 @@
+yes

data/bootstrap/etc/sx/models/common_mail/container/config.rb

@@ -0,0 +1,12 @@
+if container.mail.enabled?
+  container.mail.password.safe_put!(['a'..'z', 'A'..'Z', 0..9].map(&:to_a).flatten.sample(30).join)
+
+  config "#{container.config.path}/ssmtp/ssmtp.conf"
+  config "/etc/postfix/postfwd.cf.d/#{container.name}.cf", source: 'postfwd_rules'
+
+  on_reconfig "echo '#{container.mail.password}' | /usr/sbin/saslpasswd2 -u #{etc.smtp_hostname} -a smtpauth #{container.name} -p"
+else
+  on_reconfig "/usr/sbin/saslpasswd2 -u #{etc.smtp_hostname} -a smtpauth #{container.name} -d"
+end
+
+# TODO: on_reconfig 'cat $(ls -1 /etc/postfix/postfwd.cf.d/ | sort) > /etc/postfix/postfwd.cf && service postfwd reload'

data/bootstrap/etc/sx/models/common_mail/container/config_templates/postfwd_rules.erb

@@ -0,0 +1,12 @@
+id=<%= %>_0001
+  sasl_username=<%= "#{container.name}@#{etc.smtp_hostname}" %>
+  action=rate(sasl_username/<%= container.mail.limit_hourly %>/3600/REJECT only <%= container.mail.limit_hourly %> messages per hour for $$sasl_username)
+id=<%= %>_0002
+  sasl_username=<%= "#{container.name}@#{etc.smtp_hostname}" %>
+  action=rcpt(sasl_username/<%= container.mail.limit_hourly %>/3600/REJECT only <%= container.mail.limit_hourly %> recipients per hour for $$sasl_username)
+id=<%= %>_0003
+  sasl_username=<%= "#{container.name}@#{etc.smtp_hostname}" %>
+  action=rate(sasl_username/<%= container.mail.limit_daily %>/86400/REJECT only <%= container.mail.limit_daily %> messages per day for $$sasl_username)
+id=<%= %>_0004
+  sasl_username=<%= "#{container.name}@#{etc.smtp_hostname}" %>
+  action=rcpt(sasl_username/<%= container.mail.limit_daily %>/86400/REJECT only <%= container.mail.limit_daily %> recipients per day for $$sasl_username)