adminos 1.0.0.pre.rc.2 → 1.0.0.pre.rc.3

data/lib/generators/templates/install/auto/config/deploy/templates/nginx_conf.erb

@@ -0,0 +1,96 @@
+upstream puma_<%= fetch(:nginx_upstream_name) %> { <%
+  @backends = [fetch(:puma_bind)].flatten.map do |m|
+    etype, address  = /(tcp|unix|ssl):\/{1,2}(.+)/.match(m).captures
+    if etype == 'unix'
+      "server #{etype}:#{address} #{fetch(:nginx_socket_flags)};"
+    else
+      "server #{address.gsub(/0\.0\.0\.0(.+)/, "127.0.0.1\\1")} #{fetch(:nginx_http_flags)};"
+    end
+end
+%><% @backends.each do |server| %>
+  <%= server %><% end %>
+}
+<% if fetch(:nginx_use_ssl) -%>
+server {
+  listen 80;
+  server_name <%= fetch(:nginx_server_name) %>;
+  return 301 https://$host$1$request_uri;
+}
+<% end -%>
+
+server {
+<% if fetch(:nginx_use_ssl) -%>
+  listen 443;
+  ssl on;
+<% if fetch(:nginx_ssl_certificate) -%>
+  ssl_certificate <%= fetch(:nginx_ssl_certificate) %>;
+<% else -%>
+  ssl_certificate /etc/letsencrypt/live/<%= fetch(:domain) %>/fullchain.pem;
+<% end -%>
+<% if fetch(:nginx_ssl_certificate_key) -%>
+  ssl_certificate_key <%= fetch(:nginx_ssl_certificate_key) %>;
+<% else -%>
+  ssl_certificate_key /etc/letsencrypt/live/<%= fetch(:domain) %>/privkey.pem;
+<% end -%>
+  include /etc/letsencrypt/options-ssl-nginx.conf;
+  ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
+<% else -%>
+  listen 80;
+<% end -%>
+  server_name <%= fetch(:nginx_server_name) %>;
+  root <%= current_path %>/public;
+  try_files $uri/index.html $uri @puma_<%= fetch(:nginx_upstream_name) %>;
+
+  client_max_body_size 4G;
+  keepalive_timeout 10;
+
+  error_page 500 502 504 /500.html;
+  error_page 503 @503;
+
+  location @puma_<%= fetch(:nginx_upstream_name) %> {
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header Host $host;
+    proxy_redirect off;
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "Upgrade";
+<% if fetch(:nginx_use_ssl) -%>
+    proxy_set_header X-Forwarded-Proto https;
+<% else -%>
+    proxy_set_header X-Forwarded-Proto http;
+<% end -%>
+    proxy_pass http://puma_<%= fetch(:nginx_upstream_name) %>;
+    # limit_req zone=one;
+    access_log <%= shared_path %>/log/nginx.access.log;
+    error_log <%= shared_path %>/log/nginx.error.log;
+  }
+
+  location ^~ /assets/ {
+    gzip_static on;
+    expires max;
+    add_header Cache-Control public;
+  }
+
+  location = /50x.html {
+    root html;
+  }
+
+  location = /404.html {
+    root html;
+  }
+
+  location @503 {
+    error_page 405 = /system/maintenance.html;
+    if (-f $document_root/system/maintenance.html) {
+      rewrite ^(.*)$ /system/maintenance.html break;
+    }
+    rewrite ^(.*)$ /503.html break;
+  }
+
+  if ($request_method !~ ^(GET|HEAD|PUT|PATCH|POST|DELETE|OPTIONS)$ ){
+    return 405;
+  }
+
+  if (-f $document_root/system/maintenance.html) {
+    return 503;
+  }
+}

data/lib/generators/templates/install/auto/config/deploy/templates/puma.rb.erb

