Openmailadmin integriert.

Webcyradm ist dagegen rausgefallen. vhosts fuer openmailadmin und phpaj gemacht. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@891 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
2026-04-16 22:13:01 +02:00 · 2007-09-15 18:18:23 +00:00
parent fd1b806160
commit 58493e1ef0
11 changed files with 328 additions and 623 deletions
--- a/config/httpd/conf.d/php5.conf
+++ b/config/httpd/conf.d/php5.conf
@@ -1,11 +1,10 @@
-<IfModule php4_module>
+<IfModule php5_module>
        AddType application/x-httpd-php .php3
        AddType application/x-httpd-php .php4
+        AddType application/x-httpd-php .php5
        AddType application/x-httpd-php .php
-        AddType application/x-httpd-php-source .php3s
-        AddType application/x-httpd-php-source .php4s
-        AddType application/x-httpd-php-source .phps
        DirectoryIndex index.php3
        DirectoryIndex index.php4
+        DirectoryIndex index.php5
        DirectoryIndex index.php
 </IfModule>
--- a/config/httpd/loadmodule.conf
+++ b/config/httpd/loadmodule.conf
@@ -48,4 +48,4 @@ LoadModule dir_module /usr/lib/apache/mod_dir.so
 LoadModule alias_module /usr/lib/apache/mod_alias.so
 LoadModule rewrite_module /usr/lib/apache/mod_rewrite.so
 LoadModule ssl_module /usr/lib/apache/mod_ssl.so
-#LoadModule php5_module /usr/lib/apache/libphp5.so
+LoadModule php5_module /usr/lib/apache/libphp5.so
--- a/config/httpd/vhosts.d/openmailadmin.conf
+++ b/config/httpd/vhosts.d/openmailadmin.conf
@@ -0,0 +1,16 @@
+Listen 1001
+
+<VirtualHost *:1001>
+	
+	DocumentRoot /srv/web/openmailadmin
+	
+	Include /etc/httpd/conf/conf.d/php*.conf
+	
+	<Directory /srv/web/openmailadmin>
+		Options +FollowSymlinks
+		AllowOverride None
+		Order allow,deny
+		Allow from all
+	</Directory>
+	
+</VirtualHost>
--- a/config/httpd/vhosts.d/phpaj.conf
+++ b/config/httpd/vhosts.d/phpaj.conf
@@ -0,0 +1,16 @@
+Listen 1002
+
+<VirtualHost *:1002>
+	
+	DocumentRoot /srv/web/phpaj
+	
+	Include /etc/httpd/conf/conf.d/php*.conf
+	
+	<Directory /srv/web/phpaj>
+		Options None
+		AllowOverride None
+		Order allow,deny
+		Allow from all
+	</Directory>
+	
+</VirtualHost>
--- a/config/rootfiles/packages/applejuice
+++ b/config/rootfiles/packages/applejuice
@@ -1,140 +1,140 @@
+etc/httpd/conf/vhosts.d/phpaj.conf
 etc/rc.d/init.d/applejuice
 #opt/applejuice
 opt/applejuice/ajcore.jar
 opt/applejuice/libajnetmask.so
 #srv/web/phpaj
-srv/web/phpaj/phpaj
 #srv/web/phpaj/phpaj/export
