postfix_admin 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a83f945f0f977fc80b8715b899af26d908b3d6b1169d27fae9cf92089bac5082
-  data.tar.gz: f8f63116ece1064079b99f986fc26778c4f4affc28ae8dbd3beca3496a595186
+  metadata.gz: 70bd18f454fd77684ab652949e36829f6d9e3e8e275e475819b60b025b3fea6e
+  data.tar.gz: 477da494d685bcaeb45f090d92edbfb1abc6af811e04172a4e4f1865b51eac46
 SHA512:
-  metadata.gz: 22f7cc6d351d3a7e63ba95e653ac21f4b1eeebaebb5a717810477ab0d700dbb3199eeee042ca34909aee1c959bb7d27fe705d1c332895e7bb38ae0cc1f3e9120
-  data.tar.gz: 821bb8bac75277e3faf303f1db8292256cc9bbcf40cb2de6f63f9c3c38e40f84c5739849edc159ddec8bf262d9fa9e5ea8f9bac15e8dce37f2691f0a017e2772
+  metadata.gz: a7b8c5f69e4f15589ca5c10250e88d9dfb76e623bed02548161e24c29fca02e74e97b154bf5f876936922e7b7d134f4fb6f46ab2e85765198fbaf5c7dddb1c32
+  data.tar.gz: 777b1af93896c8df8a4eab31af493af872a694502cab871c0ea99bcf7e8a82ce014228e82b117c37a3c9953ec86bd54648a01954c2bcae72c373fca94d1c18dc

data/.github/workflows/ruby.yml

@@ -0,0 +1,37 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@ec106b438a1ff6ff109590de34ddc62c540232e0
+      with:
+        ruby-version: 2.6
+    - name: docker-compose up
+      run: docker-compose up -d
+    - name: Run tests for Ruby 2.6
+      run: docker-compose exec -T app /wait-for-it.sh db:3306 -- rake
+    - name: Remove Gemfile.lock
+      run: rm -f Gemfile.lock
+    - name: Run tests for Ruby 2.5.0
+      run: docker-compose exec -T app2.5 rake

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.1
+ * Supported `superadmin` column of `admin` table
+ * Added `passwordhash_prefix` keyword in the configuration format for backward compatibility
+
 ## 0.2.0
  * Switched its object-relational mapper from DataMapper to ActiveRecord
  * Stored password hash includes scheme prefix: like `{CRAM-MD5}`, `{PLAIN}`

data/docker-admin/Dockerfile

