rmails 0.2.2 → 0.2.3

data/app/views/domains/index.html.haml

@@ -6,10 +6,8 @@
     $(document).ready(function() { new window.Domains('#content', {}); });
 
 
-= link_to new_domain_path, :class => 'add-domain btn btn-large btn-inverse' do
+= link_to '#!new', :class => 'add-domain btn btn-large btn-inverse' do
   %span= t '.create'
-= link_to '#', :class => 'rm-domain btn btn-large btn-danger dn' do
-  %span= t '.reset'
 
 %ul#domains.list
   - @domains.each do |domain|
@@ -17,120 +15,17 @@
       .item
         .iconat @
         .btn-group
-          = link_to t(".delete"), domain_path(domain), :method => :delete, :confirm => t(".confirm"), :class => 'label label-warning delete'
+          = link_to t(".edit"), "#!edit/#{domain.id}", :class => 'label edit'
+          = link_to t(".delete"), "#!delete/#{domain.id}", :'data-msg' => t(".confirm"), :class => 'label label-warning rm'
         .item-content
-          = link_to domain.name, domain_path(domain), :class => 'item-label'
-          -#= link_to t(".edit"), edit_domain_path(domain), :class => 'label edit'
-          = link_to t(".manage"), domain_path(domain), :class => 'label label-info manage', :'data-inverse' => t(".nomanage")
+          = link_to domain.name, "#!show/#{domain.id}", :class => 'item-label'
+          = link_to t(".manage"), "#!show/#{domain.id}", :class => 'label label-info manage'
+          = link_to t(".nomanage"), "#!hide/#{domain.id}", :class => 'label dn nomanage'
 
 
 #domains_JSON.dn= @domains.to_json(:include => [:virtual_users, :virtual_aliases])
 
-
-
 #EJS.dn
-  %script#domain_form_EJS{"type" => "text/ejs"}
-    %li.empty
-      .item
-        .iconat @
-        = render :partial => 'form', :locals => { :domain => domain_ejs_object }
-        .out
-
-  %script#domain_edit_EJS{"type" => "text/ejs"}
-    .iconat @
-    = render :partial => 'form', :locals => { :domain => domain_ejs_object }
-    .out
-
-  %script#domain_item_EJS{"type" => "text/ejs"}
-    .iconat @
-    .btn-group
-      = link_to t(".delete"), domain_path('{id}'), :method => :delete, :confirm => t(".confirm"), :class => 'label label-warning delete'
-    .item-content
-      %a{:href => "", :class => "item-label"}
-        :plain
-          <%= item.attr('name') %>
-      = link_to t(".manage"), domain_path('{id}'), :class => 'label label-info manage', :'data-inverse' => t(".nomanage")
-
-  %script#errors_EJS{"type" => "text/ejs"}
-    .errors
-      %h6= t('.errors')
-      :plain
-        <% for (attr in errors) { %>
-          <% list (errors[attr], function(error) { %>
-            <p><%= error %></p>
-          <% }) %>
-        <% } %>
-
-  %script#manage_area_EJS{"type" => "text/ejs"}
-    .item-content.out.row-fluid
-      .span5.users
-        %h4
-          %span.title=         t('users.index.title')
-          %span.dn.title_new=  t('users.index.title_new')
-          %span.dn.title_edit= t('users.index.title_edit')
-        .label-info.label.new-user=t 'users.form.create'
-        %table.table.table-condensed
-      .span5.aliases
-        %h4
-          %span.title=         t('aliases.index.title')
-          %span.dn.title_new=  t('aliases.index.title_new')
-          %span.dn.title_edit= t('aliases.index.title_edit')
-        .label-info.label.new-alias=t 'aliases.form.create'
-        %table.table.table-condensed
-
-  %script#aliass_each_EJS{"type" => "text/ejs"}
-    :plain
-      <% list (items, function(item, index) { %>
-        <tr id="alias_<%= index %>">
-    %td.tar
-      :plain
-        <%= item.source %>
-    %td
-      %b
-        :plain
-          @<%= domain_name %>
-      %i.icon-hand-right
-    %td
-      :plain
-        <%= item.destination %>
-    %td.tar
-      = link_to t(".edit"), edit_domain_alias_path('{domain_id}', '{id}'), :class => 'label edit-alias'
-      = link_to "&times;".html_safe, domain_alias_path('{domain_id}', '{id}'), :class => 'rm-alias', :title => t(".delete")
-    :plain
-        </tr>
-      <% }) %>
-
-  %script#aliass_tabr_EJS{"type" => "text/ejs"}
-    %tr.new
-
-  %script#aliass_form_EJS{"type" => "text/ejs"}
-    %td{:colspan => "4"}
-      = render :partial => '/aliases/form', :locals => { :virtual_alias => alias_ejs_object }
-
-  %script#vusers_each_EJS{"type" => "text/ejs"}
-    :plain
-      <% list (items, function(item, index) { %>
-        <tr id="user_<%= index %>">
-    %td
-      %i.icon-inbox
-      :plain
-        <%= item.email %>@<%= domain_name %>
-    %td
-      %i.icon-user
-      :plain
-        <%= item.name %>
-    %td.tar
-      = link_to t(".edit"), edit_domain_user_path('{domain_id}', '{id}'), :class => 'label edit-user'
-      = link_to "&times;".html_safe, domain_user_path('{domain_id}', '{id}'), :class => 'rm-user', :title => t(".delete")
-
-    :plain
-        </tr>
-      <% }) %>
-
-  %script#vusers_tabr_EJS{"type" => "text/ejs"}
-    %tr.new
-
-  %script#vusers_form_EJS{"type" => "text/ejs"}
-    %td{:colspan => "4"}
-      = render :partial => '/users/form', :locals => { :virtual_user => user_ejs_object }
-
+  = render :partial => '/domains/templates'
+  = render :partial => '/aliases/templates'
+  = render :partial => '/users/templates'