-#srv/web/phpaj/phpaj/export/Default.php
-#srv/web/phpaj/phpaj/export/ajl.php
-#srv/web/phpaj/phpaj/export/bb.php
-#srv/web/phpaj/phpaj/export/html.php
-#srv/web/phpaj/phpaj/index.php
-#srv/web/phpaj/phpaj/language
-#srv/web/phpaj/phpaj/language/deutsch.xml
-#srv/web/phpaj/phpaj/language/english.xml
-#srv/web/phpaj/phpaj/main
-#srv/web/phpaj/phpaj/main/classes
-#srv/web/phpaj/phpaj/main/classes/class_core.php
-#srv/web/phpaj/phpaj/main/classes/class_downloads.php
-#srv/web/phpaj/phpaj/main/classes/class_icons.php
-#srv/web/phpaj/phpaj/main/classes/class_search.php
-#srv/web/phpaj/phpaj/main/classes/class_server.php
-#srv/web/phpaj/phpaj/main/classes/class_share.php
-#srv/web/phpaj/phpaj/main/classes/class_uploads.php
-#srv/web/phpaj/phpaj/main/directory.php
-#srv/web/phpaj/phpaj/main/dl_parts.php
-#srv/web/phpaj/phpaj/main/dl_users.php
-#srv/web/phpaj/phpaj/main/downloads.php
-#srv/web/phpaj/phpaj/main/extras.php
-#srv/web/phpaj/phpaj/main/index.php
-#srv/web/phpaj/phpaj/main/progressbar.php
-#srv/web/phpaj/phpaj/main/search.php
-#srv/web/phpaj/phpaj/main/server.php
-#srv/web/phpaj/phpaj/main/settings.php
-#srv/web/phpaj/phpaj/main/shareexport.php
-#srv/web/phpaj/phpaj/main/sharefiles.php
-#srv/web/phpaj/phpaj/main/shares.php
-#srv/web/phpaj/phpaj/main/showparts.php
-#srv/web/phpaj/phpaj/main/start.php
-#srv/web/phpaj/phpaj/main/status.php
-#srv/web/phpaj/phpaj/main/subs.php
-#srv/web/phpaj/phpaj/main/top.php
-#srv/web/phpaj/phpaj/main/uploads.php
-#srv/web/phpaj/phpaj/minigui
-#srv/web/phpaj/phpaj/minigui/downloads.php
-#srv/web/phpaj/phpaj/minigui/index.php
-#srv/web/phpaj/phpaj/minigui/minigui.php
-#srv/web/phpaj/phpaj/plugins
-#srv/web/phpaj/phpaj/plugins/ajl
-#srv/web/phpaj/phpaj/plugins/ajl/ajl.php
-#srv/web/phpaj/phpaj/plugins/ajl/icon.gif
-#srv/web/phpaj/phpaj/plugins/ajl/info.php
-#srv/web/phpaj/phpaj/plugins/register.php
-#srv/web/phpaj/phpaj/plugins/sharestats
-#srv/web/phpaj/phpaj/plugins/sharestats/info.php
-#srv/web/phpaj/phpaj/plugins/sharestats/sharestats.php
-#srv/web/phpaj/phpaj/plugins/versionchecker
-#srv/web/phpaj/phpaj/plugins/versionchecker/info.php
-#srv/web/phpaj/phpaj/plugins/versionchecker/versionchecker.php
-#srv/web/phpaj/phpaj/plugins/wizard
-#srv/web/phpaj/phpaj/plugins/wizard/icon.gif
-#srv/web/phpaj/phpaj/plugins/wizard/info.php
-#srv/web/phpaj/phpaj/plugins/wizard/wizard.php
-#srv/web/phpaj/phpaj/plugins/wizard/wizard.xml
-#srv/web/phpaj/phpaj/style
-#srv/web/phpaj/phpaj/style/default
-#srv/web/phpaj/phpaj/style/default/default_blue.css
-#srv/web/phpaj/phpaj/style/default/default_green.css
-#srv/web/phpaj/phpaj/style/default/default_grey.css
-#srv/web/phpaj/phpaj/style/default/info.png
-#srv/web/phpaj/phpaj/style/default/minus.png
-#srv/web/phpaj/phpaj/style/default/os
-#srv/web/phpaj/phpaj/style/default/os/bsd.png
-#srv/web/phpaj/phpaj/style/default/os/linux.png
-#srv/web/phpaj/phpaj/style/default/os/mac.png
-#srv/web/phpaj/phpaj/style/default/os/na.png
-#srv/web/phpaj/phpaj/style/default/os/netware.png
-#srv/web/phpaj/phpaj/style/default/os/os2.png
-#srv/web/phpaj/phpaj/style/default/os/solaris.png
-#srv/web/phpaj/phpaj/style/default/os/win.png
-#srv/web/phpaj/phpaj/style/default/plus.png
-#srv/web/phpaj/phpaj/style/default/server
-#srv/web/phpaj/phpaj/style/default/server/alt.gif
-#srv/web/phpaj/phpaj/style/default/server/neu.gif
-#srv/web/phpaj/phpaj/style/default/server/verbinde.gif
-#srv/web/phpaj/phpaj/style/default/server/verbunden.gif
-#srv/web/phpaj/phpaj/style/default/stop.png
-#srv/web/phpaj/phpaj/style/default/tabs
-#srv/web/phpaj/phpaj/style/default/tabs/download.gif
-#srv/web/phpaj/phpaj/style/default/tabs/extras.gif
-#srv/web/phpaj/phpaj/style/default/tabs/kill.gif
-#srv/web/phpaj/phpaj/style/default/tabs/logout.gif
-#srv/web/phpaj/phpaj/style/default/tabs/meinshare.gif
-#srv/web/phpaj/phpaj/style/default/tabs/optionen.gif
-#srv/web/phpaj/phpaj/style/default/tabs/server.gif
-#srv/web/phpaj/phpaj/style/default/tabs/start.gif
-#srv/web/phpaj/phpaj/style/default/tabs/suchen.gif
-#srv/web/phpaj/phpaj/style/default/tabs/upload.gif
-#srv/web/phpaj/phpaj/style/default/user
-#srv/web/phpaj/phpaj/style/default/user/direct.png
-#srv/web/phpaj/phpaj/style/default/user/indirect.png
-#srv/web/phpaj/phpaj/style/default/user/tryindirect.png
-#srv/web/phpaj/phpaj/style/default/user/unknown.png
-#srv/web/phpaj/phpaj/style/default/warnung.gif
-#srv/web/phpaj/phpaj/style/default/x.png
-#srv/web/phpaj/phpaj/style/default_blue.php
-#srv/web/phpaj/phpaj/style/default_green.php
-#srv/web/phpaj/phpaj/style/default_grey.php
-#srv/web/phpaj/phpaj/style/new
-#srv/web/phpaj/phpaj/style/new.php
-#srv/web/phpaj/phpaj/style/new/bg.png
-#srv/web/phpaj/phpaj/style/new/new.css
-#srv/web/phpaj/phpaj/style/tango
-#srv/web/phpaj/phpaj/style/tango.php
-#srv/web/phpaj/phpaj/style/tango/bg.png
-#srv/web/phpaj/phpaj/style/tango/icons
-#srv/web/phpaj/phpaj/style/tango/icons/direct.png
-#srv/web/phpaj/phpaj/style/tango/icons/down.png
-#srv/web/phpaj/phpaj/style/tango/icons/empty.png
-#srv/web/phpaj/phpaj/style/tango/icons/extras.png
-#srv/web/phpaj/phpaj/style/tango/icons/home.png
-#srv/web/phpaj/phpaj/style/tango/icons/indirect.png
-#srv/web/phpaj/phpaj/style/tango/icons/info.png
-#srv/web/phpaj/phpaj/style/tango/icons/kill.png
-#srv/web/phpaj/phpaj/style/tango/icons/logout.png
-#srv/web/phpaj/phpaj/style/tango/icons/minus.png
-#srv/web/phpaj/phpaj/style/tango/icons/plus.png
-#srv/web/phpaj/phpaj/style/tango/icons/preferences.png
-#srv/web/phpaj/phpaj/style/tango/icons/search.png
-#srv/web/phpaj/phpaj/style/tango/icons/server.png
-#srv/web/phpaj/phpaj/style/tango/icons/share.png
-#srv/web/phpaj/phpaj/style/tango/icons/stop.png
-#srv/web/phpaj/phpaj/style/tango/icons/up.png
-#srv/web/phpaj/phpaj/style/tango/icons/warning.png
-#srv/web/phpaj/phpaj/style/tango/icons/x.png
-#srv/web/phpaj/phpaj/style/tango/tango.css
-#srv/web/phpaj/phpaj/vars.php
+srv/web/phpaj/export/Default.php
+srv/web/phpaj/export/ajl.php
+srv/web/phpaj/export/bb.php
+srv/web/phpaj/export/html.php
+srv/web/phpaj/index.php
+#srv/web/phpaj/language
+srv/web/phpaj/language/deutsch.xml
+srv/web/phpaj/language/english.xml
+#srv/web/phpaj/main
+#srv/web/phpaj/main/classes
+srv/web/phpaj/main/classes/class_core.php
+srv/web/phpaj/main/classes/class_downloads.php
+srv/web/phpaj/main/classes/class_icons.php
+srv/web/phpaj/main/classes/class_search.php
+srv/web/phpaj/main/classes/class_server.php
+srv/web/phpaj/main/classes/class_share.php
+srv/web/phpaj/main/classes/class_uploads.php
+srv/web/phpaj/main/directory.php
+srv/web/phpaj/main/dl_parts.php
+srv/web/phpaj/main/dl_users.php
+srv/web/phpaj/main/downloads.php
+srv/web/phpaj/main/extras.php
+srv/web/phpaj/main/index.php
+srv/web/phpaj/main/progressbar.php
+srv/web/phpaj/main/search.php
+srv/web/phpaj/main/server.php
+srv/web/phpaj/main/settings.php
+srv/web/phpaj/main/shareexport.php
+srv/web/phpaj/main/sharefiles.php
+srv/web/phpaj/main/shares.php
+srv/web/phpaj/main/showparts.php
+srv/web/phpaj/main/start.php
+srv/web/phpaj/main/status.php
+srv/web/phpaj/main/subs.php
+srv/web/phpaj/main/top.php
+srv/web/phpaj/main/uploads.php
+#srv/web/phpaj/minigui
+srv/web/phpaj/minigui/downloads.php
+srv/web/phpaj/minigui/index.php
+srv/web/phpaj/minigui/minigui.php
+#srv/web/phpaj/plugins
+#srv/web/phpaj/plugins/ajl
+srv/web/phpaj/plugins/ajl/ajl.php
+srv/web/phpaj/plugins/ajl/icon.gif
+srv/web/phpaj/plugins/ajl/info.php
+srv/web/phpaj/plugins/register.php
+#srv/web/phpaj/plugins/sharestats
+srv/web/phpaj/plugins/sharestats/info.php
+srv/web/phpaj/plugins/sharestats/sharestats.php
+#srv/web/phpaj/plugins/versionchecker
+srv/web/phpaj/plugins/versionchecker/info.php
+srv/web/phpaj/plugins/versionchecker/versionchecker.php
+#srv/web/phpaj/plugins/wizard
+srv/web/phpaj/plugins/wizard/icon.gif
+srv/web/phpaj/plugins/wizard/info.php
+srv/web/phpaj/plugins/wizard/wizard.php
+srv/web/phpaj/plugins/wizard/wizard.xml
+#srv/web/phpaj/style
+#srv/web/phpaj/style/default
+srv/web/phpaj/style/default/default_blue.css
+srv/web/phpaj/style/default/default_green.css
+srv/web/phpaj/style/default/default_grey.css
+srv/web/phpaj/style/default/info.png
+srv/web/phpaj/style/default/minus.png
+#srv/web/phpaj/style/default/os
+srv/web/phpaj/style/default/os/bsd.png
+srv/web/phpaj/style/default/os/linux.png
+srv/web/phpaj/style/default/os/mac.png
+srv/web/phpaj/style/default/os/na.png
+srv/web/phpaj/style/default/os/netware.png
+srv/web/phpaj/style/default/os/os2.png
+srv/web/phpaj/style/default/os/solaris.png
+srv/web/phpaj/style/default/os/win.png
+srv/web/phpaj/style/default/plus.png
+#srv/web/phpaj/style/default/server
+srv/web/phpaj/style/default/server/alt.gif
+srv/web/phpaj/style/default/server/neu.gif
+srv/web/phpaj/style/default/server/verbinde.gif
+srv/web/phpaj/style/default/server/verbunden.gif
+srv/web/phpaj/style/default/stop.png
+#srv/web/phpaj/style/default/tabs
+srv/web/phpaj/style/default/tabs/download.gif
+srv/web/phpaj/style/default/tabs/extras.gif
+srv/web/phpaj/style/default/tabs/kill.gif
+srv/web/phpaj/style/default/tabs/logout.gif
+srv/web/phpaj/style/default/tabs/meinshare.gif
+srv/web/phpaj/style/default/tabs/optionen.gif
+srv/web/phpaj/style/default/tabs/server.gif
+srv/web/phpaj/style/default/tabs/start.gif
+srv/web/phpaj/style/default/tabs/suchen.gif
+srv/web/phpaj/style/default/tabs/upload.gif
+#srv/web/phpaj/style/default/user
+srv/web/phpaj/style/default/user/direct.png
+srv/web/phpaj/style/default/user/indirect.png
+srv/web/phpaj/style/default/user/tryindirect.png
+srv/web/phpaj/style/default/user/unknown.png
+srv/web/phpaj/style/default/warnung.gif
+srv/web/phpaj/style/default/x.png
+srv/web/phpaj/style/default_blue.php
+srv/web/phpaj/style/default_green.php
+srv/web/phpaj/style/default_grey.php
+#srv/web/phpaj/style/new
+srv/web/phpaj/style/new.php
+srv/web/phpaj/style/new/bg.png
+srv/web/phpaj/style/new/new.css
+#srv/web/phpaj/style/tango
+srv/web/phpaj/style/tango.php
+srv/web/phpaj/style/tango/bg.png
+#srv/web/phpaj/style/tango/icons
+srv/web/phpaj/style/tango/icons/direct.png
+srv/web/phpaj/style/tango/icons/down.png
+srv/web/phpaj/style/tango/icons/empty.png
+srv/web/phpaj/style/tango/icons/extras.png
+srv/web/phpaj/style/tango/icons/home.png
+srv/web/phpaj/style/tango/icons/indirect.png
+srv/web/phpaj/style/tango/icons/info.png
+srv/web/phpaj/style/tango/icons/kill.png
+srv/web/phpaj/style/tango/icons/logout.png
+srv/web/phpaj/style/tango/icons/minus.png
+srv/web/phpaj/style/tango/icons/plus.png
+srv/web/phpaj/style/tango/icons/preferences.png
+srv/web/phpaj/style/tango/icons/search.png
+srv/web/phpaj/style/tango/icons/server.png
+srv/web/phpaj/style/tango/icons/share.png
+srv/web/phpaj/style/tango/icons/stop.png
+srv/web/phpaj/style/tango/icons/up.png
+srv/web/phpaj/style/tango/icons/warning.png
+srv/web/phpaj/style/tango/icons/x.png
+srv/web/phpaj/style/tango/tango.css
+srv/web/phpaj/vars.php
 usr/local/bin/applejuicectrl
 #var/ipfire/applejuice
 var/ipfire/applejuice/settings