@@ -0,0 +1,6 @@
+FROM postfixadmin:3.2.4-apache
+
+RUN apt-get update && \
+    apt-get install -y dovecot-core iproute2 mariadb-client && \
+    rm -rf /var/lib/apt/lists/*
+

data/docker-admin/config.local.php

@@ -0,0 +1,21 @@
+<?php
+$CONF['configured'] = true;
+
+$CONF['database_type'] = 'mysqli';
+$CONF['database_user'] = 'postfix';
+$CONF['database_password'] = 'password';
+$CONF['database_name'] = 'postfix';
+$CONF['database_host'] = 'db';
+
+$CONF['password_validation'] = array(
+    #    '/regular expression/' => '$PALANG key (optional: + parameter)',
+        '/.{5}/'                => 'password_too_short 5',      # minimum length 5 characters
+        '/([a-zA-Z].*){3}/'     => 'password_no_characters 3',  # must contain at least 3 characters
+        // '/([0-9].*){2}/'        => 'password_no_digits 2',      # must contain at least 2 digits
+    );
+
+$CONF['encrypt'] = 'dovecot:CRAM-MD5';
+
+// setup_password: 'password'
+$CONF['setup_password'] = '87745eb0269b2f42813b23601be3231a:6e41880f73d97321f2f0b25a5ee30f57f5ab3be8';
+?>

data/docker-app-2.5/Dockerfile

@@ -0,0 +1,15 @@
+FROM ruby:2.5.0
+
+RUN apt-get update && \
+    apt-get install -y dovecot-core iproute2 mariadb-client && \
+    rm -rf /var/lib/apt/lists/*
+
+WORKDIR /app
+
+COPY Gemfile postfix_admin.gemspec ./
+COPY ./lib/postfix_admin/version.rb ./lib/postfix_admin/version.rb
+
+RUN gem install bundler && bundle install
+
+COPY spec/postfix_admin.conf /root/.postfix_admin.conf
+COPY docker-app/my.cnf /root/.my.cnf

data/docker-app/Dockerfile

@@ -0,0 +1,25 @@
+FROM ruby:2.6
+
+RUN apt-get update && \
+    apt-get install -y dovecot-core iproute2 mariadb-client && \
+    rm -rf /var/lib/apt/lists/*
+
+WORKDIR /app
+
+COPY Gemfile postfix_admin.gemspec ./
+COPY ./lib/postfix_admin/version.rb ./lib/postfix_admin/version.rb
+
+RUN gem install bundler && bundle install
+
+COPY spec/postfix_admin.conf /root/.postfix_admin.conf
+COPY docker-app/my.cnf /root/.my.cnf
+
+# for GitHub Actions
+RUN curl https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh -so /wait-for-it.sh && \
+    chmod 755 /wait-for-it.sh
+
+COPY docker-app/docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x /docker-entrypoint.sh
+ENTRYPOINT ["/docker-entrypoint.sh"]
+
+CMD ["irb"]

data/docker-app/my.cnf

@@ -0,0 +1,5 @@
+[client]
+user = postfix
+password = password
+host = db
+database = postfix

data/docker-compose.yml

@@ -2,21 +2,43 @@ version: '3.8'
 
 services:
   app:
-    build: .
+    build:
+      context: .
+      dockerfile: docker-app/Dockerfile
     tty: true
-    ports:
-    - '7080:80'
     volumes:
     - .:/app
-    - /sys/fs/cgroup:/sys/fs/cgroup:ro
-    tmpfs:
-      - /tmp
-      - /run
-    stop_signal: SIGRTMIN+3
+    depends_on:
+      - db
+  app2.5:
+    tty: true
+    build:
+      context: .
+      dockerfile: docker-app-2.5/Dockerfile
+    volumes:
+      - .:/app
+    depends_on:
+      - db
+  admin:
+    build: docker-admin
+    ports:
+      - '8080:80'
+    volumes:
+      - ./docker-admin/config.local.php:/var/www/html/config.local.php
+    depends_on:
+      - db
+#    environment:
+#      - POSTFIXADMIN_DB_TYPE=mysqli
+#      - POSTFIXADMIN_DB_HOST=db
+#      - POSTFIXADMIN_DB_USER=postfix
+#      - POSTFIXADMIN_DB_PASSWORD=password
+#      - POSTFIXADMIN_DB_NAME=postfix
   db:
     image: mariadb:10
     volumes:
-    - ./spec/postfix.v1841.sql:/docker-entrypoint-initdb.d/postfix.sql
+    - ./docker-db/postfix.v1841.sql:/docker-entrypoint-initdb.d/postfix.sql
+#    - ./docker-db/postfix.v740.sql:/docker-entrypoint-initdb.d/postfix.sql
+#    - ./docker-db/postfix.v352.sql:/docker-entrypoint-initdb.d/postfix.sql
     environment:
       - MYSQL_RANDOM_ROOT_PASSWORD=yes
       - MYSQL_USER=postfix

data/docker-db/postfix.v1841.sql

@@ -0,0 +1,383 @@
+-- phpMyAdmin SQL Dump
+-- version 4.9.1
+-- https://www.phpmyadmin.net/
+--
+-- Host: localhost
+-- Generation Time: May 30, 2020 at 04:28 PM
+-- Server version: 10.3.17-MariaDB-log
+-- PHP Version: 7.2.11
+
+SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
+SET AUTOCOMMIT = 0;
+START TRANSACTION;
+SET time_zone = "+00:00";
+
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8mb4 */;
+
+--
+-- Database: `postfix`
+--
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `admin`
+--
+
+CREATE TABLE `admin` (
+  `username` varchar(255) NOT NULL,
+  `password` varchar(255) NOT NULL,
+  `created` datetime NOT NULL DEFAULT '2000-01-01 00:00:00',
+  `modified` datetime NOT NULL DEFAULT '2000-01-01 00:00:00',
+  `active` tinyint(1) NOT NULL DEFAULT 1,
+  `superadmin` tinyint(1) NOT NULL DEFAULT 0,
+  `phone` varchar(30) NOT NULL DEFAULT '',
+  `email_other` varchar(255) NOT NULL DEFAULT '',
+  `token` varchar(255) NOT NULL DEFAULT '',
+  `token_validity` datetime NOT NULL DEFAULT '2000-01-01 00:00:00'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Postfix Admin - Virtual Admins';
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `alias`
+--
+
+CREATE TABLE `alias` (
+  `address` varchar(255) NOT NULL,
+  `goto` text NOT NULL,
+  `domain` varchar(255) NOT NULL,
+  `created` datetime NOT NULL DEFAULT '2000-01-01 00:00:00',
+  `modified` datetime NOT NULL DEFAULT '2000-01-01 00:00:00',
+  `active` tinyint(1) NOT NULL DEFAULT 1
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Postfix Admin - Virtual Aliases';
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `alias_domain`
+--
+
+CREATE TABLE `alias_domain` (
+  `alias_domain` varchar(255) CHARACTER SET latin1 NOT NULL DEFAULT '',
+  `target_domain` varchar(255) CHARACTER SET latin1 NOT NULL DEFAULT '',
+  `created` datetime NOT NULL DEFAULT '2000-01-01 00:00:00',
+  `modified` datetime NOT NULL DEFAULT '2000-01-01 00:00:00',
+  `active` tinyint(1) NOT NULL DEFAULT 1
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Postfix Admin - Domain Aliases';
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `config`
+--
+
+CREATE TABLE `config` (
+  `id` int(11) NOT NULL,
+  `name` varchar(20) NOT NULL DEFAULT '',
+  `value` varchar(20) NOT NULL DEFAULT ''
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='PostfixAdmin settings';
+
+--
+-- Dumping data for table `config`
+--
+
+INSERT INTO `config` (`id`, `name`, `value`) VALUES
+(1, 'version', '1841');
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `domain`
+--
+
+CREATE TABLE `domain` (
+  `domain` varchar(255) NOT NULL,
+  `description` varchar(255) NOT NULL,
+  `aliases` int(10) NOT NULL DEFAULT 0,
+  `mailboxes` int(10) NOT NULL DEFAULT 0,
+  `maxquota` bigint(20) NOT NULL DEFAULT 0,
+  `quota` bigint(20) NOT NULL DEFAULT 0,
+  `transport` varchar(255) NOT NULL,
+  `backupmx` tinyint(1) NOT NULL DEFAULT 0,
+  `created` datetime NOT NULL DEFAULT '2000-01-01 00:00:00',
+  `modified` datetime NOT NULL DEFAULT '2000-01-01 00:00:00',
+  `active` tinyint(1) NOT NULL DEFAULT 1
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Postfix Admin - Virtual Domains';
+
+--
+-- Dumping data for table `domain`
+--
+
+INSERT INTO `domain` (`domain`, `description`, `aliases`, `mailboxes`, `maxquota`, `quota`, `transport`, `backupmx`, `created`, `modified`, `active`) VALUES
+('ALL', '', 0, 0, 0, 0, '', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1);
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `domain_admins`
+--
+
+CREATE TABLE `domain_admins` (
+  `username` varchar(255) NOT NULL,
+  `domain` varchar(255) NOT NULL,
+  `created` datetime NOT NULL DEFAULT '2000-01-01 00:00:00',
+  `active` tinyint(1) NOT NULL DEFAULT 1
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Postfix Admin - Domain Admins';
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `fetchmail`
+--
+
+CREATE TABLE `fetchmail` (
+  `id` int(11) UNSIGNED NOT NULL,
+  `mailbox` varchar(255) NOT NULL,
+  `src_server` varchar(255) NOT NULL,
+  `src_auth` enum('password','kerberos_v5','kerberos','kerberos_v4','gssapi','cram-md5','otp','ntlm','msn','ssh','any') DEFAULT NULL,
+  `src_user` varchar(255) NOT NULL,
+  `src_password` varchar(255) NOT NULL,
+  `src_folder` varchar(255) NOT NULL,
+  `poll_time` int(11) UNSIGNED NOT NULL DEFAULT 10,
+  `fetchall` tinyint(1) UNSIGNED NOT NULL DEFAULT 0,
+  `keep` tinyint(1) UNSIGNED NOT NULL DEFAULT 0,
+  `protocol` enum('POP3','IMAP','POP2','ETRN','AUTO') DEFAULT NULL,
+  `usessl` tinyint(1) UNSIGNED NOT NULL DEFAULT 0,
+  `extra_options` text DEFAULT NULL,
+  `returned_text` text DEFAULT NULL,
+  `mda` varchar(255) NOT NULL,
+  `date` timestamp NOT NULL DEFAULT '1999-12-31 15:00:00',
+  `sslcertck` tinyint(1) NOT NULL DEFAULT 0,
+  `sslcertpath` varchar(255) DEFAULT '',
+  `sslfingerprint` varchar(255) CHARACTER SET latin1 DEFAULT '',
+  `domain` varchar(255) CHARACTER SET latin1 DEFAULT '',
+  `active` tinyint(1) NOT NULL DEFAULT 0,
+  `created` timestamp NOT NULL DEFAULT '1999-12-31 15:00:00',
+  `modified` timestamp NOT NULL DEFAULT current_timestamp()
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `log`
+--
+
+CREATE TABLE `log` (
+  `timestamp` datetime NOT NULL DEFAULT '2000-01-01 00:00:00',
+  `username` varchar(255) NOT NULL,
+  `domain` varchar(255) NOT NULL,
+  `action` varchar(255) NOT NULL,
+  `data` text NOT NULL,
+  `id` int(11) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Postfix Admin - Log';
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `mailbox`
+--
+
+CREATE TABLE `mailbox` (
+  `username` varchar(255) NOT NULL,
+  `password` varchar(255) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `maildir` varchar(255) NOT NULL,
+  `quota` bigint(20) NOT NULL DEFAULT 0,
+  `local_part` varchar(255) NOT NULL,
+  `domain` varchar(255) NOT NULL,
+  `created` datetime NOT NULL DEFAULT '2000-01-01 00:00:00',
+  `modified` datetime NOT NULL DEFAULT '2000-01-01 00:00:00',
+  `active` tinyint(1) NOT NULL DEFAULT 1,
+  `phone` varchar(30) NOT NULL DEFAULT '',
+  `email_other` varchar(255) NOT NULL DEFAULT '',
+  `token` varchar(255) NOT NULL DEFAULT '',
+  `token_validity` datetime NOT NULL DEFAULT '2000-01-01 00:00:00'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Postfix Admin - Virtual Mailboxes';
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `quota`
+--
+
+CREATE TABLE `quota` (
+  `username` varchar(255) NOT NULL,
+  `path` varchar(100) NOT NULL,
+  `current` bigint(20) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `quota2`
+--
+
+CREATE TABLE `quota2` (
+  `username` varchar(100) NOT NULL,
+  `bytes` bigint(20) NOT NULL DEFAULT 0,
+  `messages` int(11) NOT NULL DEFAULT 0
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `vacation`
+--
+
+CREATE TABLE `vacation` (
+  `email` varchar(255) NOT NULL,
+  `subject` varchar(255) NOT NULL,
+  `body` text NOT NULL,
+  `cache` text NOT NULL,
+  `domain` varchar(255) NOT NULL,
+  `created` datetime NOT NULL DEFAULT '2000-01-01 00:00:00',
+  `active` tinyint(1) NOT NULL DEFAULT 1,
+  `modified` timestamp NOT NULL DEFAULT current_timestamp(),
+  `activefrom` timestamp NOT NULL DEFAULT '1999-12-31 15:00:00',
+  `activeuntil` timestamp NOT NULL DEFAULT '2038-01-17 15:00:00',
+  `interval_time` int(11) NOT NULL DEFAULT 0
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Postfix Admin - Virtual Vacation';
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `vacation_notification`
+--
+
+CREATE TABLE `vacation_notification` (
+  `on_vacation` varchar(150) NOT NULL,
+  `notified` varchar(255) CHARACTER SET latin1 NOT NULL DEFAULT '',
+  `notified_at` timestamp NOT NULL DEFAULT current_timestamp()
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Postfix Admin - Virtual Vacation Notifications';
+
+--
+-- Indexes for dumped tables
+--
+
+--
+-- Indexes for table `admin`
+--
+ALTER TABLE `admin`
+  ADD PRIMARY KEY (`username`);
+
+--
+-- Indexes for table `alias`
+--
+ALTER TABLE `alias`
+  ADD PRIMARY KEY (`address`),
+  ADD KEY `domain` (`domain`);
+
+--
+-- Indexes for table `alias_domain`
+--
+ALTER TABLE `alias_domain`
+  ADD PRIMARY KEY (`alias_domain`),
+  ADD KEY `active` (`active`),
+  ADD KEY `target_domain` (`target_domain`);
+
+--
+-- Indexes for table `config`
+--
+ALTER TABLE `config`
+  ADD PRIMARY KEY (`id`),
+  ADD UNIQUE KEY `name` (`name`);
+
+--
+-- Indexes for table `domain`
+--
+ALTER TABLE `domain`
+  ADD PRIMARY KEY (`domain`);
+
+--
+-- Indexes for table `domain_admins`
+--
+ALTER TABLE `domain_admins`
+  ADD KEY `username` (`username`);
+
+--
+-- Indexes for table `fetchmail`
+--
+ALTER TABLE `fetchmail`
+  ADD PRIMARY KEY (`id`);
+
+--
+-- Indexes for table `log`
+--
+ALTER TABLE `log`
+  ADD PRIMARY KEY (`id`),
+  ADD KEY `timestamp` (`timestamp`),
+  ADD KEY `domain_timestamp` (`domain`,`timestamp`);
+
+--
+-- Indexes for table `mailbox`
+--
+ALTER TABLE `mailbox`
+  ADD PRIMARY KEY (`username`),
+  ADD KEY `domain` (`domain`);
+
+--
+-- Indexes for table `quota`
+--
+ALTER TABLE `quota`
+  ADD PRIMARY KEY (`username`,`path`);
+
+--
+-- Indexes for table `quota2`
+--
+ALTER TABLE `quota2`
+  ADD PRIMARY KEY (`username`);
+
+--
+-- Indexes for table `vacation`
+--
+ALTER TABLE `vacation`
+  ADD PRIMARY KEY (`email`),
+  ADD KEY `email` (`email`);
+
+--
+-- Indexes for table `vacation_notification`
+--
+ALTER TABLE `vacation_notification`
+  ADD PRIMARY KEY (`on_vacation`,`notified`);
+
+--
+-- AUTO_INCREMENT for dumped tables
+--
+
+--
+-- AUTO_INCREMENT for table `config`
+--
+ALTER TABLE `config`
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=2;
+
+--
+-- AUTO_INCREMENT for table `fetchmail`
+--
+ALTER TABLE `fetchmail`
+  MODIFY `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=2;
+
+--
+-- AUTO_INCREMENT for table `log`
+--
+ALTER TABLE `log`
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
+
+--
+-- Constraints for dumped tables
+--
+
+--
+-- Constraints for table `vacation_notification`
+--
+ALTER TABLE `vacation_notification`
+  ADD CONSTRAINT `vacation_notification_pkey` FOREIGN KEY (`on_vacation`) REFERENCES `vacation` (`email`) ON DELETE CASCADE;
+COMMIT;
+
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;

data/docker-db/postfix.v352.sql

@@ -0,0 +1,223 @@
+-- phpMyAdmin SQL Dump
+-- version 3.4.7
+-- http://www.phpmyadmin.net
+--
+-- ホスト: localhost
+-- 生成時間: 2012 年 9 月 25 日 23:12
+-- サーバのバージョン: 5.5.15
+-- PHP のバージョン: 5.3.15
+
+SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
+SET time_zone = "+00:00";
+
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+
+--
+-- データベース: `postfix_test`
+--
+
+-- --------------------------------------------------------
+
+--
+-- テーブルの構造 `admin`
+--
+
+CREATE TABLE IF NOT EXISTS `admin` (
+  `username` varchar(255) NOT NULL DEFAULT '',
+  `password` varchar(255) NOT NULL DEFAULT '',
+  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `modified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `active` tinyint(1) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`username`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Postfix Admin - Virtual Admins';
+
+-- --------------------------------------------------------
+
+--
+-- テーブルの構造 `alias`
+--
+
+CREATE TABLE IF NOT EXISTS `alias` (
+  `address` varchar(255) NOT NULL DEFAULT '',
+  `goto` text NOT NULL,
+  `domain` varchar(255) NOT NULL DEFAULT '',
+  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `modified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `active` tinyint(1) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`address`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Postfix Admin - Virtual Aliases';
+
+--
+-- テーブルのデータをダンプしています `alias`
+--
+
+-- --------------------------------------------------------
+
+--
+-- テーブルの構造 `config`
+--
+
+CREATE TABLE IF NOT EXISTS `config` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(20) CHARACTER SET latin1 NOT NULL DEFAULT '',
+  `value` varchar(20) CHARACTER SET latin1 NOT NULL DEFAULT '',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `name` (`name`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8 COMMENT='PostfixAdmin settings' AUTO_INCREMENT=2 ;
+
+--
+-- テーブルのデータをダンプしています `config`
+--
+
+INSERT INTO `config` (`id`, `name`, `value`) VALUES
+(1, 'version', '352');
+
+-- --------------------------------------------------------
+
+--
+-- テーブルの構造 `domain`
+--
+
+CREATE TABLE IF NOT EXISTS `domain` (
+  `domain` varchar(255) NOT NULL DEFAULT '',
+  `description` varchar(255) NOT NULL DEFAULT '',
+  `aliases` int(10) NOT NULL DEFAULT '0',
+  `mailboxes` int(10) NOT NULL DEFAULT '0',
+  `maxquota` bigint(20) NOT NULL DEFAULT '0',
+  `quota` bigint(20) NOT NULL DEFAULT '0',
+  `transport` varchar(255) DEFAULT NULL,
+  `backupmx` tinyint(1) NOT NULL DEFAULT '0',
+  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `modified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `active` tinyint(1) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`domain`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Postfix Admin - Virtual Domains';
+
+--
+-- テーブルのデータをダンプしています `domain`
+--
+
+INSERT INTO `domain` (`domain`, `description`, `aliases`, `mailboxes`, `maxquota`, `quota`, `transport`, `backupmx`, `created`, `modified`, `active`) VALUES
+('ALL', '', 0, 0, 0, 0, NULL, 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1);
+
+-- --------------------------------------------------------
+
+--
+-- テーブルの構造 `domain_admins`
+--
+
+CREATE TABLE IF NOT EXISTS `domain_admins` (
+  `username` varchar(255) NOT NULL DEFAULT '',
+  `domain` varchar(255) NOT NULL DEFAULT '',
+  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `active` tinyint(1) NOT NULL DEFAULT '1',
+  KEY `username` (`username`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Postfix Admin - Domain Admins';
+
+-- --------------------------------------------------------
+
+--
+-- テーブルの構造 `fetchmail`
+--
+
+CREATE TABLE IF NOT EXISTS `fetchmail` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `mailbox` varchar(255) NOT NULL DEFAULT '',
+  `src_server` varchar(255) NOT NULL DEFAULT '',
+  `src_auth` enum('password','kerberos_v5','kerberos','kerberos_v4','gssapi','cram-md5','otp','ntlm','msn','ssh','any') DEFAULT NULL,
+  `src_user` varchar(255) NOT NULL DEFAULT '',
+  `src_password` varchar(255) NOT NULL DEFAULT '',
+  `src_folder` varchar(255) NOT NULL DEFAULT '',
+  `poll_time` int(11) unsigned NOT NULL DEFAULT '10',
+  `fetchall` tinyint(1) unsigned NOT NULL DEFAULT '0',
+  `keep` tinyint(1) unsigned NOT NULL DEFAULT '0',
+  `protocol` enum('POP3','IMAP','POP2','ETRN','AUTO') DEFAULT NULL,
+  `extra_options` text,
+  `returned_text` text,
+  `mda` varchar(255) NOT NULL DEFAULT '',
+  `date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+
+-- --------------------------------------------------------
+
+--
+-- テーブルの構造 `log`
+--
+
+CREATE TABLE IF NOT EXISTS `log` (
+  `timestamp` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `username` varchar(255) NOT NULL DEFAULT '',
+  `domain` varchar(255) NOT NULL DEFAULT '',
+  `action` varchar(255) NOT NULL DEFAULT '',
+  `data` varchar(255) NOT NULL DEFAULT '',
+  KEY `timestamp` (`timestamp`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Postfix Admin - Log';
+
+-- --------------------------------------------------------
+
+--
+-- テーブルの構造 `mailbox`
+--
+
+CREATE TABLE IF NOT EXISTS `mailbox` (
+  `username` varchar(255) NOT NULL DEFAULT '',
+  `password` varchar(255) NOT NULL DEFAULT '',
+  `name` varchar(255) NOT NULL DEFAULT '',
+  `maildir` varchar(255) NOT NULL DEFAULT '',
+  `quota` bigint(20) NOT NULL DEFAULT '0',
+  `domain` varchar(255) NOT NULL DEFAULT '',
+  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `modified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `active` tinyint(1) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`username`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Postfix Admin - Virtual Mailboxes';
+
+-- --------------------------------------------------------
+
+--
+-- テーブルの構造 `vacation`
+--
+
+CREATE TABLE IF NOT EXISTS `vacation` (
+  `email` varchar(255) NOT NULL,
+  `subject` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
+  `body` text CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
+  `cache` text NOT NULL,
+  `domain` varchar(255) NOT NULL,
+  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `active` tinyint(1) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`email`),
+  KEY `email` (`email`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='Postfix Admin - Virtual Vacation';
+
+-- --------------------------------------------------------
+
+--
+-- テーブルの構造 `vacation_notification`
+--
+
+CREATE TABLE IF NOT EXISTS `vacation_notification` (
+  `on_vacation` varchar(255) NOT NULL,
+  `notified` varchar(255) NOT NULL,
+  `notified_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`on_vacation`,`notified`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='Postfix Admin - Virtual Vacation Notifications';
+
+--
+-- ダンプしたテーブルの制約
+--
+
+--
+-- テーブルの制約 `vacation_notification`
+--
+ALTER TABLE `vacation_notification`
+  ADD CONSTRAINT `vacation_notification_pkey` FOREIGN KEY (`on_vacation`) REFERENCES `vacation` (`email`) ON DELETE CASCADE;
+
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;

data/docker-db/postfix.v740.sql

@@ -0,0 +1,269 @@
+
+-- phpMyAdmin SQL Dump
+-- version 3.5.7
+-- http://www.phpmyadmin.net
+--
+-- ホスト: localhost
+-- 生成日時: 2013 年 5 月 09 日 08:25
+-- サーバのバージョン: 5.5.29
+-- PHP のバージョン: 5.3.20
+
+SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
+SET time_zone = "+00:00";
+
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+
+--
+-- データベース: `postfix`
+--
+
+-- --------------------------------------------------------
+
+--
+-- テーブルの構造 `admin`
+--
+
+CREATE TABLE IF NOT EXISTS `admin` (
+  `username` varchar(255) NOT NULL,
+  `password` varchar(255) NOT NULL,
+  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `modified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `active` tinyint(1) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`username`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='Postfix Admin - Virtual Admins';
+
+-- --------------------------------------------------------
+
+--
+-- テーブルの構造 `alias`
+--
+
+CREATE TABLE IF NOT EXISTS `alias` (
+  `address` varchar(255) NOT NULL,
+  `goto` text NOT NULL,
+  `domain` varchar(255) NOT NULL,
+  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `modified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `active` tinyint(1) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`address`),
+  KEY `domain` (`domain`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='Postfix Admin - Virtual Aliases';
+
+-- --------------------------------------------------------
+
+--
+-- テーブルの構造 `alias_domain`
+--
+
+CREATE TABLE IF NOT EXISTS `alias_domain` (
+  `alias_domain` varchar(255) NOT NULL,
+  `target_domain` varchar(255) NOT NULL,
+  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `modified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `active` tinyint(1) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`alias_domain`),
+  KEY `active` (`active`),
+  KEY `target_domain` (`target_domain`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='Postfix Admin - Domain Aliases';
+
+-- --------------------------------------------------------
+
+--
+-- テーブルの構造 `config`
+--
+
+CREATE TABLE IF NOT EXISTS `config` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(20) CHARACTER SET utf8 NOT NULL DEFAULT '',
+  `value` varchar(20) CHARACTER SET utf8 NOT NULL DEFAULT '',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `name` (`name`)
+) ENGINE=INNODB  DEFAULT CHARSET=utf8 COMMENT='PostfixAdmin settings' AUTO_INCREMENT=2 ;
+
+--
+-- テーブルのデータのダンプ `config`
+--
+
+INSERT INTO `config` (`id`, `name`, `value`) VALUES
+(1, 'version', '740');
+
+-- --------------------------------------------------------
+
+--
+-- テーブルの構造 `domain`
+--
+
+CREATE TABLE IF NOT EXISTS `domain` (
+  `domain` varchar(255) NOT NULL,
+  `description` varchar(255) CHARACTER SET utf8 NOT NULL,
+  `aliases` int(10) NOT NULL DEFAULT '0',
+  `mailboxes` int(10) NOT NULL DEFAULT '0',
+  `maxquota` bigint(20) NOT NULL DEFAULT '0',
+  `quota` bigint(20) NOT NULL DEFAULT '0',
+  `transport` varchar(255) NOT NULL,
+  `backupmx` tinyint(1) NOT NULL DEFAULT '0',
+  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `modified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `active` tinyint(1) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`domain`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='Postfix Admin - Virtual Domains';
+
+--
+-- テーブルのデータのダンプ `domain`
+--
+
+INSERT INTO `domain` (`domain`, `description`, `aliases`, `mailboxes`, `maxquota`, `quota`, `transport`, `backupmx`, `created`, `modified`, `active`) VALUES
+('ALL', '', 0, 0, 0, 0, '', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1);
+
+-- --------------------------------------------------------
+
+--
+-- テーブルの構造 `domain_admins`
+--
+
+CREATE TABLE IF NOT EXISTS `domain_admins` (
+  `username` varchar(255) NOT NULL,
+  `domain` varchar(255) NOT NULL,
+  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `active` tinyint(1) NOT NULL DEFAULT '1',
+  KEY `username` (`username`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='Postfix Admin - Domain Admins';
+
+-- --------------------------------------------------------
+
+--
+-- テーブルの構造 `fetchmail`
+--
+
+CREATE TABLE IF NOT EXISTS `fetchmail` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `mailbox` varchar(255) NOT NULL,
+  `src_server` varchar(255) NOT NULL,
+  `src_auth` enum('password','kerberos_v5','kerberos','kerberos_v4','gssapi','cram-md5','otp','ntlm','msn','ssh','any') CHARACTER SET utf8 DEFAULT NULL,
+  `src_user` varchar(255) NOT NULL,
+  `src_password` varchar(255) NOT NULL,
+  `src_folder` varchar(255) NOT NULL,
+  `poll_time` int(11) unsigned NOT NULL DEFAULT '10',
+  `fetchall` tinyint(1) unsigned NOT NULL DEFAULT '0',
+  `keep` tinyint(1) unsigned NOT NULL DEFAULT '0',
+  `protocol` enum('POP3','IMAP','POP2','ETRN','AUTO') CHARACTER SET utf8 DEFAULT NULL,
+  `usessl` tinyint(1) unsigned NOT NULL DEFAULT '0',
+  `extra_options` text,
+  `returned_text` text,
+  `mda` varchar(255) NOT NULL,
+  `date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`)
+) ENGINE=INNODB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=2 ;
+
+-- --------------------------------------------------------
+
+--
+-- テーブルの構造 `log`
+--
+
+CREATE TABLE IF NOT EXISTS `log` (
+  `timestamp` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `username` varchar(255) NOT NULL,
+  `domain` varchar(255) NOT NULL,
+  `action` varchar(255) NOT NULL,
+  `data` text NOT NULL,
+  KEY `timestamp` (`timestamp`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='Postfix Admin - Log';
+
+
+-- --------------------------------------------------------
+
+--
+-- テーブルの構造 `mailbox`
+--
+
+CREATE TABLE IF NOT EXISTS `mailbox` (
+  `username` varchar(255) NOT NULL,
+  `password` varchar(255) NOT NULL,
+  `name` varchar(255) CHARACTER SET utf8 NOT NULL,
+  `maildir` varchar(255) NOT NULL,
+  `quota` bigint(20) NOT NULL DEFAULT '0',
+  `local_part` varchar(255) NOT NULL,
+  `domain` varchar(255) NOT NULL,
+  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `modified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `active` tinyint(1) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`username`),
+  KEY `domain` (`domain`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='Postfix Admin - Virtual Mailboxes';
+
+
+-- --------------------------------------------------------
+
+--
+-- テーブルの構造 `quota`
+--
+
+CREATE TABLE IF NOT EXISTS `quota` (
+  `username` varchar(255) CHARACTER SET utf8 NOT NULL,
+  `path` varchar(100) CHARACTER SET utf8 NOT NULL,
+  `current` bigint(20) DEFAULT NULL,
+  PRIMARY KEY (`username`,`path`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- テーブルの構造 `quota2`
+--
+
+CREATE TABLE IF NOT EXISTS `quota2` (
+  `username` varchar(100) CHARACTER SET utf8 NOT NULL,
+  `bytes` bigint(20) NOT NULL DEFAULT '0',
+  `messages` int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`username`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- テーブルの構造 `vacation`
+--
+
+CREATE TABLE IF NOT EXISTS `vacation` (
+  `email` varchar(255) NOT NULL,
+  `subject` varchar(255) CHARACTER SET utf8 NOT NULL,
+  `body` text CHARACTER SET utf8 NOT NULL,
+  `cache` text NOT NULL,
+  `domain` varchar(255) NOT NULL,
+  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `active` tinyint(1) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`email`),
+  KEY `email` (`email`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Postfix Admin - Virtual Vacation';
+
+-- --------------------------------------------------------
+
+--
+-- テーブルの構造 `vacation_notification`
+--
+
+CREATE TABLE IF NOT EXISTS `vacation_notification` (
+  `on_vacation` varchar(150) CHARACTER SET utf8 NOT NULL,
+  `notified` varchar(150) NOT NULL,
+  `notified_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`on_vacation`,`notified`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Postfix Admin - Virtual Vacation Notifications';
+
+--
+-- ダンプしたテーブルの制約
+--
+
+--
+-- テーブルの制約 `vacation_notification`
+--
+ALTER TABLE `vacation_notification`
+  ADD CONSTRAINT `vacation_notification_pkey` FOREIGN KEY (`on_vacation`) REFERENCES `vacation` (`email`) ON DELETE CASCADE;
+
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;

data/lib/postfix_admin/admin.rb

@@ -24,7 +24,11 @@ module PostfixAdmin
 
     def super_admin?
       if @super_admin.nil?
-        @super_admin = rel_domains.exists?("ALL")
+        @super_admin = if has_superadmin_column?
+          self.superadmin && rel_domains.exists?("ALL")
+        else
+          rel_domains.exists?("ALL")
+        end
       else
         @super_admin
       end
@@ -35,10 +39,16 @@ module PostfixAdmin
         domain_ids = self.rel_domain_ids.dup
         domain_ids << "ALL"
         self.rel_domain_ids = domain_ids
-        save!
+        self.superadmin = true if has_superadmin_column?
       else
         domain_admins.where(domain: "ALL").delete_all
+        self.superadmin = false if has_superadmin_column?
       end
+      save!
+    end
+
+    def has_superadmin_column?
+      has_attribute?(:superadmin)
     end
 
     def has_admin?(admin)

data/lib/postfix_admin/base.rb

@@ -13,6 +13,7 @@ module PostfixAdmin
       'mailboxes' => 30,
       'maxquota'  => 100,
       'scheme'    => 'CRAM-MD5',
+      'passwordhash_prefix' => true
     }
 
     def initialize(config)
@@ -22,6 +23,11 @@ module PostfixAdmin
       @config[:mailboxes] = config['mailboxes'] || 30
       @config[:maxquota]  = config['maxquota']  || 100
       @config[:scheme]    = config['scheme']    || 'CRAM-MD5'
+      @config[:passwordhash_prefix] = if config['passwordhash_prefix'].nil?
+                                        true
+                                      else
+                                        config['passwordhash_prefix']
+                                      end
     end
 
     def db_setup

data/lib/postfix_admin/cli.rb

@@ -4,7 +4,8 @@ require 'postfix_admin/doveadm'
 
 module PostfixAdmin
   class CLI
-    @config_file = '~/.postfix_admin.conf'
+    DEFAULT_CONFIG_PATH = '~/.postfix_admin.conf'
+    @config_file = DEFAULT_CONFIG_PATH
     MIN_NUM_PASSWORD_CHARACTER = 5
 
     def initialize
@@ -482,9 +483,10 @@ module PostfixAdmin
     private
 
     def hashed_password(password, in_scheme = nil)
+      prefix = @base.config[:passwordhash_prefix]
       scheme = in_scheme || @base.config[:scheme]
       puts "scheme: #{scheme}"
-      PostfixAdmin::Doveadm.password(password, scheme)
+      PostfixAdmin::Doveadm.password(password, scheme, prefix)
     end
   end
 end

data/lib/postfix_admin/doveadm.rb

@@ -9,14 +9,19 @@ module PostfixAdmin
       result.split
     end
 
-    def self.password(in_password, in_scheme)
+    def self.password(in_password, in_scheme, prefix)
       password = Shellwords.escape(in_password)
       scheme  = Shellwords.escape(in_scheme)
       stdin, stdout, stderr = Open3.popen3("#{self.command_name} -s #{scheme} -p #{password}")
       if stderr.readlines.to_s =~ /Fatal:/
         raise Error, stderr.readlines
       else
-        stdout.readlines.first.chomp
+        res = stdout.readlines.first.chomp
+        if prefix
+          res
+        else
+          res.gsub("{#{scheme}}", "")
+        end
       end
     end
 

data/lib/postfix_admin/version.rb

@@ -1,3 +1,3 @@
 module PostfixAdmin
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/postfix_admin.gemspec

@@ -10,6 +10,8 @@ Gem::Specification.new do |gem|
   gem.description   = %q{Command Line Tools for Postfix Admin}
   gem.homepage      = "https://github.com/krhitoshi/postfix_admin"
 
+  gem.required_ruby_version = ">= 2.5.0"
+
   gem.add_dependency 'thor', '~> 1.0.1'
   gem.add_dependency 'activerecord', '~> 6.0.3'
   gem.add_dependency 'mysql2', '>= 0.5.3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postfix_admin
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Hitoshi Kurokawa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-15 00:00:00.000000000 Z
+date: 2020-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -116,18 +116,26 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - CHANGELOG.md
-- Dockerfile
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - Thorfile
 - bin/console
+- docker-admin/Dockerfile
+- docker-admin/config.local.php
+- docker-app-2.5/Dockerfile
+- docker-app/Dockerfile
+- docker-app/docker-entrypoint.sh
+- docker-app/my.cnf
 - docker-compose.yml
-- docker-entrypoint.sh
+- docker-db/postfix.v1841.sql
+- docker-db/postfix.v352.sql
+- docker-db/postfix.v740.sql
 - exe/postfix_admin
 - lib/postfix_admin.rb
 - lib/postfix_admin/admin.rb
@@ -161,7 +169,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/Dockerfile

@@ -1,24 +0,0 @@
-FROM centos:8
-
-RUN dnf -y module enable ruby:2.6 \
-    && dnf -y install \
-    ruby ruby-devel mariadb-devel sqlite-devel gcc make redhat-rpm-config \
-    mariadb dovecot git \
-    && dnf clean all
-
-WORKDIR /app
-
-COPY Gemfile postfix_admin.gemspec ./
-COPY ./lib/postfix_admin/version.rb ./lib/postfix_admin/version.rb
-
-RUN gem install bundler && bundle install
-
-COPY spec/postfix_admin.conf /root/.postfix_admin.conf
-
-COPY docker-entrypoint.sh /docker-entrypoint.sh
-RUN chmod +x /docker-entrypoint.sh
-ENTRYPOINT ["/docker-entrypoint.sh"]
-
-EXPOSE 80
-
-CMD ["/sbin/init"]