data/app/views/users/_form.html.haml

@@ -1,9 +1,11 @@
-= simple_form_for virtual_user, :url => domain_users_path(@domain||'{domain_id}'), :method => :post do |f|
+= simple_form_for virtual_user, :url => domain_users_path(@domain||'{domain_id}'), :method => :post, :html => { :class => 'form-horizontal'} do |f|
 
   = f.input :name,     :label => t('.name')
   = f.input :email,     :label => t('.email')
   = f.input :password,  :label => t('.password')
-  = f.input :password_confirmation,  :label => t('.password_confirmation')
+
+  = f.input :quota_kb,  :label => t('.quota_kb'), :hint => t('.no_limit')
+  = f.input :quota_messages,  :label => t('.quota_messages'), :hint => t('.no_limit')
 
   .actions
     = f.button :button, t('.submit'), :type => 'submit', :class => 'btn-primary right'

data/app/views/users/_templates.html.haml

@@ -0,0 +1,27 @@
+%script#vusers_each_EJS{"type" => "text/ejs"}
+  :plain
+    <% list (items, function(item, index) { %>
+      <tr id="user_<%= index %>">
+  %td
+    %i.icon-inbox
+    :plain
+      <%= item.email %>@<%= domain_name %>
+  %td
+    %i.icon-user
+    :plain
+      <%= item.name %>
+  %td.tar
+    = link_to t(".edit"), edit_domain_user_path('{domain_id}', '{id}'), :class => 'label edit-user'
+    = link_to "&times;".html_safe, domain_user_path('{domain_id}', '{id}'), :class => 'rm-user', :title => t(".delete")
+
+  :plain
+      </tr>
+    <% }) %>
+
+%script#vusers_tabr_EJS{"type" => "text/ejs"}
+  %tr.new
+
+%script#vusers_form_EJS{"type" => "text/ejs"}
+  %td{:colspan => "4"}
+    = render :partial => '/users/form', :locals => { :virtual_user => user_ejs_object }
+

data/bin/rmails

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-#/ Usage: rmails action
+#/ Usage: rmails action [options]
 #/
 #/ Actions:
 #/    --install
@@ -11,7 +11,10 @@
 #/    --stop-app
 #/        Stops server of configuration app.
 #/        You may have to be root to run this.
-
+#/ Options:
+#/    --clear
+#/        Truncate data in database.
+#/
 
 $stderr.sync = true
 
@@ -24,6 +27,8 @@ require 'rmails/runner'
 install = false
 start   = false
 stop    = false
+clear   = false
+
 
 # parse arguments
 file = __FILE__
@@ -31,22 +36,26 @@ ARGV.options do |opts|
   opts.on("--install")                 { |install| }
   opts.on("--start-app")               { |start|   }
   opts.on("--stop-app")                { |stop|    }
+  opts.on("--clear")                   { |clear|    }
   opts.on_tail("-h", "--help")         { exec "grep ^#/<'#{file}'|cut -c4-" }
   opts.parse!
 end
 
 
-if not(install or start or stop) or(start and stop)
+if (start and stop) or
+   (install and (start or stop)) or
+   (not install and not start and not stop)
   exec "grep ^#/<'#{file}'|cut -c4-"
+end # bug that helps to have better condition
 
 if install
-  setup = Rmails::Installer.new
+  puts install
+  setup = Rmails::Installer.new({:clear => clear})
   setup.run
 
 elsif start
   app = Rmails::Runner.new
   app.start