--- a/config/rootfiles/packages/openmailadmin
+++ b/config/rootfiles/packages/openmailadmin
@@ -0,0 +1,147 @@
+etc/httpd/conf/vhosts.d/openmailadmin.conf
+#srv/web/openmailadmin
+srv/web/openmailadmin/.htaccess
+#srv/web/openmailadmin/INSTALL
+srv/web/openmailadmin/LICENSE
+srv/web/openmailadmin/addresses.php
+#srv/web/openmailadmin/design
+srv/web/openmailadmin/design/exception.css
+srv/web/openmailadmin/design/exception.js
+srv/web/openmailadmin/design/favicon.ico
+srv/web/openmailadmin/design/openmailadmin.js
+srv/web/openmailadmin/design/setup.css
+srv/web/openmailadmin/design/shadow.css
+srv/web/openmailadmin/design/treeview.css
+srv/web/openmailadmin/design/treeview.js
+srv/web/openmailadmin/domains.php
+srv/web/openmailadmin/favicon.ico
+srv/web/openmailadmin/folders.php
+#srv/web/openmailadmin/images
+#srv/web/openmailadmin/images/acl
+srv/web/openmailadmin/images/acl/not.png
+srv/web/openmailadmin/images/acl/yes.png
+srv/web/openmailadmin/images/destination_transfer.gif
+srv/web/openmailadmin/images/error_icon.gif
+srv/web/openmailadmin/images/info_icon.gif
+#srv/web/openmailadmin/images/setup
+srv/web/openmailadmin/images/setup/body.png
+srv/web/openmailadmin/images/setup/head_sh.png
+srv/web/openmailadmin/images/setup/shadow.png
+srv/web/openmailadmin/images/sh_hor.gif
+srv/web/openmailadmin/images/sh_lo.gif
+srv/web/openmailadmin/images/sh_lu.gif
+srv/web/openmailadmin/images/sh_ro.gif
+srv/web/openmailadmin/images/sh_ru.gif
+srv/web/openmailadmin/images/sh_ver.gif
+srv/web/openmailadmin/images/spacer.gif
+#srv/web/openmailadmin/images/treeview
+srv/web/openmailadmin/images/treeview/#.png
+srv/web/openmailadmin/images/treeview/-.png
+srv/web/openmailadmin/images/treeview/act_mbox.png
+srv/web/openmailadmin/images/treeview/ina_mbox.png
+srv/web/openmailadmin/images/treeview/new_mbox.png
+srv/web/openmailadmin/images/ver_bl1.gif
+srv/web/openmailadmin/images/ver_gy1.png
+#srv/web/openmailadmin/inc
+srv/web/openmailadmin/inc/.htaccess
+srv/web/openmailadmin/inc/_append.php
+srv/web/openmailadmin/inc/_prepend.php
+srv/web/openmailadmin/inc/config.inc.php
+#srv/web/openmailadmin/inc/database
+srv/web/openmailadmin/inc/database/domains.adodb.txt
+srv/web/openmailadmin/inc/database/imap_demo.adodb.txt
+srv/web/openmailadmin/inc/database/user.adodb.txt
+srv/web/openmailadmin/inc/database/virtual.adodb.txt
+srv/web/openmailadmin/inc/database/virtual_regexp.adodb.txt
+srv/web/openmailadmin/inc/exception_handler.php
+srv/web/openmailadmin/inc/functions.inc.php
+#srv/web/openmailadmin/inc/lang
+srv/web/openmailadmin/inc/lang/de.inc.php
+srv/web/openmailadmin/inc/lang/en.inc.php
+#srv/web/openmailadmin/inc/lang/pl.inc.php
+#srv/web/openmailadmin/inc/lang/ru.inc.php
+#srv/web/openmailadmin/inc/lang/zh-cn.inc.php
+#srv/web/openmailadmin/inc/lang/zh_CN.inc.php
+#srv/web/openmailadmin/inc/lib
+srv/web/openmailadmin/inc/lib/ConfigurationErrorException.php
+srv/web/openmailadmin/inc/lib/ErrorHandler.php
+srv/web/openmailadmin/inc/lib/HTMLInputTagGenerator.php
+srv/web/openmailadmin/inc/lib/IPasswordStrategy.php
+srv/web/openmailadmin/inc/lib/InputValidatorSuite.php
+srv/web/openmailadmin/inc/lib/Password.php
+srv/web/openmailadmin/inc/lib/PasswordCrypt.php
+srv/web/openmailadmin/inc/lib/PasswordMD5.php
+srv/web/openmailadmin/inc/lib/PasswordPlaintext.php
+srv/web/openmailadmin/inc/lib/PasswordSHA1.php
+srv/web/openmailadmin/inc/lib/Quota.php
+srv/web/openmailadmin/inc/lib/User.php
+#srv/web/openmailadmin/inc/lib/imap
+srv/web/openmailadmin/inc/lib/imap/Cyrus_IMAP.php
+srv/web/openmailadmin/inc/lib/imap/Fake_IMAP.php
+srv/web/openmailadmin/inc/lib/imap/IMAP_Administrator.php
+srv/web/openmailadmin/inc/lib/openmailadmin.php
+srv/web/openmailadmin/inc/miniauth.inc.php
+srv/web/openmailadmin/inc/panel_filter.php
+srv/web/openmailadmin/inc/translation.inc.php
+srv/web/openmailadmin/index.php
+srv/web/openmailadmin/mailboxes.php
+srv/web/openmailadmin/regexp.php
+#srv/web/openmailadmin/samples
+#srv/web/openmailadmin/samples/.htaccess
+#srv/web/openmailadmin/samples/config.local.inc.php
+#srv/web/openmailadmin/samples/cyrus
+#srv/web/openmailadmin/samples/cyrus/cyrus.conf
+#srv/web/openmailadmin/samples/cyrus/imapd.conf
+#srv/web/openmailadmin/samples/oma_mail.daimon.php
+#srv/web/openmailadmin/samples/oma_mail.daimon.pl
+#srv/web/openmailadmin/samples/pam
+#srv/web/openmailadmin/samples/pam/imap
+#srv/web/openmailadmin/samples/pam/imap.caching
+#srv/web/openmailadmin/samples/postfix
+#srv/web/openmailadmin/samples/postfix/canonical.mysql
+#srv/web/openmailadmin/samples/postfix/mydestination.mysql
+#srv/web/openmailadmin/samples/postfix/virtual.mysql
+srv/web/openmailadmin/setup.php
+#srv/web/openmailadmin/templates
+srv/web/openmailadmin/templates/.htaccess
+srv/web/openmailadmin/templates/ExceptionHandler.tpl
+#srv/web/openmailadmin/templates/setup
+srv/web/openmailadmin/templates/setup/footer.tpl
+srv/web/openmailadmin/templates/setup/header.tpl
+srv/web/openmailadmin/templates/setup/step1.tpl
+srv/web/openmailadmin/templates/setup/step2.tpl
+srv/web/openmailadmin/templates/setup/step3.tpl
+#srv/web/openmailadmin/templates/shadow
+srv/web/openmailadmin/templates/shadow/__aux.php
+#srv/web/openmailadmin/templates/shadow/addresses
+srv/web/openmailadmin/templates/shadow/addresses/admin.tpl
+srv/web/openmailadmin/templates/shadow/addresses/list.tpl
+srv/web/openmailadmin/templates/shadow/caption.tpl
+srv/web/openmailadmin/templates/shadow/common-footer.tpl
+srv/web/openmailadmin/templates/shadow/common-footer_nv.tpl
+srv/web/openmailadmin/templates/shadow/common-header.tpl
+#srv/web/openmailadmin/templates/shadow/domains
+srv/web/openmailadmin/templates/shadow/domains/admin.tpl
+srv/web/openmailadmin/templates/shadow/domains/list.tpl
+srv/web/openmailadmin/templates/shadow/error_box.tpl
+srv/web/openmailadmin/templates/shadow/filter_panel.tpl
+#srv/web/openmailadmin/templates/shadow/folders
+srv/web/openmailadmin/templates/shadow/folders/acl_matrix.tpl
+srv/web/openmailadmin/templates/shadow/folders/admin.tpl
+srv/web/openmailadmin/templates/shadow/folders/list.tpl
+srv/web/openmailadmin/templates/shadow/info_box.tpl
+srv/web/openmailadmin/templates/shadow/information.tpl
+srv/web/openmailadmin/templates/shadow/login.tpl
+#srv/web/openmailadmin/templates/shadow/mailboxes
+srv/web/openmailadmin/templates/shadow/mailboxes/admin.tpl
+srv/web/openmailadmin/templates/shadow/mailboxes/list.tpl
+srv/web/openmailadmin/templates/shadow/motd.tpl
+#srv/web/openmailadmin/templates/shadow/navigation
+srv/web/openmailadmin/templates/shadow/navigation/entry.tpl
+srv/web/openmailadmin/templates/shadow/navigation/navigation.tpl
+srv/web/openmailadmin/templates/shadow/outer_shadow_start.tpl
+srv/web/openmailadmin/templates/shadow/outer_shadow_stop.tpl
+srv/web/openmailadmin/templates/shadow/password.tpl
+#srv/web/openmailadmin/templates/shadow/regexp
+srv/web/openmailadmin/templates/shadow/regexp/admin.tpl
+srv/web/openmailadmin/templates/shadow/regexp/list.tpl
--- a/config/rootfiles/packages/webcyradm
+++ b/config/rootfiles/packages/webcyradm
@@ -1,472 +0,0 @@
-#srv/mysql/mail
-srv/mysql/mail/accountuser.MYD
-srv/mysql/mail/accountuser.MYI
-srv/mysql/mail/accountuser.frm
-srv/mysql/mail/adminuser.MYD
-srv/mysql/mail/adminuser.MYI
-srv/mysql/mail/adminuser.frm
-srv/mysql/mail/alias.MYD
-srv/mysql/mail/alias.MYI
-srv/mysql/mail/alias.frm
-srv/mysql/mail/db.opt
-srv/mysql/mail/domain.MYD
-srv/mysql/mail/domain.MYI
-srv/mysql/mail/domain.frm
-srv/mysql/mail/domainadmin.MYD
-srv/mysql/mail/domainadmin.MYI
-srv/mysql/mail/domainadmin.frm
-srv/mysql/mail/log.MYD
-srv/mysql/mail/log.MYI
-srv/mysql/mail/log.frm
-srv/mysql/mail/search.MYD
-srv/mysql/mail/search.MYI
-srv/mysql/mail/search.frm
-srv/mysql/mail/settings.MYD
-srv/mysql/mail/settings.MYI
-srv/mysql/mail/settings.frm
-srv/mysql/mail/virtual.MYD
-srv/mysql/mail/virtual.MYI
-srv/mysql/mail/virtual.frm
-#srv/web/webcyradm
-#srv/web/webcyradm/web-cyradm
-#srv/web/webcyradm/web-cyradm/.cvsignore
-#srv/web/webcyradm/web-cyradm/COPYRIGHT
-#srv/web/webcyradm/web-cyradm/CVS
-#srv/web/webcyradm/web-cyradm/CVS/Entries
-#srv/web/webcyradm/web-cyradm/CVS/Entries.Log
-#srv/web/webcyradm/web-cyradm/CVS/Repository
-#srv/web/webcyradm/web-cyradm/CVS/Root
-#srv/web/webcyradm/web-cyradm/ChangeLog
-#srv/web/webcyradm/web-cyradm/INSTALL
-#srv/web/webcyradm/web-cyradm/README
-#srv/web/webcyradm/web-cyradm/README.translations
-#srv/web/webcyradm/web-cyradm/TO-BE-DONE
-srv/web/webcyradm/web-cyradm/adminuser.php
-srv/web/webcyradm/web-cyradm/aliases.php
-srv/web/webcyradm/web-cyradm/auth.inc.php
-srv/web/webcyradm/web-cyradm/browse.php
-srv/web/webcyradm/web-cyradm/browseaccounts.php
-srv/web/webcyradm/web-cyradm/catchall.php
-srv/web/webcyradm/web-cyradm/change_password.php
-srv/web/webcyradm/web-cyradm/changeadminpasswd.php
-#srv/web/webcyradm/web-cyradm/config
-#srv/web/webcyradm/web-cyradm/config/.cvsignore
-#srv/web/webcyradm/web-cyradm/config/CVS
-#srv/web/webcyradm/web-cyradm/config/CVS/Entries
-#srv/web/webcyradm/web-cyradm/config/CVS/Repository
-#srv/web/webcyradm/web-cyradm/config/CVS/Root
-srv/web/webcyradm/web-cyradm/config/conf.php
-#srv/web/webcyradm/web-cyradm/css
-#srv/web/webcyradm/web-cyradm/css/CVS
-#srv/web/webcyradm/web-cyradm/css/CVS/Entries
-#srv/web/webcyradm/web-cyradm/css/CVS/Repository
-#srv/web/webcyradm/web-cyradm/css/CVS/Root
-srv/web/webcyradm/web-cyradm/css/default.css
-srv/web/webcyradm/web-cyradm/css/green.css
-srv/web/webcyradm/web-cyradm/delete_catchall.php
-srv/web/webcyradm/web-cyradm/deleteaccount.php
-srv/web/webcyradm/web-cyradm/deleteadminuser.php
-srv/web/webcyradm/web-cyradm/deletealias.php
-srv/web/webcyradm/web-cyradm/deletedomain.php
-srv/web/webcyradm/web-cyradm/deleteemail.php
-srv/web/webcyradm/web-cyradm/display.php
-#srv/web/webcyradm/web-cyradm/doc
-#srv/web/webcyradm/web-cyradm/doc/CVS
-#srv/web/webcyradm/web-cyradm/doc/CVS/Entries
-#srv/web/webcyradm/web-cyradm/doc/CVS/Entries.Log
-#srv/web/webcyradm/web-cyradm/doc/CVS/Repository
-#srv/web/webcyradm/web-cyradm/doc/CVS/Root
-#srv/web/webcyradm/web-cyradm/doc/Postfix-Cyrus-Web-cyradm-HOWTO.sgml
-#srv/web/webcyradm/web-cyradm/doc/Postfix-Cyrus-Web-cyradm-HOWTO.txt
-#srv/web/webcyradm/web-cyradm/doc/html
-#srv/web/webcyradm/web-cyradm/doc/html/CVS
-#srv/web/webcyradm/web-cyradm/doc/html/CVS/Entries
-#srv/web/webcyradm/web-cyradm/doc/html/CVS/Entries.Log
-#srv/web/webcyradm/web-cyradm/doc/html/CVS/Repository
-#srv/web/webcyradm/web-cyradm/doc/html/CVS/Root
-#srv/web/webcyradm/web-cyradm/doc/html/HTML.manifest
-#srv/web/webcyradm/web-cyradm/doc/html/big-picture.png
-#srv/web/webcyradm/web-cyradm/doc/html/cyrus-config.html
-#srv/web/webcyradm/web-cyradm/doc/html/docbook.css
-#srv/web/webcyradm/web-cyradm/doc/html/faq.html
-#srv/web/webcyradm/web-cyradm/doc/html/home.png
-#srv/web/webcyradm/web-cyradm/doc/html/imap-account.png
-#srv/web/webcyradm/web-cyradm/doc/html/imap-tls.png
-#srv/web/webcyradm/web-cyradm/doc/html/index.html
-#srv/web/webcyradm/web-cyradm/doc/html/install.html
-#srv/web/webcyradm/web-cyradm/doc/html/installing-anti-spam.html
-#srv/web/webcyradm/web-cyradm/doc/html/intro.html
-#srv/web/webcyradm/web-cyradm/doc/html/moreinfo.html
-#srv/web/webcyradm/web-cyradm/doc/html/mysql-config.html
-#srv/web/webcyradm/web-cyradm/doc/html/pam-config.html
-#srv/web/webcyradm/web-cyradm/doc/html/postfix-config.html
-#srv/web/webcyradm/web-cyradm/doc/html/spam-and-virus-intro.html
-#srv/web/webcyradm/web-cyradm/doc/html/stylesheet-images
-#srv/web/webcyradm/web-cyradm/doc/html/stylesheet-images/CVS
-#srv/web/webcyradm/web-cyradm/doc/html/stylesheet-images/CVS/Entries
-#srv/web/webcyradm/web-cyradm/doc/html/stylesheet-images/CVS/Repository
-#srv/web/webcyradm/web-cyradm/doc/html/stylesheet-images/CVS/Root
-#srv/web/webcyradm/web-cyradm/doc/html/stylesheet-images/caution.gif
-#srv/web/webcyradm/web-cyradm/doc/html/stylesheet-images/home.gif
-#srv/web/webcyradm/web-cyradm/doc/html/stylesheet-images/important.gif
-#srv/web/webcyradm/web-cyradm/doc/html/stylesheet-images/next.gif
-#srv/web/webcyradm/web-cyradm/doc/html/stylesheet-images/note.gif
-#srv/web/webcyradm/web-cyradm/doc/html/stylesheet-images/prev.gif
-#srv/web/webcyradm/web-cyradm/doc/html/stylesheet-images/tip.gif
-#srv/web/webcyradm/web-cyradm/doc/html/stylesheet-images/toc-blank.gif
-#srv/web/webcyradm/web-cyradm/doc/html/stylesheet-images/toc-minus.gif
-#srv/web/webcyradm/web-cyradm/doc/html/stylesheet-images/toc-plus.gif
-#srv/web/webcyradm/web-cyradm/doc/html/stylesheet-images/up.gif
-#srv/web/webcyradm/web-cyradm/doc/html/stylesheet-images/warning.gif
-#srv/web/webcyradm/web-cyradm/doc/html/t1.html
-#srv/web/webcyradm/web-cyradm/doc/html/tech.html
-#srv/web/webcyradm/web-cyradm/doc/html/test.html
-#srv/web/webcyradm/web-cyradm/doc/html/web-cyradm-config.html
-#srv/web/webcyradm/web-cyradm/doc/web-cyradm-redhat.txt
-srv/web/webcyradm/web-cyradm/editaccount.php
-srv/web/webcyradm/web-cyradm/editadminuser.php
-srv/web/webcyradm/web-cyradm/editalias.php
-srv/web/webcyradm/web-cyradm/editdomain.php
-srv/web/webcyradm/web-cyradm/editemail.php
-srv/web/webcyradm/web-cyradm/editservices.php
-srv/web/webcyradm/web-cyradm/failed.php
-srv/web/webcyradm/web-cyradm/footer.inc.php
-srv/web/webcyradm/web-cyradm/forwardaccount.php
-srv/web/webcyradm/web-cyradm/forwardalias.php
-srv/web/webcyradm/web-cyradm/header.inc.php
-#srv/web/webcyradm/web-cyradm/images
-#srv/web/webcyradm/web-cyradm/images/CVS
-#srv/web/webcyradm/web-cyradm/images/CVS/Entries
-#srv/web/webcyradm/web-cyradm/images/CVS/Repository
-#srv/web/webcyradm/web-cyradm/images/CVS/Root
-srv/web/webcyradm/web-cyradm/images/arrow_sort_desc.png
-srv/web/webcyradm/web-cyradm/images/banner.gif
-srv/web/webcyradm/web-cyradm/images/checked.png
-srv/web/webcyradm/web-cyradm/images/false.png
-srv/web/webcyradm/web-cyradm/index.php
-srv/web/webcyradm/web-cyradm/init.php
-#srv/web/webcyradm/web-cyradm/lib
-#srv/web/webcyradm/web-cyradm/lib/CVS
-#srv/web/webcyradm/web-cyradm/lib/CVS/Entries
-#srv/web/webcyradm/web-cyradm/lib/CVS/Repository
-#srv/web/webcyradm/web-cyradm/lib/CVS/Root
-srv/web/webcyradm/web-cyradm/lib/crypto.php
-srv/web/webcyradm/web-cyradm/lib/cyradm.php
-srv/web/webcyradm/web-cyradm/lib/log.php
-srv/web/webcyradm/web-cyradm/lib/nls.php
-srv/web/webcyradm/web-cyradm/lib/poppassd.php
-srv/web/webcyradm/web-cyradm/lib/sieve-php.lib
-srv/web/webcyradm/web-cyradm/lib/sieve_strs.php
-#srv/web/webcyradm/web-cyradm/locale
-#srv/web/webcyradm/web-cyradm/locale/CVS
-#srv/web/webcyradm/web-cyradm/locale/CVS/Entries
-#srv/web/webcyradm/web-cyradm/locale/CVS/Entries.Log
-#srv/web/webcyradm/web-cyradm/locale/CVS/Repository
-#srv/web/webcyradm/web-cyradm/locale/CVS/Root
-#srv/web/webcyradm/web-cyradm/locale/cs
-#srv/web/webcyradm/web-cyradm/locale/cs/CVS
-#srv/web/webcyradm/web-cyradm/locale/cs/CVS/Entries
-#srv/web/webcyradm/web-cyradm/locale/cs/CVS/Entries.Log
-#srv/web/webcyradm/web-cyradm/locale/cs/CVS/Repository
-#srv/web/webcyradm/web-cyradm/locale/cs/CVS/Root
-#srv/web/webcyradm/web-cyradm/locale/cs/LC_MESSAGES
-#srv/web/webcyradm/web-cyradm/locale/cs/LC_MESSAGES/CVS
-#srv/web/webcyradm/web-cyradm/locale/cs/LC_MESSAGES/CVS/Entries
-#srv/web/webcyradm/web-cyradm/locale/cs/LC_MESSAGES/CVS/Repository
-#srv/web/webcyradm/web-cyradm/locale/cs/LC_MESSAGES/CVS/Root
-#srv/web/webcyradm/web-cyradm/locale/cs/LC_MESSAGES/web-cyradm.mo
-#srv/web/webcyradm/web-cyradm/locale/cs/LC_MESSAGES/web-cyradm.po
-#srv/web/webcyradm/web-cyradm/locale/da
-#srv/web/webcyradm/web-cyradm/locale/da/CVS
-#srv/web/webcyradm/web-cyradm/locale/da/CVS/Entries
-#srv/web/webcyradm/web-cyradm/locale/da/CVS/Entries.Log
-#srv/web/webcyradm/web-cyradm/locale/da/CVS/Repository
-#srv/web/webcyradm/web-cyradm/locale/da/CVS/Root
-#srv/web/webcyradm/web-cyradm/locale/da/LC_MESSAGES
-#srv/web/webcyradm/web-cyradm/locale/da/LC_MESSAGES/CVS
-#srv/web/webcyradm/web-cyradm/locale/da/LC_MESSAGES/CVS/Entries
-#srv/web/webcyradm/web-cyradm/locale/da/LC_MESSAGES/CVS/Repository
-#srv/web/webcyradm/web-cyradm/locale/da/LC_MESSAGES/CVS/Root
-#srv/web/webcyradm/web-cyradm/locale/da/LC_MESSAGES/web-cyradm.mo
-#srv/web/webcyradm/web-cyradm/locale/da/LC_MESSAGES/web-cyradm.po
-#srv/web/webcyradm/web-cyradm/locale/de
-#srv/web/webcyradm/web-cyradm/locale/de/CVS
-#srv/web/webcyradm/web-cyradm/locale/de/CVS/Entries
-#srv/web/webcyradm/web-cyradm/locale/de/CVS/Entries.Log
-#srv/web/webcyradm/web-cyradm/locale/de/CVS/Repository
-#srv/web/webcyradm/web-cyradm/locale/de/CVS/Root
-#srv/web/webcyradm/web-cyradm/locale/de/LC_MESSAGES
-#srv/web/webcyradm/web-cyradm/locale/de/LC_MESSAGES/CVS
-#srv/web/webcyradm/web-cyradm/locale/de/LC_MESSAGES/CVS/Entries
-#srv/web/webcyradm/web-cyradm/locale/de/LC_MESSAGES/CVS/Repository
-#srv/web/webcyradm/web-cyradm/locale/de/LC_MESSAGES/CVS/Root
-srv/web/webcyradm/web-cyradm/locale/de/LC_MESSAGES/web-cyradm.mo
-srv/web/webcyradm/web-cyradm/locale/de/LC_MESSAGES/web-cyradm.po
-#srv/web/webcyradm/web-cyradm/locale/en
-#srv/web/webcyradm/web-cyradm/locale/en/CVS
-#srv/web/webcyradm/web-cyradm/locale/en/CVS/Entries
-#srv/web/webcyradm/web-cyradm/locale/en/CVS/Entries.Log
-#srv/web/webcyradm/web-cyradm/locale/en/CVS/Repository
-#srv/web/webcyradm/web-cyradm/locale/en/CVS/Root
-#srv/web/webcyradm/web-cyradm/locale/en/LC_MESSAGES
-#srv/web/webcyradm/web-cyradm/locale/en/LC_MESSAGES/CVS
-#srv/web/webcyradm/web-cyradm/locale/en/LC_MESSAGES/CVS/Entries
-#srv/web/webcyradm/web-cyradm/locale/en/LC_MESSAGES/CVS/Repository
-#srv/web/webcyradm/web-cyradm/locale/en/LC_MESSAGES/CVS/Root
-srv/web/webcyradm/web-cyradm/locale/en/LC_MESSAGES/web-cyradm.mo
-srv/web/webcyradm/web-cyradm/locale/en/LC_MESSAGES/web-cyradm.po
-#srv/web/webcyradm/web-cyradm/locale/es
-#srv/web/webcyradm/web-cyradm/locale/es/CVS
-#srv/web/webcyradm/web-cyradm/locale/es/CVS/Entries
-#srv/web/webcyradm/web-cyradm/locale/es/CVS/Entries.Log
-#srv/web/webcyradm/web-cyradm/locale/es/CVS/Repository
-#srv/web/webcyradm/web-cyradm/locale/es/CVS/Root
-#srv/web/webcyradm/web-cyradm/locale/es/LC_MESSAGES
-#srv/web/webcyradm/web-cyradm/locale/es/LC_MESSAGES/CVS
-#srv/web/webcyradm/web-cyradm/locale/es/LC_MESSAGES/CVS/Entries
-#srv/web/webcyradm/web-cyradm/locale/es/LC_MESSAGES/CVS/Repository
-#srv/web/webcyradm/web-cyradm/locale/es/LC_MESSAGES/CVS/Root
-#srv/web/webcyradm/web-cyradm/locale/es/LC_MESSAGES/web-cyradm.mo
-#srv/web/webcyradm/web-cyradm/locale/es/LC_MESSAGES/web-cyradm.po
-#srv/web/webcyradm/web-cyradm/locale/fr
-#srv/web/webcyradm/web-cyradm/locale/fr/CVS
-#srv/web/webcyradm/web-cyradm/locale/fr/CVS/Entries
-#srv/web/webcyradm/web-cyradm/locale/fr/CVS/Entries.Log
-#srv/web/webcyradm/web-cyradm/locale/fr/CVS/Repository
-#srv/web/webcyradm/web-cyradm/locale/fr/CVS/Root
-#srv/web/webcyradm/web-cyradm/locale/fr/LC_MESSAGES
-#srv/web/webcyradm/web-cyradm/locale/fr/LC_MESSAGES/CVS
-#srv/web/webcyradm/web-cyradm/locale/fr/LC_MESSAGES/CVS/Entries
-#srv/web/webcyradm/web-cyradm/locale/fr/LC_MESSAGES/CVS/Repository
-#srv/web/webcyradm/web-cyradm/locale/fr/LC_MESSAGES/CVS/Root
-#srv/web/webcyradm/web-cyradm/locale/fr/LC_MESSAGES/web-cyradm.mo
-#srv/web/webcyradm/web-cyradm/locale/fr/LC_MESSAGES/web-cyradm.po
-#srv/web/webcyradm/web-cyradm/locale/hu
-#srv/web/webcyradm/web-cyradm/locale/hu/CVS
-#srv/web/webcyradm/web-cyradm/locale/hu/CVS/Entries
-#srv/web/webcyradm/web-cyradm/locale/hu/CVS/Entries.Log
-#srv/web/webcyradm/web-cyradm/locale/hu/CVS/Repository
-#srv/web/webcyradm/web-cyradm/locale/hu/CVS/Root
-#srv/web/webcyradm/web-cyradm/locale/hu/LC_MESSAGES
-#srv/web/webcyradm/web-cyradm/locale/hu/LC_MESSAGES/CVS
-#srv/web/webcyradm/web-cyradm/locale/hu/LC_MESSAGES/CVS/Entries
-#srv/web/webcyradm/web-cyradm/locale/hu/LC_MESSAGES/CVS/Repository
-#srv/web/webcyradm/web-cyradm/locale/hu/LC_MESSAGES/CVS/Root
-#srv/web/webcyradm/web-cyradm/locale/hu/LC_MESSAGES/web-cyradm.mo
-#srv/web/webcyradm/web-cyradm/locale/hu/LC_MESSAGES/web-cyradm.po
-#srv/web/webcyradm/web-cyradm/locale/it
-#srv/web/webcyradm/web-cyradm/locale/it/CVS
-#srv/web/webcyradm/web-cyradm/locale/it/CVS/Entries
-#srv/web/webcyradm/web-cyradm/locale/it/CVS/Entries.Log
-#srv/web/webcyradm/web-cyradm/locale/it/CVS/Repository
-#srv/web/webcyradm/web-cyradm/locale/it/CVS/Root
-#srv/web/webcyradm/web-cyradm/locale/it/LC_MESSAGES
-#srv/web/webcyradm/web-cyradm/locale/it/LC_MESSAGES/CVS
-#srv/web/webcyradm/web-cyradm/locale/it/LC_MESSAGES/CVS/Entries
-#srv/web/webcyradm/web-cyradm/locale/it/LC_MESSAGES/CVS/Repository
-#srv/web/webcyradm/web-cyradm/locale/it/LC_MESSAGES/CVS/Root
-#srv/web/webcyradm/web-cyradm/locale/it/LC_MESSAGES/web-cyradm.mo
-#srv/web/webcyradm/web-cyradm/locale/it/LC_MESSAGES/web-cyradm.po
-#srv/web/webcyradm/web-cyradm/locale/nb_NO
-#srv/web/webcyradm/web-cyradm/locale/nb_NO/CVS
-#srv/web/webcyradm/web-cyradm/locale/nb_NO/CVS/Entries
-#srv/web/webcyradm/web-cyradm/locale/nb_NO/CVS/Entries.Log
-#srv/web/webcyradm/web-cyradm/locale/nb_NO/CVS/Repository
-#srv/web/webcyradm/web-cyradm/locale/nb_NO/CVS/Root
-#srv/web/webcyradm/web-cyradm/locale/nb_NO/LC_MESSAGES
-#srv/web/webcyradm/web-cyradm/locale/nb_NO/LC_MESSAGES/CVS
-#srv/web/webcyradm/web-cyradm/locale/nb_NO/LC_MESSAGES/CVS/Entries
-#srv/web/webcyradm/web-cyradm/locale/nb_NO/LC_MESSAGES/CVS/Repository
-#srv/web/webcyradm/web-cyradm/locale/nb_NO/LC_MESSAGES/CVS/Root
-#srv/web/webcyradm/web-cyradm/locale/nb_NO/LC_MESSAGES/web-cyradm.mo
-#srv/web/webcyradm/web-cyradm/locale/nb_NO/LC_MESSAGES/web-cyradm.po
-#srv/web/webcyradm/web-cyradm/locale/nl
-#srv/web/webcyradm/web-cyradm/locale/nl/CVS
-#srv/web/webcyradm/web-cyradm/locale/nl/CVS/Entries
-#srv/web/webcyradm/web-cyradm/locale/nl/CVS/Entries.Log
-#srv/web/webcyradm/web-cyradm/locale/nl/CVS/Repository
-#srv/web/webcyradm/web-cyradm/locale/nl/CVS/Root
-#srv/web/webcyradm/web-cyradm/locale/nl/LC_MESSAGES
-#srv/web/webcyradm/web-cyradm/locale/nl/LC_MESSAGES/CVS
-#srv/web/webcyradm/web-cyradm/locale/nl/LC_MESSAGES/CVS/Entries
-#srv/web/webcyradm/web-cyradm/locale/nl/LC_MESSAGES/CVS/Repository
-#srv/web/webcyradm/web-cyradm/locale/nl/LC_MESSAGES/CVS/Root
-#srv/web/webcyradm/web-cyradm/locale/nl/LC_MESSAGES/web-cyradm.mo
-#srv/web/webcyradm/web-cyradm/locale/nl/LC_MESSAGES/web-cyradm.po
-#srv/web/webcyradm/web-cyradm/locale/no
-#srv/web/webcyradm/web-cyradm/locale/no/CVS
-#srv/web/webcyradm/web-cyradm/locale/no/CVS/Entries
-#srv/web/webcyradm/web-cyradm/locale/no/CVS/Entries.Log
-#srv/web/webcyradm/web-cyradm/locale/no/CVS/Repository
-#srv/web/webcyradm/web-cyradm/locale/no/CVS/Root
-#srv/web/webcyradm/web-cyradm/locale/no/LC_MESSAGES
-#srv/web/webcyradm/web-cyradm/locale/no/LC_MESSAGES/CVS
-#srv/web/webcyradm/web-cyradm/locale/no/LC_MESSAGES/CVS/Entries
-#srv/web/webcyradm/web-cyradm/locale/no/LC_MESSAGES/CVS/Repository
-#srv/web/webcyradm/web-cyradm/locale/no/LC_MESSAGES/CVS/Root
-#srv/web/webcyradm/web-cyradm/locale/pl
-#srv/web/webcyradm/web-cyradm/locale/pl/CVS
-#srv/web/webcyradm/web-cyradm/locale/pl/CVS/Entries
-#srv/web/webcyradm/web-cyradm/locale/pl/CVS/Entries.Log
-#srv/web/webcyradm/web-cyradm/locale/pl/CVS/Repository
-#srv/web/webcyradm/web-cyradm/locale/pl/CVS/Root
-#srv/web/webcyradm/web-cyradm/locale/pl/LC_MESSAGES
-#srv/web/webcyradm/web-cyradm/locale/pl/LC_MESSAGES/CVS
-#srv/web/webcyradm/web-cyradm/locale/pl/LC_MESSAGES/CVS/Entries
-#srv/web/webcyradm/web-cyradm/locale/pl/LC_MESSAGES/CVS/Repository
-#srv/web/webcyradm/web-cyradm/locale/pl/LC_MESSAGES/CVS/Root
-#srv/web/webcyradm/web-cyradm/locale/pl/LC_MESSAGES/web-cyradm.mo
-#srv/web/webcyradm/web-cyradm/locale/pl/LC_MESSAGES/web-cyradm.po
-#srv/web/webcyradm/web-cyradm/locale/pt
-#srv/web/webcyradm/web-cyradm/locale/pt/CVS
-#srv/web/webcyradm/web-cyradm/locale/pt/CVS/Entries
-#srv/web/webcyradm/web-cyradm/locale/pt/CVS/Entries.Log
-#srv/web/webcyradm/web-cyradm/locale/pt/CVS/Repository
-#srv/web/webcyradm/web-cyradm/locale/pt/CVS/Root
-#srv/web/webcyradm/web-cyradm/locale/pt/LC_MESSAGES
-#srv/web/webcyradm/web-cyradm/locale/pt/LC_MESSAGES/CVS
-#srv/web/webcyradm/web-cyradm/locale/pt/LC_MESSAGES/CVS/Entries
-#srv/web/webcyradm/web-cyradm/locale/pt/LC_MESSAGES/CVS/Repository
-#srv/web/webcyradm/web-cyradm/locale/pt/LC_MESSAGES/CVS/Root
-#srv/web/webcyradm/web-cyradm/locale/pt/LC_MESSAGES/web-cyradm.mo
-#srv/web/webcyradm/web-cyradm/locale/pt/LC_MESSAGES/web-cyradm.po
-#srv/web/webcyradm/web-cyradm/locale/ro
-#srv/web/webcyradm/web-cyradm/locale/ro/CVS
-#srv/web/webcyradm/web-cyradm/locale/ro/CVS/Entries
-#srv/web/webcyradm/web-cyradm/locale/ro/CVS/Entries.Log
-#srv/web/webcyradm/web-cyradm/locale/ro/CVS/Repository
-#srv/web/webcyradm/web-cyradm/locale/ro/CVS/Root
-#srv/web/webcyradm/web-cyradm/locale/ro/LC_MESSAGES
-#srv/web/webcyradm/web-cyradm/locale/ro/LC_MESSAGES/CVS
-#srv/web/webcyradm/web-cyradm/locale/ro/LC_MESSAGES/CVS/Entries
-#srv/web/webcyradm/web-cyradm/locale/ro/LC_MESSAGES/CVS/Repository
-#srv/web/webcyradm/web-cyradm/locale/ro/LC_MESSAGES/CVS/Root
-#srv/web/webcyradm/web-cyradm/locale/ro/LC_MESSAGES/web-cyradm.mo
-#srv/web/webcyradm/web-cyradm/locale/ro/LC_MESSAGES/web-cyradm.po
-#srv/web/webcyradm/web-cyradm/locale/ru
-#srv/web/webcyradm/web-cyradm/locale/ru/CVS
-#srv/web/webcyradm/web-cyradm/locale/ru/CVS/Entries
-#srv/web/webcyradm/web-cyradm/locale/ru/CVS/Entries.Log
-#srv/web/webcyradm/web-cyradm/locale/ru/CVS/Repository
-#srv/web/webcyradm/web-cyradm/locale/ru/CVS/Root
-#srv/web/webcyradm/web-cyradm/locale/ru/LC_MESSAGES
-#srv/web/webcyradm/web-cyradm/locale/ru/LC_MESSAGES/CVS
-#srv/web/webcyradm/web-cyradm/locale/ru/LC_MESSAGES/CVS/Entries
-#srv/web/webcyradm/web-cyradm/locale/ru/LC_MESSAGES/CVS/Repository
-#srv/web/webcyradm/web-cyradm/locale/ru/LC_MESSAGES/CVS/Root
-#srv/web/webcyradm/web-cyradm/locale/ru/LC_MESSAGES/web-cyradm.mo
-#srv/web/webcyradm/web-cyradm/locale/ru/LC_MESSAGES/web-cyradm.po
-#srv/web/webcyradm/web-cyradm/locale/sl
-#srv/web/webcyradm/web-cyradm/locale/sl/CVS
-#srv/web/webcyradm/web-cyradm/locale/sl/CVS/Entries
-#srv/web/webcyradm/web-cyradm/locale/sl/CVS/Entries.Log
-#srv/web/webcyradm/web-cyradm/locale/sl/CVS/Repository
-#srv/web/webcyradm/web-cyradm/locale/sl/CVS/Root
-#srv/web/webcyradm/web-cyradm/locale/sl/LC_MESSAGES
-#srv/web/webcyradm/web-cyradm/locale/sl/LC_MESSAGES/CVS
-#srv/web/webcyradm/web-cyradm/locale/sl/LC_MESSAGES/CVS/Entries
-#srv/web/webcyradm/web-cyradm/locale/sl/LC_MESSAGES/CVS/Repository
-#srv/web/webcyradm/web-cyradm/locale/sl/LC_MESSAGES/CVS/Root
-#srv/web/webcyradm/web-cyradm/locale/sl/LC_MESSAGES/web-cyradm.mo
-#srv/web/webcyradm/web-cyradm/locale/sl/LC_MESSAGES/web-cyradm.po
-#srv/web/webcyradm/web-cyradm/locale/sv
-#srv/web/webcyradm/web-cyradm/locale/sv/CVS
-#srv/web/webcyradm/web-cyradm/locale/sv/CVS/Entries
-#srv/web/webcyradm/web-cyradm/locale/sv/CVS/Entries.Log
-#srv/web/webcyradm/web-cyradm/locale/sv/CVS/Repository
-#srv/web/webcyradm/web-cyradm/locale/sv/CVS/Root
-#srv/web/webcyradm/web-cyradm/locale/sv/LC_MESSAGES
-#srv/web/webcyradm/web-cyradm/locale/sv/LC_MESSAGES/CVS
-#srv/web/webcyradm/web-cyradm/locale/sv/LC_MESSAGES/CVS/Entries
-#srv/web/webcyradm/web-cyradm/locale/sv/LC_MESSAGES/CVS/Repository
-#srv/web/webcyradm/web-cyradm/locale/sv/LC_MESSAGES/CVS/Root
-#srv/web/webcyradm/web-cyradm/locale/sv/LC_MESSAGES/web-cyradm.mo
-#srv/web/webcyradm/web-cyradm/locale/sv/LC_MESSAGES/web-cyradm.po
-#srv/web/webcyradm/web-cyradm/locale/teamnames
-#srv/web/webcyradm/web-cyradm/locale/templates
-#srv/web/webcyradm/web-cyradm/locale/templates/CVS
-#srv/web/webcyradm/web-cyradm/locale/templates/CVS/Entries
-#srv/web/webcyradm/web-cyradm/locale/templates/CVS/Repository
-#srv/web/webcyradm/web-cyradm/locale/templates/CVS/Root
-#srv/web/webcyradm/web-cyradm/locale/templates/web-cyradm.pot
-#srv/web/webcyradm/web-cyradm/locale/tr
-#srv/web/webcyradm/web-cyradm/locale/tr/CVS
-#srv/web/webcyradm/web-cyradm/locale/tr/CVS/Entries
-#srv/web/webcyradm/web-cyradm/locale/tr/CVS/Entries.Log
-#srv/web/webcyradm/web-cyradm/locale/tr/CVS/Repository
-#srv/web/webcyradm/web-cyradm/locale/tr/CVS/Root
-#srv/web/webcyradm/web-cyradm/locale/tr/LC_MESSAGES
-#srv/web/webcyradm/web-cyradm/locale/tr/LC_MESSAGES/CVS
-#srv/web/webcyradm/web-cyradm/locale/tr/LC_MESSAGES/CVS/Entries
-#srv/web/webcyradm/web-cyradm/locale/tr/LC_MESSAGES/CVS/Repository
-#srv/web/webcyradm/web-cyradm/locale/tr/LC_MESSAGES/CVS/Root
-#srv/web/webcyradm/web-cyradm/locale/tr/LC_MESSAGES/web-cyradm.mo
-#srv/web/webcyradm/web-cyradm/locale/tr/LC_MESSAGES/web-cyradm.po
-#srv/web/webcyradm/web-cyradm/locale/uk
-#srv/web/webcyradm/web-cyradm/locale/uk/CVS
-#srv/web/webcyradm/web-cyradm/locale/uk/CVS/Entries
-#srv/web/webcyradm/web-cyradm/locale/uk/CVS/Entries.Log
-#srv/web/webcyradm/web-cyradm/locale/uk/CVS/Repository
-#srv/web/webcyradm/web-cyradm/locale/uk/CVS/Root
-#srv/web/webcyradm/web-cyradm/locale/uk/LC_MESSAGES
-#srv/web/webcyradm/web-cyradm/locale/uk/LC_MESSAGES/CVS
-#srv/web/webcyradm/web-cyradm/locale/uk/LC_MESSAGES/CVS/Entries
-#srv/web/webcyradm/web-cyradm/locale/uk/LC_MESSAGES/CVS/Repository
-#srv/web/webcyradm/web-cyradm/locale/uk/LC_MESSAGES/CVS/Root
-#srv/web/webcyradm/web-cyradm/locale/uk/LC_MESSAGES/web-cyradm.mo
-#srv/web/webcyradm/web-cyradm/locale/uk/LC_MESSAGES/web-cyradm.po
-#srv/web/webcyradm/web-cyradm/locale/zh_CN
-#srv/web/webcyradm/web-cyradm/locale/zh_CN/CVS
-#srv/web/webcyradm/web-cyradm/locale/zh_CN/CVS/Entries
-#srv/web/webcyradm/web-cyradm/locale/zh_CN/CVS/Entries.Log
-#srv/web/webcyradm/web-cyradm/locale/zh_CN/CVS/Repository
-#srv/web/webcyradm/web-cyradm/locale/zh_CN/CVS/Root
-#srv/web/webcyradm/web-cyradm/locale/zh_CN/LC_MESSAGES
-#srv/web/webcyradm/web-cyradm/locale/zh_CN/LC_MESSAGES/CVS
-#srv/web/webcyradm/web-cyradm/locale/zh_CN/LC_MESSAGES/CVS/Entries
-#srv/web/webcyradm/web-cyradm/locale/zh_CN/LC_MESSAGES/CVS/Repository
-#srv/web/webcyradm/web-cyradm/locale/zh_CN/LC_MESSAGES/CVS/Root
-#srv/web/webcyradm/web-cyradm/locale/zh_CN/LC_MESSAGES/web-cyradm.mo
-#srv/web/webcyradm/web-cyradm/locale/zh_CN/LC_MESSAGES/web-cyradm.po
-srv/web/webcyradm/web-cyradm/login.php
-srv/web/webcyradm/web-cyradm/logout.php
-srv/web/webcyradm/web-cyradm/manageaccount.php
-srv/web/webcyradm/web-cyradm/menu.inc.php
-srv/web/webcyradm/web-cyradm/migrate.php-dist
-srv/web/webcyradm/web-cyradm/newaccount.php
-srv/web/webcyradm/web-cyradm/newadminuser.php
-srv/web/webcyradm/web-cyradm/newalias.php
-srv/web/webcyradm/web-cyradm/newdomain.php
-srv/web/webcyradm/web-cyradm/newemail.php
-#srv/web/webcyradm/web-cyradm/scripts
-#srv/web/webcyradm/web-cyradm/scripts/CVS
-#srv/web/webcyradm/web-cyradm/scripts/CVS/Entries
-#srv/web/webcyradm/web-cyradm/scripts/CVS/Repository
-#srv/web/webcyradm/web-cyradm/scripts/CVS/Root
-#srv/web/webcyradm/web-cyradm/scripts/create_mysql.sql
-#srv/web/webcyradm/web-cyradm/scripts/create_pgsql.sql
-srv/web/webcyradm/web-cyradm/scripts/imap2imap-copy.php
-#srv/web/webcyradm/web-cyradm/scripts/insertuser_mysql.sql
-#srv/web/webcyradm/web-cyradm/scripts/insertuser_pgsql.sql
-srv/web/webcyradm/web-cyradm/scripts/php2pot
-srv/web/webcyradm/web-cyradm/scripts/pot2po
-#srv/web/webcyradm/web-cyradm/scripts/upgrade-0.5.2-to-0.5.3_mysql.sql
-#srv/web/webcyradm/web-cyradm/scripts/upgrade-0.5.3-to-0.5.4_mysql.sql
-#srv/web/webcyradm/web-cyradm/scripts/upgrade-0.5.3-to-0.5.4_pgsql.sql
-#srv/web/webcyradm/web-cyradm/scripts/upgrade-0.5.4-to-0.5.5_mysql.sql
-#srv/web/webcyradm/web-cyradm/scripts/upgrade-0.5.4-to-0.5.5_pgsql.sql
-srv/web/webcyradm/web-cyradm/search.php
-srv/web/webcyradm/web-cyradm/session.php
-srv/web/webcyradm/web-cyradm/setquota.php
-srv/web/webcyradm/web-cyradm/settings.php
-#srv/web/webcyradm/web-cyradm/setup
-#srv/web/webcyradm/web-cyradm/setup/CVS
-#srv/web/webcyradm/web-cyradm/setup/CVS/Entries
-#srv/web/webcyradm/web-cyradm/setup/CVS/Repository
-#srv/web/webcyradm/web-cyradm/setup/CVS/Root
-srv/web/webcyradm/web-cyradm/setup/index.php
-srv/web/webcyradm/web-cyradm/setup/populate.php
-srv/web/webcyradm/web-cyradm/timeout.php
-srv/web/webcyradm/web-cyradm/vacation.php
-srv/web/webcyradm/web-cyradm/validate.inc.php
-srv/web/webcyradm/web-cyradm/welcome.php
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -190,6 +190,7 @@
 * ocaml-3.09.2
 * oinkmaster-2.0
 * openldap-2.3.20