@@ -0,0 +1,52 @@
+#!/usr/bin/env puma
+
+directory '<%= current_path %>'
+rackup "<%=fetch(:puma_rackup)%>"
+environment '<%= fetch(:puma_env) %>'
+<% if fetch(:puma_tag) %>
+tag '<%= fetch(:puma_tag)%>'
+<% end %>
+pidfile "<%=fetch(:puma_pid)%>"
+state_path "<%=fetch(:puma_state)%>"
+stdout_redirect '<%=fetch(:puma_access_log)%>', '<%=fetch(:puma_error_log)%>', true
+
+
+threads <%=fetch(:puma_threads).join(',')%>
+
+<%= puma_plugins %>
+
+<%= puma_bind %>
+<% if fetch(:puma_control_app) %>
+activate_control_app "<%= fetch(:puma_default_control_app) %>"
+<% end %>
+workers <%= puma_workers %>
+<% if fetch(:puma_worker_timeout) %>
+worker_timeout <%= fetch(:puma_worker_timeout).to_i %>
+<% end %>
+
+<% if puma_daemonize? %>
+daemonize
+<% end %>
+
+<% if puma_preload_app? %>
+preload_app!
+<% else %>
+prune_bundler
+<% end %>
+
+on_restart do
+  puts 'Refreshing Gemfile'
+  ENV["BUNDLE_GEMFILE"] = "<%= fetch(:bundle_gemfile, "#{current_path}/Gemfile") %>"
+end
+
+<% if puma_preload_app? and fetch(:puma_init_active_record) %>
+before_fork do
+  ActiveRecord::Base.connection_pool.disconnect!
+end
+
+on_worker_boot do
+  ActiveSupport.on_load(:active_record) do
+    ActiveRecord::Base.establish_connection
+  end
+end
+<% end %>

data/lib/generators/templates/install/auto/config/environments/staging.rb

@@ -25,7 +25,7 @@ Rails.application.configure do
   config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
   # Compress JavaScripts and CSS.
-  config.assets.js_compressor = :uglifier
+  config.assets.js_compressor = config.assets.js_compressor = Uglifier.new(harmony: true)
   # config.assets.css_compressor = :sass
 
   # Do not fallback to assets pipeline if a precompiled asset is missed.

data/lib/generators/templates/install/auto/config/initializers/adminos.rb

@@ -0,0 +1,3 @@
+Adminos.configure do |config|
+  config.search_engine = Adminos::Search::PgSearch
+end

data/lib/generators/templates/install/auto/config/locales/adminos.ru.yml

@@ -159,6 +159,7 @@ ru:
     admin:
       add: Добавить
       add_child: Добавить подраздел
+      duplication: Дублировать
       back: Назад
       cancel: Отменить
       destroy: Удалить
@@ -247,6 +248,23 @@ ru:
       labels:
         actions:
           show: Просмотр изменений
+    feedbacks:
+      actions:
+        index:
+          header: Обратная связь
+          title: Обратная связь
+      labels:
+        actions:
+          create: Добавить feedback
+          edit: Сохранить feedback
+          edit_stay_in_place: Сохранить feedback и редактировать
+          new: Добавить feedback
+          new_stay_in_place: Добавить feedback и редактировать
+          update: Сохранить feedback
+    profile:
+      actions:
+        index:
+          header: Мой профиль
     settings:
       actions:
         index:

data/lib/generators/templates/install/auto/config/systemd/puma.service.erb

@@ -0,0 +1,19 @@
+[Unit]
+Description = <%= fetch(:application) %> Puma Web Server
+After = network.target
+
+[Service]
+Type = simple
+Environment = RAILS_ENV=<%= fetch(:rails_env) %>
+Environment = PWD=<%= current_path %>
+WorkingDirectory = <%= current_path %>
+ExecStart = /home/<%= fetch(:user) %>/.rvm/bin/rvm <%= fetch(:rvm_ruby_version) %> do <%= current_path %>/bin/puma -S <%= shared_path %>/tmp/pids/puma.state -C <%= shared_path %>/puma.rb
+ExecStop = /home/<%= fetch(:user) %>/.rvm/bin/rvm <%= fetch(:rvm_ruby_version) %> do <%= current_path %>/bin/pumactl -S <%= shared_path %>/tmp/pids/puma.state -F <%= shared_path %>/puma.rb stop
+ExecReload = /home/<%= fetch(:user) %>/.rvm/bin/rvm <%= fetch(:rvm_ruby_version) %> do <%= current_path %>/bin/pumactl -S <%= shared_path %>/tmp/pids/puma.state -F <%= shared_path %>/puma.rb phased-restart
+User = <%= fetch(:user) %>
+Group = <%= fetch(:group) || fetch(:user) %>
+Restart = always
+KillMode = process
+
+[Install]
+WantedBy = multi-user.target

data/lib/generators/templates/install/auto/config/systemd/sidekiq.service.erb