-end
 
 elsif stop
   app = Rmails::Runner.new

data/config/locales/server/help/dovecot/cz.yml

@@ -6,8 +6,7 @@ cz:
       auth_worker_max_count: Maximum number of dovecot-auth worker processes. They're used to execute blocking passdb and userdb queries (eg. MySQL and PAM). They're automatically created and destroyed as needed.
       auth_mechanisms: Space separated list of wanted authentication mechanisms (plain login digest-md5 cram-md5 ntlm rpa apop anonymous gssapi otp skey gss-spnego).
       auth_verbose: Log unsuccessful authentication attempts and the reasons why they failed.
-      mail_cache_min_mail_count: The minimum number of mails in a mailbox before updates are done to cache file. This allows optimizing Dovecot's behavior to do less disk writes at the cost of more disk reads.
-
+      mail_cache_min_mail_count: Minimální počet zpráv ve schránce, který předchází aktualizaci souboru mezipaměti. Jedná se o optimalizaci pro menší počet zápisů na disk za cenu většího počtu čtení z disku.
       postmaster_address: Address to use when sending rejection mails.
 
       quota_full_tempfail: If user is over quota, return with temporary failure instead of bouncing the mail.
@@ -16,6 +15,9 @@ cz:
       rejection_reason: Human readable error message for rejection mails.
       rejection_variables: "%n = CRLF, %r = reason, %s = original subject, %t = recipient"
 
+      storage_size: Maximální velikost pro doručenou poštu.
+      storage_trash: Maximální velikost pro dočasné uložení smazaných zpráv. Připočítává se k celkové velikosti schránky.
+      storage_spam: Maximální velikost pro nevyžádanou poštu. Připočítává se k celkové velikosti schránky.
 
 
 

data/config/locales/server/key/dovecot/en.yml

@@ -1,20 +1,20 @@
 en:
   server:
     key:
-      disable_plaintext_auth:
-      auth_username_chars:
-      auth_worker_max_count:
-      auth_verbose:
-      mail_cache_min_mail_count:
-      imap_login__listener__port:
-      imaps_login__listener__port:
-      pop3_login_listener_port:
-      pop3s_login__listener__port:
-      imap__process_limit:
-      pop3__process_limit:
-      quota_full_tempfail:
-      rejection_subject:
-      rejection_reason:
-      storage_size:
-      storage_trash:
-      storage_spam:
+      disable_plaintext_auth: Disable authentication without encryption
+      auth_username_chars: Allowed characters in a user's name
+      auth_worker_max_count: Maximum number oflogin process
+      auth_verbose: Detailed loging of authentication
+      mail_cache_min_mail_count: Minimum number of emails before updating the cache
+      imap_login__listener__port: IMAP port
+      imaps_login__listener__port: IMAPs port
+      pop3_login_listener_port: POP3 port
+      pop3s_login__listener__port: POP3s port
+      imap__process_limit: Maximum number of connected IMAP clients
+      pop3__process_limit: Maximum number of connected POP3 clients
+      quota_full_tempfail: Notification method to a full mailbox
+      rejection_subject: Subject of rejection
+      rejection_reason: Reason for rejection
+      storage_size: Mailbox size
+      storage_trash: Size bin
+      storage_spam: Size SPAM

data/config/locales/views/aliases/cz.yml

@@ -1,10 +1,12 @@
 cz:
   aliases:
+    templates:
+      delete: Odstranit
+      edit: Upravit
     index:
       title: Přesměrování
       title_new: Vytvořit nové přesměrování
       title_edit: Upravit přesměrování
-      edit: Upravit
       delete: Odstranit
       create: Přidat přesměrování
       confirm: Opravdu chcete odstranit toto přesměrování?

data/config/locales/views/aliases/en.yml

@@ -1 +1,21 @@
 en:
+  aliases:
+    templates:
+      delete: Delete
+      edit: Edit
+    index:
+      title: Forwarding
+      title_new: Creating forwarding
+      title_edit: Editting forwarding
+      delete: Delete
+      create: Add new
+      confirm: This will be deleted. Are You sure?
+      errors: There were some input errors.
+    form:
+      source: What
+      destination: Where
+      create: Create
+      submit: Save
+      reset: Cancel
+      source_hint: Mailbox name or *
+      dest_hint: Separate emails with the Enter key

data/config/locales/views/domains/cz.yml

@@ -8,8 +8,8 @@ cz:
       nomanage: Skrýt
       create: Přidat doménu
       confirm: Opravdu chcete doménu odstranit?