+* openmailadmin-1.0.0
 * openssh-4.3p2
 * openssl-0.9.8d
 * openswan-2.4.9
--- a/lfs/applejuice
+++ b/lfs/applejuice
@@ -81,10 +81,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && mkdir -p /opt/applejuice && mv -fv ajcore.jar /opt/applejuice
 	cd $(DIR_APP) && mv -fv libajnetmask.so /opt/applejuice
 	ln -svf ../../opt/applejuice/libajnetmask.so /usr/lib
-	mkdir -p /srv/web/phpaj
-	cd $(DIR_APP) && cp -rfv phpaj /srv/web/phpaj
+	cd $(DIR_APP) && cp -afv phpaj /srv/web
+	chown nobody.nobody /srv/web/phpaj -Rv
 	-mkdir /var/ipfire/applejuice
 	echo "RAMSIZE=64" > /var/ipfire/applejuice/settings
-	chown nobody.nobody /var/ipfire/applejuice -R
+	chown nobody.nobody /var/ipfire/applejuice -Rv
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--- a/lfs/openmailadmin
+++ b/lfs/openmailadmin
@@ -24,14 +24,14 @@

 include Config

-VER        = 0.5.5-CVS-for-ipfire
+VER        = 1.0.0

-THISAPP    = web-cyradm-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+THISAPP    = openmailadmin-$(VER)
+DL_FILE    = $(THISAPP).tbz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = webcyradm
+PROG       = openmailadmin
 PAK_VER    = 1

 DEPS       = "cyrusimap postfix"