@@ -0,0 +1,21 @@
+[Unit]
+Description = <%= fetch(:application) %> Sidekiq Background Worker
+After = multi-user.target
+
+[Service]
+Type = simple
+Environment = RAILS_ENV=<%= fetch(:rails_env) %>
+Environment = PWD=<%= current_path %>
+EnvironmentFile=/etc/environment
+WorkingDirectory = <%= current_path %>
+ExecStart = /home/<%= fetch(:user) %>/.rvm/bin/rvm <%= fetch(:rvm_ruby_version) %> do <%= current_path %>/bin/sidekiq -e <%= fetch(:rails_env) %> -L <%= shared_path %>/log/sidekiq.log -P <%= shared_path %>/tmp/pids/sidekiq.pid
+ExecStop = /home/<%= fetch(:user) %>/.rvm/bin/rvm <%= fetch(:rvm_ruby_version) %> do <%= current_path %>/bin/sidekiqctl stop <%= shared_path %>/tmp/pids/sidekiq.pid
+User = <%= fetch(:user) %>
+Group = <%= fetch(:group) || fetch(:user) %>
+KillMode = process
+UMask = 0002
+RestartSec = 1
+Restart = always
+
+[Install]
+WantedBy = multi-user.target

data/lib/generators/templates/install/auto/lib/capistrano/{template.rb → smart_templates.rb}

@@ -1,10 +1,10 @@
 # will first try and copy the file:
 # config/deploy/#{full_app_name}/#{from}.erb
 # to:
-# shared/config/to
+# templates/config/to
 # if the original source path doesn exist then it will
 # search in:
-# config/deploy/shared/#{from}.erb
+# config/deploy/templates/#{from}.erb
 # this allows files which are common to all enviros to
 # come from a single source while allowing specific
 # ones to be over-ridden
@@ -26,8 +26,22 @@ end
 def template_file(name)
   if File.exist?((file = "config/deploy/#{fetch(:full_app_name)}/#{name}.erb"))
     return file
-  elsif File.exist?((file = "config/deploy/shared/#{name}.erb"))
+  elsif File.exist?((file = "config/deploy/templates/#{name}.erb"))
+    return file
+  elsif File.exist?((file = "config/deploy/templates/#{name}"))
     return file
   end
   return nil
 end
+
+# we often want to refer to variables which
+# are defined in subsequent stage files. This
+# let's us use the {{var}} to represent fetch(:var)
+# in strings which are only evaluated at runtime.
+def sub_strings(input_string)
+  output_string = input_string
+  input_string.scan(/{{(\w*)}}/).each do |var|
+    output_string.gsub!("{{#{var[0]}}}", fetch(var[0].to_sym))
+  end
+  output_string
+end

data/lib/generators/templates/install/auto/lib/capistrano/tasks/setup_config.cap

@@ -1,9 +1,11 @@
+require "capistrano/smart_templates"
+
 namespace :deploy do
+  desc "Set up config files"
   task :setup_config do
     on roles(:app) do
       # make the config dir
       execute :mkdir, "-p #{shared_path}/config"
-      full_app_name = fetch(:full_app_name)
 
       # config files to be uploaded to shared/config, see the
       # definition of smart_template for details of operation.
@@ -12,28 +14,33 @@ namespace :deploy do
       # everything should be in deploy/shared with params which differ
       # set in the stage files
 
-      begin
-        config_files = fetch(:config_files)
-        config_files.each do |file|
-          smart_template file
-        end
-
-        # which of the above files should be marked as executable
-        executable_files = fetch(:executable_config_files)
-
-        #executable_files.each do |file|
-        #  execute :chmod, "+x #{shared_path}/config/#{file}"
-        #end
+      config_files = fetch(:config_files, [])
+      config_files.each do |file|
+        smart_template file
+      end
 
-        # symlink stuff which should be... symlinked
-        symlinks = fetch(:symlinks)
+      # which of the above files should be marked as executable
+      executable_config_files = fetch(:executable_config_files, [])
+      executable_config_files.each do |file|
+        execute :chmod, "+x #{shared_path}/config/#{file}"
+      end
 
-        symlinks.each do |symlink|
-          sudo "ln -nfs #{shared_path}/config/#{symlink[:source]} #{sub_strings(symlink[:link])}"
-        end
-      rescue Exception => e
-        log "ERROR: #{e.to_s}"
+      # symlink stuff which should be... symlinked
+      symlinks = fetch(:symlinks, [])
+      symlinks.each do |symlink|
+        sudo "ln -nfs #{shared_path}/config/#{symlink[:source]} #{sub_strings(symlink[:link])}"
       end
     end
   end
+
+  desc "Set up new deployment"
+  task setup: %i[setup_config puma:nginx_config]
+
+  desc "Set up Systemd services"
+  task setup_systemd: %i[systemd:puma:setup]
+  # task setup_systemd: %i[systemd:puma:setup systemd:sidekiq:setup]
+
+  desc "Enable Systemd services"
+  task enable_systemd: %i[systemd:puma:enable]
+  # task enable_systemd: %i[systemd:puma:enable systemd:sidekiq:enable]
 end

data/lib/generators/templates/install/deploy.rb.erb