-      errors: Byly objeveny chybné vstupní hodnoty.
     form:
       name: Název domény
       create: Vytvořit doménu
       reset: Storno
+

data/config/locales/views/domains/en.yml

@@ -1,15 +1,16 @@
 en:
   domains:
     index:
-      title: Domény, schránky a přesměrování
-      edit: Upravit
-      delete: Odstranit
-      manage: Zobrazit
-      nomanage: Skrýt
-      create: Přidat doménu
-      confirm: Opravdu chcete doménu odstranit?
+      title: Domains, emails and forwarding
+      edit: Edit
+      delete: Delete
+      manage: Show
+      nomanage: Hide
+      create: Add domain
+      confirm: Do you really want to delete the domain?
       errors: Byly objeveny chybné vstupní hodnoty.
     form:
-      name: Název domény
-      create: Vytvořit doménu
-      reset: Storno
+      name: Domain name
+      create: Create domain
+      reset: Cancel
+      no_limit: 0 is unlimited

data/config/locales/views/server/cz.yml

@@ -23,6 +23,7 @@ cz:
       certificates: Certifikáty
 
     status:
+      warning: Varování
       save_info: Provedení změn na serveru
       submit_button: Aplikovat změny do nastavení serveru a restartovat služby
       unsaved_warning: Systém našel neuplatněné změny v nastavení. Oranžově označené nastavení má změněnou, ale neuloženou hodnotu.

data/config/locales/views/users/cz.yml

@@ -4,8 +4,6 @@ cz:
       title: Schránky
       title_new: Vytvořit novou schránku
       title_edit: Upravit schránku
-      edit: Upravit
-      delete: Odstranit
       create: Přidat shcránku
       confirm: Opravdu chcete schránku odstranit?
 
@@ -16,4 +14,12 @@ cz:
       password_confirmation: Potvrzení hesla
       create: Vytvořit
       submit: Uložit
+      no_limit: 0 znamená neomezeno
       reset: Storno
+      quota_kb: Velikost schránky (B)
+      quota_messages: Limit počtu zpráv
+
+    templates:
+      delete: Odstranit
+      edit: Upravit
+

data/config/locales/views/users/en.yml

@@ -1 +1,23 @@
 en:
+  users:
+    index:
+      title: Users/Mailboxes
+      manage: Show
+      nomanage: Hide
+      create: Add new
+      confirm: This will be deleted. Are You sure?
+      errors: There were some input errors.
+    form:
+      name: Name
+      email: Email
+      password: Password
+      create: Create
+      submit: Save
+      reset: Cancel
+      no_limit: 0 is unlimited
+      quota_kb: Mailbox size quota
+      quota_messages: Messages count qouta
+    templates:
+      delete: Delete
+      edit: Edit
+

data/db/migrate/20121112201341_virtual_user.rb

@@ -16,14 +16,6 @@ class VirtualUser < ActiveRecord::Migration
       t.string   :reset_password_token
       t.datetime :reset_password_sent_at
 
-      ## Trackable
-      t.integer  :sign_in_count, :default => 0
-      t.datetime :current_sign_in_at
-      t.datetime :last_sign_in_at
-      t.string   :current_sign_in_ip
-      t.string   :last_sign_in_ip
-
-
       t.integer :quota_kb, :default => 10485760 # 10M
       t.integer :quota_messages, :default => 0
 

data/lib/rmails/installer.rb

@@ -7,9 +7,10 @@ end
 
 module Rmails
   class Installer
-    def initialize
-      @passwords = []
-      @interpreter = AutomateIt.new(:project => "system")
+    def initialize(params={})
+      @passwords    = params[:passwords]||[]
+      @clear        = params[:clear]
+      @interpreter  = AutomateIt.new(:project => "system")
       @interpreter.include_in(self)
       @interpreter.set :rake_task, Rake::Task
       @interpreter.set :rails_root, Rails.root
@@ -21,6 +22,11 @@ module Rmails
       Bundler.with_clean_env do
         @interpreter.shell_manager.sh("bundle install --without development assets")
       end
+      if @clear
+        puts '!! Going to TRUNCATE database'
+      else
+        @interpreter.shell_manager.sh("rake db:data:dump")
+      end
       @interpreter.invoke '02_setup_database'
       @interpreter.invoke '03_setup_postfix'
       @interpreter.invoke '04_setup_dovecot'
@@ -30,6 +36,9 @@ module Rmails
       @interpreter.invoke '08_setup_spamassassin'
       @interpreter.invoke '09_setup_awstats'
       @interpreter.invoke 'XX_start_services'
+      unless @clear
+        @interpreter.shell_manager.sh("rake db:data:load")
+      end
     end
   end
 end