@@ -40,13 +40,11 @@ DEPS       = "cyrusimap postfix"
 # Top-level Rules
 ###############################################################################

-objects = $(DL_FILE) mail-db-mysql.tar.gz
+objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-mail-db-mysql.tar.gz = $(DL_FROM)/mail-db-mysql.tar.gz

-$(DL_FILE)_MD5 = 4764e91fd422edc9bbe9d63ed9f07d01
-mail-db-mysql.tar.gz_MD5 = 789ebf5ab48a430c77ca7c1a47a04281
+$(DL_FILE)_MD5 = c56bc9c41f9dd25da9dbf1b63a470333

 install : $(TARGET)

@@ -78,7 +76,7 @@ $(subst %,%_MD5,$(objects)) :

 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	cd $(DIR_SRC) && mkdir -p /srv/web/webcyradm
-	cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) -C /srv/web/webcyradm
-	cd $(DIR_SRC) && tar zxf $(DIR_DL)/mail-db-mysql.tar.gz -C /srv/mysql
+	cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) -C /srv/web
+	mv -v /srv/web/openmailadmin-* /srv/web/openmailadmin
+	chown nobody.nobody /srv/web/openmailadmin/ -Rv
 	@$(POSTBUILD)
--- a/make.sh
+++ b/make.sh
@@ -474,7 +474,7 @@ buildipfire() {
  ipfiremake postfix
  ipfiremake fetchmail
  ipfiremake cyrusimap
-  ipfiremake webcyradm
+  ipfiremake openmailadmin
  ipfiremake mailx
  ipfiremake clamav
  ipfiremake spamassassin