@@ -1,21 +1,22 @@
-set :application, :<%= application_name %>
-set :repo_url, "git@gitlab.molinos.ru:studio/#{application}.git"
+set :application, '<%= application_name %>'
+set :repo_url, "git@gitlab.molinos.ru:studio/#{fetch(:application)}.git"
 
-# Default value for :linked_files is []
-set :linked_files, fetch(:linked_files, []).push('config/database.yml', '.env', 'config/master.key')
-# Default value for linked_dirs is []
-set :linked_dirs, fetch(:linked_dirs, []).push(
-  'log', 'tmp/pids', 'tmp/cache', 'tmp/sockets', 'vendor/bundle', 'storage'
-)
+set :config_files, %w[config/database.yml .env]
+append :linked_files, 'config/database.yml', '.env', 'config/master.key'
+append :linked_dirs,  'log', 'tmp/pids', 'tmp/cache', 'tmp/sockets',
+       'vendor/bundle', 'public/system', 'public/uploads'
 
 set :rvm_ruby_version, Pathname(__dir__).join('../.ruby-version').read.chomp
 
 set :db_local_clean, true
 set :assets_dir, %w[public/system]
 
-after 'deploy:publishing', 'deploy:restart'
+set :nginx_server_name, -> { "#{fetch(:domain)} localhost #{fetch(:application)}.local" }
+set :nginx_upstream_name, -> { "#{fetch(:application)}_#{fetch(:stage)}" }
+set :nginx_config_name, -> { "#{fetch(:domain)}.conf" }
+set :nginx_use_ssl, true
+
 namespace :deploy do
-  task :restart do
-    invoke 'unicorn:restart'
-  end
+  # after :restart, 'systemd:sidekiq:reload-or-restart'
+  after :publishing, :restart
 end

data/lib/generators/templates/profile/auto/app/controllers/admin/profiles_controller.rb

@@ -0,0 +1,26 @@
+class Admin::ProfilesController < Admin::BaseController
+  load_and_authorize_resource param_method: :strong_params, class: User
+
+  def update
+    if resource.update_with_password(strong_params)
+      flash[:notice] = t 'flash.actions.update.notice'
+      redirect_to action: :edit
+    else
+      flash[:error] = t 'flash.actions.update.alert'
+      render action: :edit
+    end
+  end
+
+  private
+
+  def resource
+    @resource ||= current_user
+  end
+
+  helper_method :resource
+
+  def strong_params
+    params.require(:user).permit :email, :password, :password_confirmation,
+                                 :current_password
+  end
+end

data/lib/generators/templates/profile/auto/app/views/admin/profiles/edit.slim

@@ -0,0 +1,17 @@
+- title 'Профиль'
+= resource_header 'Профиль'
+
+= simple_form_for [:admin, resource], url: admin_profile_path, wrapper: :admin, html: { method: :put } do |f|
+  .f
+    .f__wrapper
+      .f__fieldset
+        = f.input :email
+        = f.input :password, hint: 'Оставьте пустым если не хотите изменить'
+        = f.input :password_confirmation, hint: 'Повторите пароль'
+        = f.input :current_password, hint: 'Введите текущий пароль'
+
+  .f
+    .f__wrapper
+      .f-submit.f-submit--fixed
+        .wrapper
+          = f.button :submit, resource_button_value_main, class: 'btn btn-primary btn--done'

data/lib/generators/templates/two_facto_auth/Gemfile

@@ -0,0 +1 @@
+gem 'devise-two-factor'

data/lib/generators/templates/two_facto_auth/auto/app/controllers/concerns/authenticates_with_two_factor.rb

@@ -0,0 +1,36 @@
+module AuthenticatesWithTwoFactor
+  extend ActiveSupport::Concern
+  def authenticate_with_two_factor
+    devise_parameter_sanitizer.permit(:sign_in, keys: [:otp_attempt])
+
+    # remove otp_user_id if new login
+    cookies.delete :otp_user_id if sign_in_params[:email]
+
+    try_set_otp_user_id
+    try_sign_in_user
+  end
+
+  private
+
+  def try_set_otp_user_id
+    user = User.find_by_email(sign_in_params[:email])
+
+    return unless user&.otp_required_for_login
+    return unless user.valid_password?(sign_in_params[:password])
+
+    cookies.signed[:otp_user_id] = { value: user.id, expires: 5.minutes.from_now }
+  end
+
+  def try_sign_in_user
+    user = User.find_by(id: cookies.signed[:otp_user_id])
+
+    return unless user
+
+    if user.current_otp == sign_in_params[:otp_attempt]
+      sign_in(user)
+    else
+      self.resource = User.new
+      render 'devise/sessions/two_factor'
+    end
+  end
+end