From a6ec986eb1452ead17ddc002629ea31934dc132d Mon Sep 17 00:00:00 2001 From: CHTEKK Date: Tue, 30 Mar 2010 12:47:24 +0000 Subject: Empty dev overlay, as I'm retiring from Gentoo. apps can now be found at http://projects.longitekk.com:8000/Projects/browser/gentoo-ebuilds vda can now be found at http://vda.sourceforge.net/ and http://vda-ng.longitekk.com:8000/VDA-NG/browser (out-of-date) syscp can now be found up-to-date directly from upstream: http://wiki.syscp.org/docs/syscp-howto-gentoo-en coda and versioncp are out-of-date, broken trial runs of some stuff, so they just get deleted svn path=/; revision=104 --- apps/dev-eiffel/eiffelstudio/Manifest | 3 - .../eiffelstudio/eiffelstudio-6.4.79451.ebuild | 59 - apps/dev-eiffel/traffic/Manifest | 2 - apps/dev-eiffel/traffic/traffic-3.3.1104.ebuild | 31 - apps/dev-libs/dnmalloc/Manifest | 2 - apps/dev-libs/dnmalloc/dnmalloc-1.0.ebuild | 23 - apps/dev-libs/safe-iop/Manifest | 2 - apps/dev-libs/safe-iop/safe-iop-0.3.1.ebuild | 24 - apps/media-gfx/brother-brscan2/Manifest | 3 - .../brother-brscan2/brother-brscan2-0.2.4.ebuild | 33 - apps/net-print/brother-cups/Manifest | 3 - .../brother-cups/brother-cups-2.0.1.ebuild | 43 - apps/profiles/categories | 1 - apps/profiles/repo_name | 1 - apps/sys-apps/areca-cli/Manifest | 4 - .../sys-apps/areca-cli/areca-cli-1.80.71012.ebuild | 30 - .../sys-apps/areca-cli/areca-cli-1.82.81103.ebuild | 30 - apps/sys-apps/areca-http/Manifest | 5 - .../areca-http/areca-http-1.82.70911.ebuild | 32 - .../areca-http/areca-http-1.83.81103.ebuild | 32 - apps/sys-apps/areca-http/files/areca-http-initd | 35 - coda/net-fs/coda/Manifest | 8 - coda/net-fs/coda/coda-6.9.3.ebuild | 98 -- coda/net-fs/coda/files/auth2 | 30 - .../net-fs/coda/files/coda-6.9.3-gentoo-dirs.patch | 332 ----- coda/net-fs/coda/files/coda-update | 40 - coda/net-fs/coda/files/codasrv | 26 - coda/net-fs/coda/files/venus | 29 - coda/net-fs/coda/metadata.xml | 9 - coda/net-libs/rpc2/Manifest | 3 - coda/net-libs/rpc2/metadata.xml | 9 - coda/net-libs/rpc2/rpc2-2.7.ebuild | 26 - coda/profiles/repo_name | 1 - coda/sys-libs/lwp/Manifest | 4 - coda/sys-libs/lwp/files/lwp-2.4-imp_dec.patch | 11 - coda/sys-libs/lwp/lwp-2.4.ebuild | 32 - coda/sys-libs/lwp/metadata.xml | 9 - coda/sys-libs/rvm/Manifest | 3 - coda/sys-libs/rvm/metadata.xml | 9 - coda/sys-libs/rvm/rvm-1.15.ebuild | 25 - .../bind-ssl/etc_libnss-mysql-root.cfg | 2 - .../bind-ssl/etc_libnss-mysql.cfg | 38 - .../bind-ssl/gentoo/bind/etc_bind_default.zone | 21 - .../bind-ssl/gentoo/courier/etc_courier-imap_imapd | 376 ----- .../gentoo/courier/etc_courier-imap_imapd-ssl | 199 --- .../bind-ssl/gentoo/courier/etc_courier-imap_pop3d | 127 -- .../gentoo/courier/etc_courier-imap_pop3d-ssl | 186 --- .../courier/etc_courier_authlib_authdaemonrc | 93 -- .../gentoo/courier/etc_courier_authlib_authmysqlrc | 12 - .../bind-ssl/gentoo/cron/etc_cron.d_syscp | 10 - .../gentoo/cron/etc_php_syscp-cronjob_php.ini | 61 - .../gentoo/cron/etc_php_syscp-vhost_php.ini | 61 - .../bind-ssl/gentoo/postfix/etc_postfix_main.cf | 65 - .../etc_postfix_mysql-virtual_alias_maps.cf | 8 - .../etc_postfix_mysql-virtual_mailbox_domains.cf | 8 - .../etc_postfix_mysql-virtual_mailbox_maps.cf | 7 - .../bind-ssl/gentoo/postfix/etc_sasl2_smtpd.conf | 12 - .../gentoo/proftpd/etc_proftpd_proftpd.conf | 89 -- ...cp-1.2.13-gentoo-admin_configfiles.php-bind-ssl | 290 ---- .../syscp-1.2.13-gentoo-config-bind-ssl-r2.tar.bz2 | Bin 15312 -> 0 bytes .../bind/etc_libnss-mysql-root.cfg | 2 - .../gentoo-config-files/bind/etc_libnss-mysql.cfg | 38 - .../bind/gentoo/bind/etc_bind_default.zone | 21 - .../bind/gentoo/courier/etc_courier-imap_imapd | 376 ----- .../bind/gentoo/courier/etc_courier-imap_imapd-ssl | 199 --- .../bind/gentoo/courier/etc_courier-imap_pop3d | 127 -- .../bind/gentoo/courier/etc_courier-imap_pop3d-ssl | 186 --- .../courier/etc_courier_authlib_authdaemonrc | 93 -- .../gentoo/courier/etc_courier_authlib_authmysqlrc | 12 - .../bind/gentoo/cron/etc_cron.d_syscp | 10 - .../bind/gentoo/cron/etc_php_syscp-cronjob_php.ini | 61 - .../bind/gentoo/cron/etc_php_syscp-vhost_php.ini | 61 - .../bind/gentoo/postfix/etc_postfix_main.cf | 65 - .../etc_postfix_mysql-virtual_alias_maps.cf | 8 - .../etc_postfix_mysql-virtual_mailbox_domains.cf | 8 - .../etc_postfix_mysql-virtual_mailbox_maps.cf | 7 - .../bind/gentoo/postfix/etc_sasl2_smtpd.conf | 12 - .../bind/gentoo/proftpd/etc_proftpd_proftpd.conf | 89 -- .../syscp-1.2.13-gentoo-admin_configfiles.php-bind | 286 ---- .../syscp-1.2.13-gentoo-config-bind-r2.tar.bz2 | Bin 15280 -> 0 bytes .../nodns-ssl/etc_libnss-mysql-root.cfg | 2 - .../nodns-ssl/etc_libnss-mysql.cfg | 38 - .../gentoo/courier/etc_courier-imap_imapd | 376 ----- .../gentoo/courier/etc_courier-imap_imapd-ssl | 199 --- .../gentoo/courier/etc_courier-imap_pop3d | 127 -- .../gentoo/courier/etc_courier-imap_pop3d-ssl | 186 --- .../courier/etc_courier_authlib_authdaemonrc | 93 -- .../gentoo/courier/etc_courier_authlib_authmysqlrc | 12 - .../nodns-ssl/gentoo/cron/etc_cron.d_syscp | 10 - .../gentoo/cron/etc_php_syscp-cronjob_php.ini | 61 - .../gentoo/cron/etc_php_syscp-vhost_php.ini | 61 - .../nodns-ssl/gentoo/postfix/etc_postfix_main.cf | 65 - .../etc_postfix_mysql-virtual_alias_maps.cf | 8 - .../etc_postfix_mysql-virtual_mailbox_domains.cf | 8 - .../etc_postfix_mysql-virtual_mailbox_maps.cf | 7 - .../nodns-ssl/gentoo/postfix/etc_sasl2_smtpd.conf | 12 - .../gentoo/proftpd/etc_proftpd_proftpd.conf | 89 -- ...p-1.2.13-gentoo-admin_configfiles.php-nodns-ssl | 270 ---- ...syscp-1.2.13-gentoo-config-nodns-ssl-r2.tar.bz2 | Bin 15035 -> 0 bytes .../nodns/etc_libnss-mysql-root.cfg | 2 - .../gentoo-config-files/nodns/etc_libnss-mysql.cfg | 38 - .../nodns/gentoo/courier/etc_courier-imap_imapd | 376 ----- .../gentoo/courier/etc_courier-imap_imapd-ssl | 199 --- .../nodns/gentoo/courier/etc_courier-imap_pop3d | 127 -- .../gentoo/courier/etc_courier-imap_pop3d-ssl | 186 --- .../courier/etc_courier_authlib_authdaemonrc | 93 -- .../gentoo/courier/etc_courier_authlib_authmysqlrc | 12 - .../nodns/gentoo/cron/etc_cron.d_syscp | 10 - .../gentoo/cron/etc_php_syscp-cronjob_php.ini | 61 - .../nodns/gentoo/cron/etc_php_syscp-vhost_php.ini | 61 - .../nodns/gentoo/postfix/etc_postfix_main.cf | 65 - .../etc_postfix_mysql-virtual_alias_maps.cf | 8 - .../etc_postfix_mysql-virtual_mailbox_domains.cf | 8 - .../etc_postfix_mysql-virtual_mailbox_maps.cf | 7 - .../nodns/gentoo/postfix/etc_sasl2_smtpd.conf | 12 - .../nodns/gentoo/proftpd/etc_proftpd_proftpd.conf | 89 -- ...syscp-1.2.13-gentoo-admin_configfiles.php-nodns | 266 ---- .../syscp-1.2.13-gentoo-config-nodns-r2.tar.bz2 | Bin 15032 -> 0 bytes .../gentoo-syscp-design/images/ball.gif | Bin 51 -> 0 bytes .../gentoo-syscp-design/images/cambialingua.gif | Bin 10380 -> 0 bytes .../gentoo-syscp-design/images/errore.gif | Bin 1294 -> 0 bytes .../gentoo-syscp-design/images/finesezione.gif | Bin 4383 -> 0 bytes .../gentoo-syscp-design/images/footer.gif | Bin 21262 -> 0 bytes .../gentoo-syscp-design/images/header.gif | Bin 37730 -> 0 bytes .../gentoo-syscp-design/images/header_r.gif | Bin 686 -> 0 bytes .../gentoo-syscp-design/images/login.gif | Bin 1406 -> 0 bytes .../gentoo-syscp-design/images/logininterno.gif | Bin 3355 -> 0 bytes .../gentoo-syscp-design/images/ombra.gif | Bin 122 -> 0 bytes .../gentoo-syscp-design/images/order_asc.gif | Bin 62 -> 0 bytes .../gentoo-syscp-design/images/order_desc.gif | Bin 60 -> 0 bytes .../gentoo-syscp-design/images/sezione.gif | Bin 4386 -> 0 bytes .../gentoo-syscp-design/images/sottosezione.gif | Bin 3639 -> 0 bytes .../gentoo-syscp-design/images/titolo.gif | Bin 69 -> 0 bytes .../gentoo-syscp-design/images/valid-xhtml10 | Bin 2414 -> 0 bytes .../gentoo-syscp-design/images/vcss | Bin 1547 -> 0 bytes .../templates/admin/admins/admins.tpl | 29 - .../templates/admin/admins/admins_add.tpl | 89 -- .../templates/admin/admins/admins_admin.tpl | 11 - .../templates/admin/admins/admins_edit.tpl | 94 -- .../templates/admin/configfiles/choose.tpl | 10 - .../templates/admin/configfiles/choose_daemon.tpl | 2 - .../admin/configfiles/choose_distribution.tpl | 12 - .../templates/admin/configfiles/configfiles.tpl | 24 - .../admin/configfiles/configfiles_file.tpl | 1 - .../templates/admin/customers/customers.tpl | 39 - .../templates/admin/customers/customers_add.tpl | 109 -- .../admin/customers/customers_customer.tpl | 18 - .../templates/admin/customers/customers_edit.tpl | 114 -- .../templates/admin/domains/domains.tpl | 32 - .../templates/admin/domains/domains_add.tpl | 77 -- .../templates/admin/domains/domains_domain.tpl | 8 - .../templates/admin/domains/domains_edit.tpl | 80 -- .../templates/admin/index/change_language.tpl | 23 - .../templates/admin/index/change_password.tpl | 31 - .../templates/admin/index/index.tpl | 91 -- .../templates/admin/ipsandports/ipsandports.tpl | 30 - .../admin/ipsandports/ipsandports_add.tpl | 25 - .../admin/ipsandports/ipsandports_edit.tpl | 26 - .../admin/ipsandports/ipsandports_ipandport.tpl | 6 - .../templates/admin/settings/settings.tpl | 121 -- .../templates/admin/templates/templates.tpl | 20 - .../templates/admin/templates/templates_add_1.tpl | 21 - .../templates/admin/templates/templates_add_2.tpl | 66 - .../templates/admin/templates/templates_edit.tpl | 68 - .../admin/templates/templates_template.tpl | 6 - .../templates/customer/domains/domainlist.tpl | 30 - .../templates/customer/domains/domains.tpl | 12 - .../templates/customer/domains/domains_add.tpl | 29 - .../customer/domains/domains_delimiter.tpl | 3 - .../templates/customer/domains/domains_domain.tpl | 6 - .../templates/customer/domains/domains_edit.tpl | 44 - .../templates/customer/email/account_add.tpl | 26 - .../templates/customer/email/account_changepw.tpl | 26 - .../templates/customer/email/email.tpl | 12 - .../templates/customer/email/emails.tpl | 27 - .../templates/customer/email/emails_add.tpl | 25 - .../templates/customer/email/emails_domain.tpl | 3 - .../templates/customer/email/emails_edit.tpl | 40 - .../customer/email/emails_edit_forwarder.tpl | 2 - .../templates/customer/email/emails_email.tpl | 8 - .../templates/customer/email/forwarder_add.tpl | 26 - .../templates/customer/extras/extras.tpl | 12 - .../templates/customer/extras/htaccess.tpl | 21 - .../templates/customer/extras/htaccess_add.tpl | 37 - .../templates/customer/extras/htaccess_edit.tpl | 38 - .../customer/extras/htaccess_htaccess.tpl | 9 - .../templates/customer/extras/htpasswds.tpl | 18 - .../templates/customer/extras/htpasswds_add.tpl | 29 - .../templates/customer/extras/htpasswds_edit.tpl | 30 - .../customer/extras/htpasswds_htpasswd.tpl | 6 - .../templates/customer/ftp/accounts.tpl | 30 - .../templates/customer/ftp/accounts_account.tpl | 6 - .../templates/customer/ftp/accounts_add.tpl | 25 - .../templates/customer/ftp/accounts_edit.tpl | 26 - .../templates/customer/ftp/ftp.tpl | 12 - .../templates/customer/index/change_language.tpl | 23 - .../templates/customer/index/change_password.tpl | 34 - .../templates/customer/index/index.tpl | 76 - .../templates/customer/mysql/mysql.tpl | 12 - .../templates/customer/mysql/mysqls.tpl | 25 - .../templates/customer/mysql/mysqls_add.tpl | 25 - .../templates/customer/mysql/mysqls_database.tpl | 6 - .../templates/customer/mysql/mysqls_edit.tpl | 30 - .../gentoo-syscp-design/templates/footer.tpl | 16 - .../gentoo-syscp-design/templates/header.tpl | 28 - .../gentoo-syscp-design/templates/login/login.tpl | 33 - .../gentoo-syscp-design/templates/maincss.css | 244 ---- .../gentoo-syscp-design/templates/misc/error.tpl | 13 - .../templates/misc/question_yesno.tpl | 18 - .../templates/misc/standardcustomer/index.html | 11 - .../templates/navigation_element.tpl | 12 - .../templates/navigation_link.tpl | 2 - .../syscp-1.2.13-gentoo-syscp-design-r3.tar.bz2 | Bin 104718 -> 0 bytes syscp/patches/italian-lang/italian.lng.php | 407 ------ .../syscp-1.2.13-mysql-ftp-patch-r3.tar.bz2 | Bin 6182 -> 0 bytes .../mysql-ftp-patch/syscp-1.2.13-mysqli-ftpi.patch | 712 ---------- .../options-patch/syscp-1.2.13-moreoptions.patch | 585 -------- .../syscp-1.2.13-options-patch-r3.tar.bz2 | Bin 6086 -> 0 bytes .../syscp-1.2.13-suexec-patch-r3.tar.bz2 | Bin 454 -> 0 bytes .../suexec-patch/syscp-1.2.13-suexec-support.patch | 11 - .../syscp-1.2.13-suphp-patch-r3.tar.bz2 | Bin 4019 -> 0 bytes .../suphp-patch/syscp-1.2.13-suphp-support.patch | 370 ----- .../syscp-1.2.13-gentoo-compatibility.patch | 83 -- .../syscp-patches/syscp-1.2.13-patches-r3.tar.bz2 | Bin 1971 -> 0 bytes .../syscp-sqlfile/syscp-1.2.13-addopts-db.sql | 7 - .../syscp-sqlfile/syscp-1.2.13-baseinstall-db.sql | 646 --------- .../syscp-sqlfile/syscp-1.2.13-mysqlftpimp-db.sql | 15 - .../syscp-sqlfile/syscp-1.2.13-sqlfile-r3.tar.bz2 | Bin 4092 -> 0 bytes .../syscp-sqlfile/syscp-1.2.13-suphp-db.sql | 3 - syscp/www-apps/syscp/Manifest | 23 - syscp/www-apps/syscp/files/digest-syscp-1.2.13 | 36 - syscp/www-apps/syscp/metadata.xml | 8 - syscp/www-apps/syscp/syscp-1.2.13.ebuild | 855 ------------ vda/postfix-2.5.1-vda-ng-r2.patch.gz | Bin 12504 -> 0 bytes vda/postfix-2.5.1-vda-ng.patch | 1449 -------------------- versioncp/commontest | 24 - versioncp/dump.sql | 21 - versioncp/main.css | 47 - versioncp/show_versions.php | 312 ----- versioncp/svnupdater | 96 -- versioncp/update_versions.php | 494 ------- versioncp/upstscripts/berlios | 16 - versioncp/upstscripts/ezcomponents | 17 - versioncp/upstscripts/freshmeat | 14 - versioncp/upstscripts/php-pear | 17 - versioncp/upstscripts/php-pecl | 19 - versioncp/upstscripts/sourceforge | 16 - 247 files changed, 16484 deletions(-) delete mode 100644 apps/dev-eiffel/eiffelstudio/Manifest delete mode 100644 apps/dev-eiffel/eiffelstudio/eiffelstudio-6.4.79451.ebuild delete mode 100644 apps/dev-eiffel/traffic/Manifest delete mode 100644 apps/dev-eiffel/traffic/traffic-3.3.1104.ebuild delete mode 100644 apps/dev-libs/dnmalloc/Manifest delete mode 100644 apps/dev-libs/dnmalloc/dnmalloc-1.0.ebuild delete mode 100644 apps/dev-libs/safe-iop/Manifest delete mode 100644 apps/dev-libs/safe-iop/safe-iop-0.3.1.ebuild delete mode 100644 apps/media-gfx/brother-brscan2/Manifest delete mode 100644 apps/media-gfx/brother-brscan2/brother-brscan2-0.2.4.ebuild delete mode 100644 apps/net-print/brother-cups/Manifest delete mode 100644 apps/net-print/brother-cups/brother-cups-2.0.1.ebuild delete mode 100644 apps/profiles/categories delete mode 100644 apps/profiles/repo_name delete mode 100644 apps/sys-apps/areca-cli/Manifest delete mode 100644 apps/sys-apps/areca-cli/areca-cli-1.80.71012.ebuild delete mode 100644 apps/sys-apps/areca-cli/areca-cli-1.82.81103.ebuild delete mode 100644 apps/sys-apps/areca-http/Manifest delete mode 100644 apps/sys-apps/areca-http/areca-http-1.82.70911.ebuild delete mode 100644 apps/sys-apps/areca-http/areca-http-1.83.81103.ebuild delete mode 100644 apps/sys-apps/areca-http/files/areca-http-initd delete mode 100644 coda/net-fs/coda/Manifest delete mode 100644 coda/net-fs/coda/coda-6.9.3.ebuild delete mode 100644 coda/net-fs/coda/files/auth2 delete mode 100644 coda/net-fs/coda/files/coda-6.9.3-gentoo-dirs.patch delete mode 100644 coda/net-fs/coda/files/coda-update delete mode 100644 coda/net-fs/coda/files/codasrv delete mode 100644 coda/net-fs/coda/files/venus delete mode 100644 coda/net-fs/coda/metadata.xml delete mode 100644 coda/net-libs/rpc2/Manifest delete mode 100644 coda/net-libs/rpc2/metadata.xml delete mode 100644 coda/net-libs/rpc2/rpc2-2.7.ebuild delete mode 100644 coda/profiles/repo_name delete mode 100644 coda/sys-libs/lwp/Manifest delete mode 100644 coda/sys-libs/lwp/files/lwp-2.4-imp_dec.patch delete mode 100644 coda/sys-libs/lwp/lwp-2.4.ebuild delete mode 100644 coda/sys-libs/lwp/metadata.xml delete mode 100644 coda/sys-libs/rvm/Manifest delete mode 100644 coda/sys-libs/rvm/metadata.xml delete mode 100644 coda/sys-libs/rvm/rvm-1.15.ebuild delete mode 100644 syscp/patches/gentoo-config-files/bind-ssl/etc_libnss-mysql-root.cfg delete mode 100644 syscp/patches/gentoo-config-files/bind-ssl/etc_libnss-mysql.cfg delete mode 100644 syscp/patches/gentoo-config-files/bind-ssl/gentoo/bind/etc_bind_default.zone delete mode 100644 syscp/patches/gentoo-config-files/bind-ssl/gentoo/courier/etc_courier-imap_imapd delete mode 100644 syscp/patches/gentoo-config-files/bind-ssl/gentoo/courier/etc_courier-imap_imapd-ssl delete mode 100644 syscp/patches/gentoo-config-files/bind-ssl/gentoo/courier/etc_courier-imap_pop3d delete mode 100644 syscp/patches/gentoo-config-files/bind-ssl/gentoo/courier/etc_courier-imap_pop3d-ssl delete mode 100644 syscp/patches/gentoo-config-files/bind-ssl/gentoo/courier/etc_courier_authlib_authdaemonrc delete mode 100644 syscp/patches/gentoo-config-files/bind-ssl/gentoo/courier/etc_courier_authlib_authmysqlrc delete mode 100644 syscp/patches/gentoo-config-files/bind-ssl/gentoo/cron/etc_cron.d_syscp delete mode 100644 syscp/patches/gentoo-config-files/bind-ssl/gentoo/cron/etc_php_syscp-cronjob_php.ini delete mode 100644 syscp/patches/gentoo-config-files/bind-ssl/gentoo/cron/etc_php_syscp-vhost_php.ini delete mode 100644 syscp/patches/gentoo-config-files/bind-ssl/gentoo/postfix/etc_postfix_main.cf delete mode 100644 syscp/patches/gentoo-config-files/bind-ssl/gentoo/postfix/etc_postfix_mysql-virtual_alias_maps.cf delete mode 100644 syscp/patches/gentoo-config-files/bind-ssl/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf delete mode 100644 syscp/patches/gentoo-config-files/bind-ssl/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf delete mode 100644 syscp/patches/gentoo-config-files/bind-ssl/gentoo/postfix/etc_sasl2_smtpd.conf delete mode 100644 syscp/patches/gentoo-config-files/bind-ssl/gentoo/proftpd/etc_proftpd_proftpd.conf delete mode 100644 syscp/patches/gentoo-config-files/bind-ssl/syscp-1.2.13-gentoo-admin_configfiles.php-bind-ssl delete mode 100644 syscp/patches/gentoo-config-files/bind-ssl/syscp-1.2.13-gentoo-config-bind-ssl-r2.tar.bz2 delete mode 100644 syscp/patches/gentoo-config-files/bind/etc_libnss-mysql-root.cfg delete mode 100644 syscp/patches/gentoo-config-files/bind/etc_libnss-mysql.cfg delete mode 100644 syscp/patches/gentoo-config-files/bind/gentoo/bind/etc_bind_default.zone delete mode 100644 syscp/patches/gentoo-config-files/bind/gentoo/courier/etc_courier-imap_imapd delete mode 100644 syscp/patches/gentoo-config-files/bind/gentoo/courier/etc_courier-imap_imapd-ssl delete mode 100644 syscp/patches/gentoo-config-files/bind/gentoo/courier/etc_courier-imap_pop3d delete mode 100644 syscp/patches/gentoo-config-files/bind/gentoo/courier/etc_courier-imap_pop3d-ssl delete mode 100644 syscp/patches/gentoo-config-files/bind/gentoo/courier/etc_courier_authlib_authdaemonrc delete mode 100644 syscp/patches/gentoo-config-files/bind/gentoo/courier/etc_courier_authlib_authmysqlrc delete mode 100644 syscp/patches/gentoo-config-files/bind/gentoo/cron/etc_cron.d_syscp delete mode 100644 syscp/patches/gentoo-config-files/bind/gentoo/cron/etc_php_syscp-cronjob_php.ini delete mode 100644 syscp/patches/gentoo-config-files/bind/gentoo/cron/etc_php_syscp-vhost_php.ini delete mode 100644 syscp/patches/gentoo-config-files/bind/gentoo/postfix/etc_postfix_main.cf delete mode 100644 syscp/patches/gentoo-config-files/bind/gentoo/postfix/etc_postfix_mysql-virtual_alias_maps.cf delete mode 100644 syscp/patches/gentoo-config-files/bind/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf delete mode 100644 syscp/patches/gentoo-config-files/bind/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf delete mode 100644 syscp/patches/gentoo-config-files/bind/gentoo/postfix/etc_sasl2_smtpd.conf delete mode 100644 syscp/patches/gentoo-config-files/bind/gentoo/proftpd/etc_proftpd_proftpd.conf delete mode 100644 syscp/patches/gentoo-config-files/bind/syscp-1.2.13-gentoo-admin_configfiles.php-bind delete mode 100644 syscp/patches/gentoo-config-files/bind/syscp-1.2.13-gentoo-config-bind-r2.tar.bz2 delete mode 100644 syscp/patches/gentoo-config-files/nodns-ssl/etc_libnss-mysql-root.cfg delete mode 100644 syscp/patches/gentoo-config-files/nodns-ssl/etc_libnss-mysql.cfg delete mode 100644 syscp/patches/gentoo-config-files/nodns-ssl/gentoo/courier/etc_courier-imap_imapd delete mode 100644 syscp/patches/gentoo-config-files/nodns-ssl/gentoo/courier/etc_courier-imap_imapd-ssl delete mode 100644 syscp/patches/gentoo-config-files/nodns-ssl/gentoo/courier/etc_courier-imap_pop3d delete mode 100644 syscp/patches/gentoo-config-files/nodns-ssl/gentoo/courier/etc_courier-imap_pop3d-ssl delete mode 100644 syscp/patches/gentoo-config-files/nodns-ssl/gentoo/courier/etc_courier_authlib_authdaemonrc delete mode 100644 syscp/patches/gentoo-config-files/nodns-ssl/gentoo/courier/etc_courier_authlib_authmysqlrc delete mode 100644 syscp/patches/gentoo-config-files/nodns-ssl/gentoo/cron/etc_cron.d_syscp delete mode 100644 syscp/patches/gentoo-config-files/nodns-ssl/gentoo/cron/etc_php_syscp-cronjob_php.ini delete mode 100644 syscp/patches/gentoo-config-files/nodns-ssl/gentoo/cron/etc_php_syscp-vhost_php.ini delete mode 100644 syscp/patches/gentoo-config-files/nodns-ssl/gentoo/postfix/etc_postfix_main.cf delete mode 100644 syscp/patches/gentoo-config-files/nodns-ssl/gentoo/postfix/etc_postfix_mysql-virtual_alias_maps.cf delete mode 100644 syscp/patches/gentoo-config-files/nodns-ssl/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf delete mode 100644 syscp/patches/gentoo-config-files/nodns-ssl/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf delete mode 100644 syscp/patches/gentoo-config-files/nodns-ssl/gentoo/postfix/etc_sasl2_smtpd.conf delete mode 100644 syscp/patches/gentoo-config-files/nodns-ssl/gentoo/proftpd/etc_proftpd_proftpd.conf delete mode 100644 syscp/patches/gentoo-config-files/nodns-ssl/syscp-1.2.13-gentoo-admin_configfiles.php-nodns-ssl delete mode 100644 syscp/patches/gentoo-config-files/nodns-ssl/syscp-1.2.13-gentoo-config-nodns-ssl-r2.tar.bz2 delete mode 100644 syscp/patches/gentoo-config-files/nodns/etc_libnss-mysql-root.cfg delete mode 100644 syscp/patches/gentoo-config-files/nodns/etc_libnss-mysql.cfg delete mode 100644 syscp/patches/gentoo-config-files/nodns/gentoo/courier/etc_courier-imap_imapd delete mode 100644 syscp/patches/gentoo-config-files/nodns/gentoo/courier/etc_courier-imap_imapd-ssl delete mode 100644 syscp/patches/gentoo-config-files/nodns/gentoo/courier/etc_courier-imap_pop3d delete mode 100644 syscp/patches/gentoo-config-files/nodns/gentoo/courier/etc_courier-imap_pop3d-ssl delete mode 100644 syscp/patches/gentoo-config-files/nodns/gentoo/courier/etc_courier_authlib_authdaemonrc delete mode 100644 syscp/patches/gentoo-config-files/nodns/gentoo/courier/etc_courier_authlib_authmysqlrc delete mode 100644 syscp/patches/gentoo-config-files/nodns/gentoo/cron/etc_cron.d_syscp delete mode 100644 syscp/patches/gentoo-config-files/nodns/gentoo/cron/etc_php_syscp-cronjob_php.ini delete mode 100644 syscp/patches/gentoo-config-files/nodns/gentoo/cron/etc_php_syscp-vhost_php.ini delete mode 100644 syscp/patches/gentoo-config-files/nodns/gentoo/postfix/etc_postfix_main.cf delete mode 100644 syscp/patches/gentoo-config-files/nodns/gentoo/postfix/etc_postfix_mysql-virtual_alias_maps.cf delete mode 100644 syscp/patches/gentoo-config-files/nodns/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf delete mode 100644 syscp/patches/gentoo-config-files/nodns/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf delete mode 100644 syscp/patches/gentoo-config-files/nodns/gentoo/postfix/etc_sasl2_smtpd.conf delete mode 100644 syscp/patches/gentoo-config-files/nodns/gentoo/proftpd/etc_proftpd_proftpd.conf delete mode 100644 syscp/patches/gentoo-config-files/nodns/syscp-1.2.13-gentoo-admin_configfiles.php-nodns delete mode 100644 syscp/patches/gentoo-config-files/nodns/syscp-1.2.13-gentoo-config-nodns-r2.tar.bz2 delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/ball.gif delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/cambialingua.gif delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/errore.gif delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/finesezione.gif delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/footer.gif delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/header.gif delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/header_r.gif delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/login.gif delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/logininterno.gif delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/ombra.gif delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/order_asc.gif delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/order_desc.gif delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/sezione.gif delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/sottosezione.gif delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/titolo.gif delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/valid-xhtml10 delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/vcss delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/admins/admins.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/admins/admins_add.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/admins/admins_admin.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/admins/admins_edit.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/configfiles/choose.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/configfiles/choose_daemon.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/configfiles/choose_distribution.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/configfiles/configfiles.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/configfiles/configfiles_file.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/customers/customers.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/customers/customers_add.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/customers/customers_customer.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/customers/customers_edit.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/domains/domains.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/domains/domains_add.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/domains/domains_domain.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/domains/domains_edit.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/index/change_language.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/index/change_password.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/index/index.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/ipsandports/ipsandports.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/ipsandports/ipsandports_add.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/ipsandports/ipsandports_edit.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/ipsandports/ipsandports_ipandport.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/settings/settings.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/templates/templates.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/templates/templates_add_1.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/templates/templates_add_2.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/templates/templates_edit.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/templates/templates_template.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/domains/domainlist.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/domains/domains.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/domains/domains_add.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/domains/domains_delimiter.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/domains/domains_domain.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/domains/domains_edit.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/account_add.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/account_changepw.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/email.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/emails.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/emails_add.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/emails_domain.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/emails_edit.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/emails_edit_forwarder.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/emails_email.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/forwarder_add.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/extras.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htaccess.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htaccess_add.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htaccess_edit.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htaccess_htaccess.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htpasswds.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htpasswds_add.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htpasswds_edit.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htpasswds_htpasswd.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/ftp/accounts.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/ftp/accounts_account.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/ftp/accounts_add.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/ftp/accounts_edit.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/ftp/ftp.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/index/change_language.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/index/change_password.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/index/index.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/mysql/mysql.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/mysql/mysqls.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/mysql/mysqls_add.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/mysql/mysqls_database.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/mysql/mysqls_edit.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/footer.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/header.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/login/login.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/maincss.css delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/misc/error.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/misc/question_yesno.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/misc/standardcustomer/index.html delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/navigation_element.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/navigation_link.tpl delete mode 100644 syscp/patches/gentoo-syscp-design/syscp-1.2.13-gentoo-syscp-design-r3.tar.bz2 delete mode 100644 syscp/patches/italian-lang/italian.lng.php delete mode 100644 syscp/patches/mysql-ftp-patch/syscp-1.2.13-mysql-ftp-patch-r3.tar.bz2 delete mode 100644 syscp/patches/mysql-ftp-patch/syscp-1.2.13-mysqli-ftpi.patch delete mode 100644 syscp/patches/options-patch/syscp-1.2.13-moreoptions.patch delete mode 100644 syscp/patches/options-patch/syscp-1.2.13-options-patch-r3.tar.bz2 delete mode 100644 syscp/patches/suexec-patch/syscp-1.2.13-suexec-patch-r3.tar.bz2 delete mode 100644 syscp/patches/suexec-patch/syscp-1.2.13-suexec-support.patch delete mode 100644 syscp/patches/suphp-patch/syscp-1.2.13-suphp-patch-r3.tar.bz2 delete mode 100644 syscp/patches/suphp-patch/syscp-1.2.13-suphp-support.patch delete mode 100644 syscp/patches/syscp-patches/syscp-1.2.13-gentoo-compatibility.patch delete mode 100644 syscp/patches/syscp-patches/syscp-1.2.13-patches-r3.tar.bz2 delete mode 100644 syscp/patches/syscp-sqlfile/syscp-1.2.13-addopts-db.sql delete mode 100644 syscp/patches/syscp-sqlfile/syscp-1.2.13-baseinstall-db.sql delete mode 100644 syscp/patches/syscp-sqlfile/syscp-1.2.13-mysqlftpimp-db.sql delete mode 100644 syscp/patches/syscp-sqlfile/syscp-1.2.13-sqlfile-r3.tar.bz2 delete mode 100644 syscp/patches/syscp-sqlfile/syscp-1.2.13-suphp-db.sql delete mode 100644 syscp/www-apps/syscp/Manifest delete mode 100644 syscp/www-apps/syscp/files/digest-syscp-1.2.13 delete mode 100644 syscp/www-apps/syscp/metadata.xml delete mode 100644 syscp/www-apps/syscp/syscp-1.2.13.ebuild delete mode 100644 vda/postfix-2.5.1-vda-ng-r2.patch.gz delete mode 100644 vda/postfix-2.5.1-vda-ng.patch delete mode 100755 versioncp/commontest delete mode 100644 versioncp/dump.sql delete mode 100644 versioncp/main.css delete mode 100644 versioncp/show_versions.php delete mode 100644 versioncp/svnupdater delete mode 100644 versioncp/update_versions.php delete mode 100755 versioncp/upstscripts/berlios delete mode 100755 versioncp/upstscripts/ezcomponents delete mode 100755 versioncp/upstscripts/freshmeat delete mode 100755 versioncp/upstscripts/php-pear delete mode 100755 versioncp/upstscripts/php-pecl delete mode 100755 versioncp/upstscripts/sourceforge diff --git a/apps/dev-eiffel/eiffelstudio/Manifest b/apps/dev-eiffel/eiffelstudio/Manifest deleted file mode 100644 index 4e92b4a..0000000 --- a/apps/dev-eiffel/eiffelstudio/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST Eiffel64_gpl_79451-linux-x86-64.tar.bz2 68814822 RMD160 fe82a9a6221b56b626c21e3331a5b78ae543bd84 SHA1 e60363ac82a7694aef4351977a35b2a48247fa9f SHA256 0badad502d20d2d7aa1e4bc422ccbff4296856deb4b02fd8eeb4504da58b7042 -DIST Eiffel64_gpl_79451-linux-x86.tar.bz2 56501216 RMD160 3a302eff5df06fbead79e312f035b9cace7601d7 SHA1 ccbcdd1c18997222e9343a843d86046b257c6aeb SHA256 430b6a79d0da8ee9639ccdb8b6e58d44bd936fce370a776d498fb523580fce23 -EBUILD eiffelstudio-6.4.79451.ebuild 2003 RMD160 fea445789a14b700c98e5b9d23f6d46d7b102ebc SHA1 d1e80b11dfcbb02d9ce962f4e60ad2aaa4c79940 SHA256 379b9046eb60f5fcb74af817fb0ab4aea7e74292078f722bf29014e6b5670155 diff --git a/apps/dev-eiffel/eiffelstudio/eiffelstudio-6.4.79451.ebuild b/apps/dev-eiffel/eiffelstudio/eiffelstudio-6.4.79451.ebuild deleted file mode 100644 index 8e15800..0000000 --- a/apps/dev-eiffel/eiffelstudio/eiffelstudio-6.4.79451.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -KEYWORDS="-* ~amd64 ~x86" - -MAIN_PV="${PV%.*}" -MAIN_PV="${MAIN_PV/./}" -SUB_PV="${PV##*.}" - -DESCRIPTION="EiffelStudio IDE." -HOMEPAGE="http://${PN}.sourceforge.net/" -SRC_URI="x86? ( mirror://sourceforge/${PN}/Eiffel${MAIN_PV}_gpl_${SUB_PV}-linux-x86.tar.bz2 ) - amd64? ( mirror://sourceforge/${PN}/Eiffel${MAIN_PV}_gpl_${SUB_PV}-linux-x86-64.tar.bz2 )" -LICENSE="GPL-2" -SLOT="0" -IUSE="precompile" - -DEPEND="sys-devel/gcc - dev-util/bsdiff - >=x11-libs/gtk+-2.6.0" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/Eiffel${MAIN_PV}" - -src_compile() { - if use amd64 ; then - ISE_PLATFORM="linux-x86-64" - else - ISE_PLATFORM="linux-x86" - fi - - if use precompile ; then - ISE_EIFFEL="${S}" ISE_PLATFORM=${ISE_PLATFORM} studio/spec/${ISE_PLATFORM}/bin/ec -precompile -config precomp/spec/${ISE_PLATFORM}/base.ecf -c_compile -clean || die "precompile failed" - ISE_EIFFEL="${S}" ISE_PLATFORM=${ISE_PLATFORM} studio/spec/${ISE_PLATFORM}/bin/ec -precompile -config precomp/spec/${ISE_PLATFORM}/base-mt.ecf -c_compile -clean || die "precompile failed" - ISE_EIFFEL="${S}" ISE_PLATFORM=${ISE_PLATFORM} studio/spec/${ISE_PLATFORM}/bin/ec -precompile -config precomp/spec/${ISE_PLATFORM}/vision2.ecf -c_compile -clean || die "precompile failed" - ISE_EIFFEL="${S}" ISE_PLATFORM=${ISE_PLATFORM} studio/spec/${ISE_PLATFORM}/bin/ec -precompile -config precomp/spec/${ISE_PLATFORM}/vision2-mt.ecf -c_compile -clean || die "precompile failed" - fi -} - -src_install() { - echo "ISE_EIFFEL=/opt/Eiffel${MAIN_PV}" > "${T}/52${PN}" - ISE_EIFFEL=/opt/Eiffel${MAIN_PV} - - if use amd64 ; then - echo "ISE_PLATFORM=linux-x86-64" >> "${T}/52${PN}" - ISE_PLATFORM="linux-x86-64" - else - echo "ISE_PLATFORM=linux-x86" >> "${T}/52${PN}" - ISE_PLATFORM="linux-x86" - fi - - echo "PATH=${ISE_EIFFEL}/studio/spec/${ISE_PLATFORM}/bin" >> "${T}/52${PN}" - - doenvd "${T}/52${PN}" - - dodir /opt/Eiffel${MAIN_PV} - mv -f * "${D}"/opt/Eiffel${MAIN_PV} -} diff --git a/apps/dev-eiffel/traffic/Manifest b/apps/dev-eiffel/traffic/Manifest deleted file mode 100644 index 1166f85..0000000 --- a/apps/dev-eiffel/traffic/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST traffic_ev_1104.zip 457821 RMD160 a372b6007d7822f2a6d3786e4b2455e0d2d81926 SHA1 528006ee39a7b56eedf235482e7ed06a11b86863 SHA256 57729133b6a434eefacf98892504beb8ad3dce4fb75b8042c5341b70ae52178a -EBUILD traffic-3.3.1104.ebuild 785 RMD160 61d7a1aa6610c4c72cd8ccea40bbfb5392108813 SHA1 2b3eec93ca1cb764208d1c75c72dcca23cf917ae SHA256 7baf92bb4b935b81ff30dbcbc9272d27d7cfbe9846d6db1aa8ffeef5ff4bbb8b diff --git a/apps/dev-eiffel/traffic/traffic-3.3.1104.ebuild b/apps/dev-eiffel/traffic/traffic-3.3.1104.ebuild deleted file mode 100644 index 7755cf4..0000000 --- a/apps/dev-eiffel/traffic/traffic-3.3.1104.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -KEYWORDS="~amd64 ~x86" - -MAIN_PV="${PV%.*}" -SUB_PV="${PV##*.}" - -DESCRIPTION="Traffic library." -HOMEPAGE="http://${PN}.origo.ethz.ch/" -SRC_URI="http://download.origo.ethz.ch/${PN}/1414/traffic_ev_${SUB_PV}.zip" -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -DEPEND="app-arch/unzip" -RDEPEND="dev-eiffel/eiffelstudio" - -S="${WORKDIR}/traffic_ev_${SUB_PV}" - -src_compile() { - echo "Nothing to compile." -} - -src_install() { - dodir /usr/share/Eiffel/Traffic_${MAIN_PV}_${SUB_PV} - mv -f * "${D}"/usr/share/Eiffel/Traffic_${MAIN_PV}_${SUB_PV} - chgrp -R users "${D}"/usr/share/Eiffel/Traffic_${MAIN_PV}_${SUB_PV} - chmod -R g+w "${D}"/usr/share/Eiffel/Traffic_${MAIN_PV}_${SUB_PV}/example -} diff --git a/apps/dev-libs/dnmalloc/Manifest b/apps/dev-libs/dnmalloc/Manifest deleted file mode 100644 index d09eeaf..0000000 --- a/apps/dev-libs/dnmalloc/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST dnmalloc-1.0.tar.gz 65395 RMD160 99722cca8b042491837602adaacb750904edc4fd SHA1 0de27d8c1f7c39f9294e2d199fcfca1ebda97ff7 SHA256 6cd120675a488eb23c50989ebf56f50cba42ab50539daebfc4b8d50a3cb287aa -EBUILD dnmalloc-1.0.ebuild 410 RMD160 7c1a8d990837ba2bb9782a8209ed1f5b48caab88 SHA1 4e643d4c79f9cfd336ef70a89d001591be2283e3 SHA256 5bd5f016008230f03dff9e34067049756f312d31e999ff3eb670798550ee2a47 diff --git a/apps/dev-libs/dnmalloc/dnmalloc-1.0.ebuild b/apps/dev-libs/dnmalloc/dnmalloc-1.0.ebuild deleted file mode 100644 index 119e0b1..0000000 --- a/apps/dev-libs/dnmalloc/dnmalloc-1.0.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -KEYWORDS="~amd64 ~x86" - -DESCRIPTION="Safer memory allocator." -HOMEPAGE="http://fort-knox.org/" -SRC_URI="http://fort-knox.org/files/${P}.tar.gz" -LICENSE="LGPL-2" -SLOT="0" -IUSE="" - -DEPEND="" -RDEPEND="" - -src_compile() { - emake || die "emake failed" -} - -src_install() { - dolib "lib${PN}.so"* -} diff --git a/apps/dev-libs/safe-iop/Manifest b/apps/dev-libs/safe-iop/Manifest deleted file mode 100644 index 6d9c3ff..0000000 --- a/apps/dev-libs/safe-iop/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST safe-iop-0.3.1.tgz 11515 RMD160 144fb1aa110b917b87734d8a38de9c04dddabbe5 SHA1 1d401b94c04b958a5350e1079781bbfb00cb1a69 SHA256 96027e1512dc463f8418e0ba89f8c39a4bfe36cf2456c9afbf1b3897b4e9cf76 -EBUILD safe-iop-0.3.1.ebuild 448 RMD160 b0190beb716e9c575eb9b79ee24e9abd0f729b39 SHA1 299b58d7f7491747767bace9d037a19814cf383d SHA256 fe64cbe5e74adcaef9402d18cf13077b64145a50ab5f7f6d4bd9461889868561 diff --git a/apps/dev-libs/safe-iop/safe-iop-0.3.1.ebuild b/apps/dev-libs/safe-iop/safe-iop-0.3.1.ebuild deleted file mode 100644 index 6d6ca7a..0000000 --- a/apps/dev-libs/safe-iop/safe-iop-0.3.1.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -KEYWORDS="~amd64 ~x86" - -DESCRIPTION="Safe integer operations." -HOMEPAGE="http://code.google.com/p/${PN}/" -SRC_URI="http://${PN}.googlecode.com/files/${P}.tgz" -LICENSE="BSD" -SLOT="0" -IUSE="" - -DEPEND="" -RDEPEND="" - -src_compile() { - einfo "Nothing to compile." -} - -src_install() { - insinto /usr/include - doins include/safe_iop.h -} diff --git a/apps/media-gfx/brother-brscan2/Manifest b/apps/media-gfx/brother-brscan2/Manifest deleted file mode 100644 index eaa810b..0000000 --- a/apps/media-gfx/brother-brscan2/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST brscan2-0.2.4-0.i386.rpm 74179 RMD160 ed447ebfa12bd0448d1692ae1a601215db045969 SHA1 86ae5326049e610aaab30d06f9c066fefae1cbcb SHA256 5e72834f04622a9f7673c0ed76d2847fff1d31db57415e3629ad13e34701f075 -DIST brscan2-0.2.4-0.x86_64.rpm 85559 RMD160 2d4d9be69c66c8b808f61d56637cbccdc9b6357c SHA1 77d55a81d33e821805b1d2adfecdc28853c99a33 SHA256 bfee8988cd71fb73fe3bb1925689e9a1ff8abaeb97d24c6a662cffc121d7740f -EBUILD brother-brscan2-0.2.4.ebuild 786 RMD160 b66f3dcf8ac53df3360e06efffe0b9739b9deb66 SHA1 5afad81be05851914813ecc7ab4a4fe62e58a950 SHA256 91a33009434d352daa1f8602e464a316f9e7f6c8c417e61a30337390fd41e66c diff --git a/apps/media-gfx/brother-brscan2/brother-brscan2-0.2.4.ebuild b/apps/media-gfx/brother-brscan2/brother-brscan2-0.2.4.ebuild deleted file mode 100644 index 7edbee6..0000000 --- a/apps/media-gfx/brother-brscan2/brother-brscan2-0.2.4.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit rpm - -KEYWORDS="~amd64 ~x86" -DESCRIPTION="Brother brscan2 scanner driver." -HOMEPAGE="http://solutions.brother.com/linux/en_us/index.html" -SRC_URI="amd64? ( http://solutions.brother.com/Library/sol/printer/linux/rpmfiles/sane_others/64bit/brscan2-${PV}-0.x86_64.rpm ) - x86? ( http://solutions.brother.com/Library/sol/printer/linux/rpmfiles/sane_others/brscan2-${PV}-0.i386.rpm )" -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -DEPEND="" -RDEPEND=">=media-gfx/sane-backends-1.0.19" - -src_unpack() { - rpm_src_unpack -} - -src_compile() { - echo "Nothing to compile." -} - -src_install() { - cp -Rf "./" "${D}/" -} - -pkg_postinst() { - ${ROOT}usr/local/Brother/sane/setupSaneScan2 -i -} diff --git a/apps/net-print/brother-cups/Manifest b/apps/net-print/brother-cups/Manifest deleted file mode 100644 index d316b61..0000000 --- a/apps/net-print/brother-cups/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST brmfc8860dnlpr-2.0.1-1.i386.rpm 35766 RMD160 a2c434756515374b934b1068b6babbe321975232 SHA1 d0aa0baab117033085707e42df0f8aa58b321a37 SHA256 d5292900d9a9c657af15b7e6766e4562d8d22cde6a9e405924163d85c008f16d -DIST cupswrapperMFC8860DN-2.0.1-1.i386.rpm 13339 RMD160 7a874d0ebe7d69563df3c2330eebc53180108f3a SHA1 7542bc787fd074a136d5f903a087383132ff6318 SHA256 a6fd12076a50e3dfe0b4720319c4f49600d00ab9d61c115a902bcd2dffea610e -EBUILD brother-cups-2.0.1.ebuild 1310 RMD160 a8cf56674cb237b804be087a3d218c4b7ab9bcdd SHA1 52d3666b6ad8f020767acc252957b40a5b6c1d94 SHA256 948923770b5aa328289cac667dd8ef724e6f4b0dbdd9d5b028b76ca306ad5c07 diff --git a/apps/net-print/brother-cups/brother-cups-2.0.1.ebuild b/apps/net-print/brother-cups/brother-cups-2.0.1.ebuild deleted file mode 100644 index 0a7e342..0000000 --- a/apps/net-print/brother-cups/brother-cups-2.0.1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -LPR_BASEURI="http://solutions.brother.com/Library/sol/printer/linux/rpmfiles/lpr_others" -CUPS_BASEURI="http://solutions.brother.com/Library/sol/printer/linux/rpmfiles/cups_wrapper" - -inherit rpm - -KEYWORDS="~amd64 ~x86" - -DESCRIPTION="Brother MFC-8860DN CUPS printer driver." -HOMEPAGE="http://solutions.brother.com/linux/en_us/index.html" -SRC_URI="${LPR_BASEURI}/brmfc8860dnlpr-${PV}-1.i386.rpm - ${CUPS_BASEURI}/cupswrapperMFC8860DN-${PV}-1.i386.rpm" -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -DEPEND="" -RDEPEND=">=net-print/cups-1.3" - -src_unpack() { - rpm_src_unpack -} - -src_compile() { - sed -e "s|/usr/lib/cups/|/usr/libexec/cups/|g" -i usr/local/Brother/cupswrapper/cupswrapperMFC8860DN-${PV} - sed -e "s|/usr/lib64/cups/|/usr/libexec/cups/|g" -i usr/local/Brother/cupswrapper/cupswrapperMFC8860DN-${PV} -} - -src_install() { - cp -Rf "./" "${D}/" -} - -pkg_postinst() { - ${ROOT}usr/local/Brother/inf/setupPrintcap MFC8860DN -i USB - ${ROOT}usr/local/Brother/inf/braddprinter -i MFC8860DN - echo "[psconvert2]" >> ${ROOT}usr/local/Brother/inf/brMFC8860DNfunc - echo "pstops=`which pstops`" >> ${ROOT}usr/local/Brother/inf/brMFC8860DNfunc - - ${ROOT}usr/local/Brother/cupswrapper/cupswrapperMFC8860DN-${PV} -i -} diff --git a/apps/profiles/categories b/apps/profiles/categories deleted file mode 100644 index 312ffbd..0000000 --- a/apps/profiles/categories +++ /dev/null @@ -1 +0,0 @@ -dev-eiffel diff --git a/apps/profiles/repo_name b/apps/profiles/repo_name deleted file mode 100644 index 69e1550..0000000 --- a/apps/profiles/repo_name +++ /dev/null @@ -1 +0,0 @@ -chtekk-apps diff --git a/apps/sys-apps/areca-cli/Manifest b/apps/sys-apps/areca-cli/Manifest deleted file mode 100644 index 965baa8..0000000 --- a/apps/sys-apps/areca-cli/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST V1.80A_71012.zip 1132839 RMD160 2398e18f662c808a81dcc55433e52b7aa63aaa88 SHA1 0f6dfbf9e9d193c3a516210f7ebd43b9176db5e5 SHA256 3b63bf9a78c91970ec1e2ef1e2b4258cb6977e9f3e0f7f3496ff5ffed1075b64 -DIST v1.82_81103.zip 1213820 RMD160 a2f7439f3356158de6d1ff4925b36fd9b3938fa5 SHA1 e8816d6829796562bb8f6037c740b277ed9f0780 SHA256 77a51f4fe4848c49af04771bd105df0e115eae7774179163ba6be46f7316c912 -EBUILD areca-cli-1.80.71012.ebuild 662 RMD160 ca5302483a50cf716190c401da743b0ca20c05c4 SHA1 9cc67490cf6853dd285a40e16480a73d23a601b8 SHA256 8430f416b7a8266bbc416e80b692d66df74186d513e5444950712d4c94d48dea -EBUILD areca-cli-1.82.81103.ebuild 665 RMD160 e1fdd15aa69282477f45a6cd9ea34ef50c55acd3 SHA1 a8be9a7292183b82a0cae08b0a3f7f4c73f23a62 SHA256 d91e3aa4ce4f68d54465e6d454b9e87854587aa39e18d9162c7061bad984f1d1 diff --git a/apps/sys-apps/areca-cli/areca-cli-1.80.71012.ebuild b/apps/sys-apps/areca-cli/areca-cli-1.80.71012.ebuild deleted file mode 100644 index c930a68..0000000 --- a/apps/sys-apps/areca-cli/areca-cli-1.80.71012.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -KEYWORDS="-* ~amd64 ~x86" - -MY_PV="V1.80A_71012" - -DESCRIPTION="Areca RaidCard CLI tools for amd64 and x86." -HOMEPAGE="http://www.areca.com.tw/support/main.htm" -SRC_URI="ftp://ftp.areca.com.tw/RaidCards/AP_Drivers/Linux/CLI/${MY_PV}.zip" -LICENSE="areca" -SLOT="0" -IUSE="" -RESTRICT="strip" - -S="${WORKDIR}/${MY_PV}" - -DEPEND="app-arch/unzip" -RDEPEND="" - -src_install() { - if use amd64 ; then - newsbin "x86-64/cli64" "${PN}" - elif use x86 ; then - newsbin "i386/cli32" "${PN}" - else - eerror "Invalid ARCH, there are no Areca tools for you!" - fi -} diff --git a/apps/sys-apps/areca-cli/areca-cli-1.82.81103.ebuild b/apps/sys-apps/areca-cli/areca-cli-1.82.81103.ebuild deleted file mode 100644 index a23e2ea..0000000 --- a/apps/sys-apps/areca-cli/areca-cli-1.82.81103.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -KEYWORDS="-* ~amd64 ~x86" - -MY_PV="v1.82_81103" - -DESCRIPTION="Areca RaidCard CLI tools for amd64 and x86." -HOMEPAGE="http://www.areca.com.tw/support/main.htm" -SRC_URI="ftp://ftp.areca.com.tw/RaidCards/AP_Drivers/Linux/CLI/${MY_PV}.zip" -LICENSE="areca" -SLOT="0" -IUSE="" -RESTRICT="strip" - -S="${WORKDIR}/${MY_PV/v/V}" - -DEPEND="app-arch/unzip" -RDEPEND="" - -src_install() { - if use amd64 ; then - newsbin "x86-64/cli64" "${PN}" - elif use x86 ; then - newsbin "i386/cli32" "${PN}" - else - eerror "Invalid ARCH, there are no Areca tools for you!" - fi -} diff --git a/apps/sys-apps/areca-http/Manifest b/apps/sys-apps/areca-http/Manifest deleted file mode 100644 index 89d42bb..0000000 --- a/apps/sys-apps/areca-http/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX areca-http-initd 608 RMD160 cdf0538aff23565a6f655fc023b5ea7505f04ab4 SHA1 d3c045a464d6af5fa4bcec457d8210e617bd4414 SHA256 26e8510ca49cac6e582d0f43ca20c0d78626be324f210a5d76419974b88384a1 -DIST v1.82_70911.zip 1177354 RMD160 b63ec1b0f229faa028286755b3d1ffa256a4c32d SHA1 7bfe4934a273a53df2963704b70d7ccb4b0b35de SHA256 04fd312810dacad4789a2abb3f0d971874487943982236e6429d1e33845e8eea -DIST v1.83_81103.zip 1245545 RMD160 80f6a6d99c36457015e7b745cfd5f3802231c857 SHA1 46200ace46ba172354ed56ee40751e4f146c53f6 SHA256 12d0399b17dd4e3a7e96ac35f0edd5d4b58326025a1676542527dd786e355101 -EBUILD areca-http-1.82.70911.ebuild 715 RMD160 d6d82bc1f30542e7480f8c55ccfebd833fbeb58c SHA1 dfcfe689724db10f6a0d2ca7b14412e1b5db737f SHA256 4b7fd1770a68bd402a1d87312acb3e25ae9925864d8ec8f8cb493968253a45e1 -EBUILD areca-http-1.83.81103.ebuild 715 RMD160 f32beb5e660adbcb94bc13d567ca491f6822577d SHA1 f8c86b6599c559df891bc77edf6d61cd593c4a6c SHA256 8a715f5ced4a47e591aada34cda5939c4e3676358a92c49b32030dd072dc7779 diff --git a/apps/sys-apps/areca-http/areca-http-1.82.70911.ebuild b/apps/sys-apps/areca-http/areca-http-1.82.70911.ebuild deleted file mode 100644 index 06d2aec..0000000 --- a/apps/sys-apps/areca-http/areca-http-1.82.70911.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -KEYWORDS="-* ~amd64 ~x86" - -MY_PV="v1.82_70911" - -DESCRIPTION="Areca RaidCard HTTPd for amd64 and x86." -HOMEPAGE="http://www.areca.com.tw/support/main.htm" -SRC_URI="ftp://ftp.areca.com.tw/RaidCards/AP_Drivers/Linux/HTTP/${MY_PV}.zip" -LICENSE="areca" -SLOT="0" -IUSE="" -RESTRICT="strip" - -S="${WORKDIR}/${MY_PV/v/V}" - -DEPEND="app-arch/unzip" -RDEPEND="" - -src_install() { - if use amd64 ; then - newsbin "x86-64/archttp64" "${PN}" - elif use x86 ; then - newsbin "i386/archttp32" "${PN}" - else - eerror "Invalid ARCH, there are no Areca tools for you!" - fi - - newinitd "${FILESDIR}/${PN}-initd" "${PN}" -} diff --git a/apps/sys-apps/areca-http/areca-http-1.83.81103.ebuild b/apps/sys-apps/areca-http/areca-http-1.83.81103.ebuild deleted file mode 100644 index e41075d..0000000 --- a/apps/sys-apps/areca-http/areca-http-1.83.81103.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -KEYWORDS="-* ~amd64 ~x86" - -MY_PV="v1.83_81103" - -DESCRIPTION="Areca RaidCard HTTPd for amd64 and x86." -HOMEPAGE="http://www.areca.com.tw/support/main.htm" -SRC_URI="ftp://ftp.areca.com.tw/RaidCards/AP_Drivers/Linux/HTTP/${MY_PV}.zip" -LICENSE="areca" -SLOT="0" -IUSE="" -RESTRICT="strip" - -S="${WORKDIR}/${MY_PV/v/V}" - -DEPEND="app-arch/unzip" -RDEPEND="" - -src_install() { - if use amd64 ; then - newsbin "x86-64/archttp64" "${PN}" - elif use x86 ; then - newsbin "i386/archttp32" "${PN}" - else - eerror "Invalid ARCH, there are no Areca tools for you!" - fi - - newinitd "${FILESDIR}/${PN}-initd" "${PN}" -} diff --git a/apps/sys-apps/areca-http/files/areca-http-initd b/apps/sys-apps/areca-http/files/areca-http-initd deleted file mode 100644 index 7a4a1fe..0000000 --- a/apps/sys-apps/areca-http/files/areca-http-initd +++ /dev/null @@ -1,35 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -depend() { - need net -} - -start() { - ebegin "Starting ${SVCNAME}" - - if [[ -f "/var/run/${SVCNAME}.pid" ]] ; then - rm -f "/var/run/${SVCNAME}.pid" - fi - - start-stop-daemon \ - --start \ - --background \ - --make-pidfile \ - --pidfile "/var/run/${SVCNAME}.pid" \ - --exec /usr/sbin/areca-http - eend $? -} - -stop() { - ebegin "Stopping ${SVCNAME}" - - start-stop-daemon \ - --stop \ - --signal 9 \ - --pidfile "/var/run/${SVCNAME}.pid" \ - --exec /usr/sbin/areca-http - eend $? -} diff --git a/coda/net-fs/coda/Manifest b/coda/net-fs/coda/Manifest deleted file mode 100644 index 12512fb..0000000 --- a/coda/net-fs/coda/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -AUX auth2 604 RMD160 eb4336656492f22541e79c6854130ae46bee287d SHA1 4af20753da5c61666b9aff5fcec07f596af851b2 SHA256 f3da3e16eed06fb3a8d6949bbc0557b009232dcfee812afd79b38a494bd916a4 -AUX coda-6.9.3-gentoo-dirs.patch 11035 RMD160 628dea7bf66c897110693ba17da2bd35971753ed SHA1 e55be90dd9a3df2248fcd5b32e4cdfec104e0ead SHA256 d3765e414149c56dbfc6c58c09395fcaa41a76a0189db2708863afcef128435c -AUX coda-update 929 RMD160 17dc273447dcf9c80ccba62625e065298f5a863f SHA1 4be4d18b8d4c8f3da070e1072250b37f30b8f37d SHA256 ad62ed9fa6d78da0a334a4b72597beb74d8920365f53d084fde56d06f9af2d12 -AUX codasrv 528 RMD160 bacac42bcf31c659f10c2dec76a2cc66b1da2d55 SHA1 a7be5983aab0a6d8d86ca97064257a99818fa0d2 SHA256 5239f678bf5be56d61ead907c7ad0992baaf6328d9b750bc0061225a718e1a70 -AUX venus 566 RMD160 7938eeea4decdd21ed05570ff3d19ce598e6a32e SHA1 75656ccd579dce627b5e7e11e98b7127cd1d5262 SHA256 63f7d6f4f7cfc73435b3f16591312d3316c2d5d9906cb88ac7f17fe7c8f399df -DIST coda-6.9.3.tar.gz 1662535 RMD160 c12e30c84471f1d659d48cd1bf2ecaf5f684fe0e SHA1 cc73ac3e6987154ffa1772d4005b7acedc0f0afb SHA256 608a91fd9cea79b0b77511f47dc29d176f66898b9a0ef1856f8bafa3cc53d320 -EBUILD coda-6.9.3.ebuild 2235 RMD160 e541b178b5774250af0f55038d4f72b397d70f76 SHA1 c87806a14db7d683d883fc67500a580bfceb2de3 SHA256 91fb4522194de5519ac875b387cea8fe6d4cc214671510ad8ef1c4f9d7fea30e -MISC metadata.xml 250 RMD160 6aa4816072481129f87c0eb8a85c6a15287da965 SHA1 a8f9a0fb13692c19c95e700e32796c147c6c7804 SHA256 1ed32cc76b9bd8664c2bfd7d84f4186b444d5d39659b40523d0bc27e0ebb9846 diff --git a/coda/net-fs/coda/coda-6.9.3.ebuild b/coda/net-fs/coda/coda-6.9.3.ebuild deleted file mode 100644 index 7f5965d..0000000 --- a/coda/net-fs/coda/coda-6.9.3.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" - -inherit autotools eutils - -KEYWORDS="~amd64 ~ppc ~x86" - -DESCRIPTION="Coda is an advanced networked filesystem developed at Carnegie Mellon Uni." -HOMEPAGE="http://www.coda.cs.cmu.edu/" -SRC_URI="http://www.coda.cs.cmu.edu/pub/${PN}/src/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -IUSE="kerberos server" - -RDEPEND=">=sys-libs/lwp-2.4 - >=net-libs/rpc2-2.7 - >=sys-libs/rvm-1.15 - >=sys-libs/db-4.2 - >=sys-libs/ncurses-5.4 - >=sys-libs/readline-5.0 - dev-lang/perl - kerberos? ( virtual/krb5 )" - -DEPEND="${RDEPEND} - virtual/os-headers" - -src_unpack() { - unpack ${A} - - cd "${S}" - epatch "${FILESDIR}/${P}-gentoo-dirs.patch" -} - -src_compile() { - local myconf="--enable-client" - - use server && myconf="${myconf} --enable-server" - use kerberos && myconf="${myconf} --with-crypto --with-krb5" - - econf ${myconf} || die "econf failed" - - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - dodoc INSTALL* README* - - rm -Rf "${D}"/etc/init.d - doinitd "${FILESDIR}"/venus - if use server ; then - doinitd "${FILESDIR}"/auth2 - doinitd "${FILESDIR}"/coda-update - doinitd "${FILESDIR}"/codasrv - fi - - # Fix conflict with backup.sh from tar. - mv -f "${D}"/usr/sbin/backup{,-coda}.sh - - # Add Gentoo specific dirs. - if use server ; then - dodir /var/lib/vice - dodir /mnt/vicepa - fi - dodir /var/lib/coda/spool - dodir /mnt/coda - - diropts -m0700 - dodir /var/lib/coda/etc - dodir /var/lib/coda/venus.cache - - # Symlink traditional Coda dirs to Gentoo dirs. - if use server ; then - dosym /var/lib/vice /vice - dosym /mnt/vicepa /vicepa - fi - dosym /var/lib/coda /usr/coda - dosym /mnt/coda /coda -} - -pkg_postinst() { - if use server ; then - elog "To configure the coda server, run vice-setup." - elog "To enable the coda server at boot up, please do:" - elog " rc-update add auth2 default" - elog " rc-update add coda-update default" - elog " rc-update add codasrv default" - elog - fi - elog "To configure the coda client, run venus-setup." - elog "To enable the coda client at boot up, please do:" - elog " rc-update add venus default" -} diff --git a/coda/net-fs/coda/files/auth2 b/coda/net-fs/coda/files/auth2 deleted file mode 100644 index 8b18727..0000000 --- a/coda/net-fs/coda/files/auth2 +++ /dev/null @@ -1,30 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -depend() { - need net - use logger - after domainname -} - -start() { - if [[ "`cat /var/lib/vice/hostname`" != "`cat /var/lib/vice/db/scm`" ]] ; then - CHK="-chk" - fi - - ebegin "Starting ${SVCNAME}" - start-stop-daemon --start --background \ - --pidfile /var/lib/vice/auth2/pid --make-pidfile \ - --exec /usr/sbin/auth2 -- ${CHK} - eend $? -} - -stop() { - ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop \ - --pidfile /var/lib/vice/auth2/pid \ - --name auth2 - eend $? -} diff --git a/coda/net-fs/coda/files/coda-6.9.3-gentoo-dirs.patch b/coda/net-fs/coda/files/coda-6.9.3-gentoo-dirs.patch deleted file mode 100644 index c023335..0000000 --- a/coda/net-fs/coda/files/coda-6.9.3-gentoo-dirs.patch +++ /dev/null @@ -1,332 +0,0 @@ -diff -Nru coda-6.9.3/coda-src/scripts/bldvldb.sh.in coda-6.9.3-gt/coda-src/scripts/bldvldb.sh.in ---- coda-6.9.3/coda-src/scripts/bldvldb.sh.in 2004-03-05 22:12:44.000000000 +0100 -+++ coda-6.9.3-gt/coda-src/scripts/bldvldb.sh.in 2008-07-12 23:15:47.141740587 +0200 -@@ -28,7 +28,7 @@ - fi - - if [ x${vicedir} = x ] ; then -- vicedir=/vice -+ vicedir=/var/lib/vice - fi - - THISHOST=`hostname | tr A-Z a-z` -diff -Nru coda-6.9.3/coda-src/scripts/coda-server-logrotate coda-6.9.3-gt/coda-src/scripts/coda-server-logrotate ---- coda-6.9.3/coda-src/scripts/coda-server-logrotate 2003-08-04 20:09:58.000000000 +0200 -+++ coda-6.9.3-gt/coda-src/scripts/coda-server-logrotate 2008-07-12 23:15:53.629741210 +0200 -@@ -3,7 +3,7 @@ - # Simple logrotation for Coda server logfiles - # - --vicedir=/vice -+vicedir=/var/lib/vice - . "`codaconfedit server.conf`" - - srvdir="${vicedir}/srv" -diff -Nru coda-6.9.3/coda-src/scripts/codastart coda-6.9.3-gt/coda-src/scripts/codastart ---- coda-6.9.3/coda-src/scripts/codastart 2006-09-19 19:48:57.000000000 +0200 -+++ coda-6.9.3-gt/coda-src/scripts/codastart 2008-07-12 23:16:40.249741012 +0200 -@@ -1,11 +1,11 @@ - #!/bin/sh --if [ "`cat /vice/hostname`" = "`cat /vice/db/scm`" ] -+if [ "`cat /var/lib/vice/hostname`" = "`cat /var/lib/vice/db/scm`" ] - then - updatesrv & - auth2 & - else - auth2 -chk & - fi --updateclnt -h `grep '' /vice/db/scm` & -+updateclnt -h `grep '' /var/lib/vice/db/scm` & - startserver - -diff -Nru coda-6.9.3/coda-src/scripts/createvol_rep.in coda-6.9.3-gt/coda-src/scripts/createvol_rep.in ---- coda-6.9.3/coda-src/scripts/createvol_rep.in 2007-06-26 18:18:28.000000000 +0200 -+++ coda-6.9.3-gt/coda-src/scripts/createvol_rep.in 2008-07-12 23:17:29.601740626 +0200 -@@ -32,7 +32,7 @@ - export PATH - - # load the server configuration file --vicedir=/vice -+vicedir=/var/lib/vice - . "`@sbindir@/codaconfedit server.conf`" - - if [ ! -f ${vicedir}/hostname -o ! -f ${vicedir}/db/scm ] ; then -diff -Nru coda-6.9.3/coda-src/scripts/purgevol_rep.in coda-6.9.3-gt/coda-src/scripts/purgevol_rep.in ---- coda-6.9.3/coda-src/scripts/purgevol_rep.in 2005-05-04 14:13:41.000000000 +0200 -+++ coda-6.9.3-gt/coda-src/scripts/purgevol_rep.in 2008-07-12 23:18:23.829740822 +0200 -@@ -24,7 +24,7 @@ - export PATH - - # load the server configuration file --vicedir=/vice -+vicedir=/var/lib/vice - . "`@sbindir@/codaconfedit server.conf`" - - SCM=`cat ${vicedir}/db/scm` -diff -Nru coda-6.9.3/coda-src/scripts/startserver.in coda-6.9.3-gt/coda-src/scripts/startserver.in ---- coda-6.9.3/coda-src/scripts/startserver.in 2004-10-26 23:36:43.000000000 +0200 -+++ coda-6.9.3-gt/coda-src/scripts/startserver.in 2008-07-12 23:18:54.541741263 +0200 -@@ -30,7 +30,7 @@ - fi - - if [ x${vicedir} = x ]; then -- vicedir=/vice -+ vicedir=/var/lib/vice - fi - - # Rotate logfiles -diff -Nru coda-6.9.3/coda-src/scripts/venus-setup.in coda-6.9.3-gt/coda-src/scripts/venus-setup.in ---- coda-6.9.3/coda-src/scripts/venus-setup.in 2007-08-10 20:02:24.000000000 +0200 -+++ coda-6.9.3-gt/coda-src/scripts/venus-setup.in 2008-07-12 23:22:24.537741513 +0200 -@@ -65,16 +65,16 @@ - #fi - - # default paths --errorlog=/usr/coda/etc/console --cachedir=/usr/coda/venus.cache --checkpointdir=/usr/coda/spool --logfile=/usr/coda/etc/venus.log --marinersocket=/usr/coda/spool/mariner --pid_file=/usr/coda/venus.cache/pid --run_control_file=/usr/coda/venus.cache/VENUS_CTRL --rvm_log=/usr/coda/LOG --rvm_data=/usr/coda/DATA --mountpoint=/coda -+errorlog=/var/lib/coda/etc/console -+cachedir=/var/lib/coda/venus.cache -+checkpointdir=/var/lib/coda/spool -+logfile=/var/lib/coda/etc/venus.log -+marinersocket=/var/lib/coda/spool/mariner -+pid_file=/var/lib/coda/venus.cache/pid -+run_control_file=/var/lib/coda/venus.cache/VENUS_CTRL -+rvm_log=/var/lib/coda/LOG -+rvm_data=/var/lib/coda/DATA -+mountpoint=/mnt/coda - - # override with user defined paths - if [ x${conf} != x/dev/null ] ; then -@@ -224,8 +224,8 @@ - # next run will always initialize - touch $cachedir/INIT - --if [ -f /usr/coda/etc/vstab ] ; then -- echo "To avoid confusion, remove /usr/coda/etc/vstab, we have switched to" -+if [ -f /var/lib/coda/etc/vstab ] ; then -+ echo "To avoid confusion, remove /var/lib/coda/etc/vstab, we have switched to" - echo "the /etc/coda/venus.conf file for configuring the client." - fi - -diff -Nru coda-6.9.3/coda-src/scripts/vice-setup-rvm.in coda-6.9.3-gt/coda-src/scripts/vice-setup-rvm.in ---- coda-6.9.3/coda-src/scripts/vice-setup-rvm.in 2006-09-19 19:35:02.000000000 +0200 -+++ coda-6.9.3-gt/coda-src/scripts/vice-setup-rvm.in 2008-07-12 23:23:28.909741348 +0200 -@@ -42,7 +42,7 @@ - # - - # defaults, will be overridden by settings in the server.conf file --vicedir=/vice -+vicedir=/var/lib/vice - - prefix=@prefix@ - exec_prefix=@exec_prefix@ -diff -Nru coda-6.9.3/coda-src/scripts/vice-setup-scm coda-6.9.3-gt/coda-src/scripts/vice-setup-scm ---- coda-6.9.3/coda-src/scripts/vice-setup-scm 2005-09-01 23:59:24.000000000 +0200 -+++ coda-6.9.3-gt/coda-src/scripts/vice-setup-scm 2008-07-12 23:23:46.517741267 +0200 -@@ -36,7 +36,7 @@ - . "`codaconfedit server.conf`" - - if [ x${vicedir} = x ] ; then -- vicedir=/vice -+ vicedir=/var/lib/vice - fi - - # current first maximum replicated volume id (0x7f000000) -diff -Nru coda-6.9.3/coda-src/scripts/vice-setup-srvdir coda-6.9.3-gt/coda-src/scripts/vice-setup-srvdir ---- coda-6.9.3/coda-src/scripts/vice-setup-srvdir 2005-09-01 23:59:24.000000000 +0200 -+++ coda-6.9.3-gt/coda-src/scripts/vice-setup-srvdir 2008-07-12 23:24:28.813741293 +0200 -@@ -28,7 +28,7 @@ - # - # Configuration - # --vicedir=/vice -+vicedir=/var/lib/vice - numservers=1 - . "`codaconfedit server.conf`" - -@@ -73,15 +73,15 @@ - echo - - if [ $numservers -gt 1 ]; then -- echon "Where shall we store your file data for server $n ($hn) [/vicepa]? " -+ echon "Where shall we store your file data for server $n ($hn) [/mnt/vicepa]? " - else -- echon 'Where shall we store your file data [/vicepa]? ' -+ echon 'Where shall we store your file data [/mnt/vicepa]? ' - fi - srvdir= - read srvdir - - if [ "x$srvdir" = x ]; then -- srvdir=/vicepa -+ srvdir=/mnt/vicepa - fi - - # Create the directory if needed. (Symlink is OK.) -diff -Nru coda-6.9.3/coda-src/scripts/vice-setup-user coda-6.9.3-gt/coda-src/scripts/vice-setup-user ---- coda-6.9.3/coda-src/scripts/vice-setup-user 2004-12-22 16:06:25.000000000 +0100 -+++ coda-6.9.3-gt/coda-src/scripts/vice-setup-user 2008-07-12 23:24:51.889740616 +0200 -@@ -31,7 +31,7 @@ - # - # Configuration - # --vicedir=/vice -+vicedir=/var/lib/vice - . "`codaconfedit server.conf`" - - # Set up password and group files for Coda -diff -Nru coda-6.9.3/coda-src/scripts/vice-setup.in coda-6.9.3-gt/coda-src/scripts/vice-setup.in ---- coda-6.9.3/coda-src/scripts/vice-setup.in 2007-07-20 23:34:49.000000000 +0200 -+++ coda-6.9.3-gt/coda-src/scripts/vice-setup.in 2008-07-12 23:25:43.881740900 +0200 -@@ -122,12 +122,12 @@ - fi - fi - --echon "What is the root directory for your coda server(s)? [/vice] " -+echon "What is the root directory for your coda server(s)? [/var/lib/vice] " - vicedir="" - read vicedir - - if [ "x$vicedir" = x ] ; then -- vicedir=/vice -+ vicedir=/var/lib/vice - fi - - if [ $mkconf = 1 ] ; then -@@ -410,7 +410,7 @@ - echo "That seems to have worked..." - echo "If you have a working Coda client you should now be able to" - echo "access the new Coda realm" -- echo " - cfs lv /coda/${hn}/" -+ echo " - cfs lv /mnt/coda/${hn}/" - fi - echo - echo "enjoy Coda." -@@ -444,7 +444,7 @@ - echo "After that, there is still some configuration needed on the SCM before" - echo "this server can be started." - echo --echo "An entry for this host is needed in /vice/db/servers" -+echo "An entry for this host is needed in /var/lib/vice/db/servers" - echo "Then all servers need to be shut down and restarted, as they need to" - echo "know about the new server." - echo "After all that it _should_ be ok to start the new server and create" -diff -Nru coda-6.9.3/coda-src/venus/venus.conf.ex coda-6.9.3-gt/coda-src/venus/venus.conf.ex ---- coda-6.9.3/coda-src/venus/venus.conf.ex 2007-10-17 21:26:34.000000000 +0200 -+++ coda-6.9.3-gt/coda-src/venus/venus.conf.ex 2008-07-12 22:53:43.817740642 +0200 -@@ -20,7 +20,7 @@ - # Which file is used for realm lookups, before we look at dns SRV and A - # records. - # --#realmtab=/etc/coda/realms -+realmtab=/etc/coda/realms - - # - # What should the size of the local cache be in 1k blocks. If this is -@@ -55,9 +55,9 @@ - - # - # Which file should receive venus's stderr output. --# (default is /usr/coda/etc/console). -+# (default is /var/lib/coda/etc/console). - # --#errorlog=/usr/coda/etc/console -+errorlog=/var/lib/coda/etc/console - - # - # What is the uid of the primary user of this system. The primary user -@@ -72,43 +72,43 @@ - - # - # What are the locations of the rvm log and data files or partitions. --# (default /usr/coda/{LOG,DATA} -+# (default /var/lib/coda/{LOG,DATA} - # - # CAUTION: these are _unrelated_ to the server's rvm log and data. Also - # when specifying partitions, do NOT specify any partions which might - # have an existing filesystem, as you WILL lose all data during - # initialization. - # --#rvm_log=/usr/coda/LOG --#rvm_data=/usr/coda/DATA -+rvm_log=/var/lib/coda/LOG -+rvm_data=/var/lib/coda/DATA - - # - # Where should venus keep it's pool of cached files. --# (default is /usr/coda/venus.cache) -+# (default is /var/lib/coda/venus.cache) - # --#cachedir=/usr/coda/venus.cache -+cachedir=/var/lib/coda/venus.cache - - # - # Where should venus store snapshots of the modification logs. This is - # primarily to provide some safe fallback when venus dies or messes up --# the CML during reintegration. (default is /usr/coda/spool) -+# the CML during reintegration. (default is /var/lib/coda/spool) - # --#checkpointdir=/usr/coda/spool -+checkpointdir=/var/lib/coda/spool - - # - # Where does venus store it's pidfile - # --#pid_file=/usr/coda/venus.cache/pid -+pid_file=/var/lib/coda/venus.cache/pid - - # - # What file does vutil use to control venus - # --#run_control_file=/usr/coda/venus.cache/VENUS_CTRL -+run_control_file=/var/lib/coda/venus.cache/VENUS_CTRL - - # - # Venus log file - # --#logfile=/usr/coda/etc/venus.log -+logfile=/var/lib/coda/etc/venus.log - - # - # Mariner socket, -@@ -116,7 +116,7 @@ - # codacon and spy use to talk to venus. On other platforms they will - # connect to venus through tcp port 2430. - # --#marinersocket=/usr/coda/spool/mariner -+marinersocket=/var/lib/coda/spool/mariner - - # - # Dont use RVM, -@@ -271,3 +271,11 @@ - # - #isr=0 - -+# Mountpoint -+# Where the coda filesystem is mounted, many application still depend on -+# this being /coda. I am unsure whether it matters much on Windows95/98, -+# but we normally use N: for those. -+# -+#mountpoint=N: -+#mountpoint=/coda -+mountpoint=/mnt/coda -diff -Nru coda-6.9.3/coda-src/vice/server.conf.ex coda-6.9.3-gt/coda-src/vice/server.conf.ex ---- coda-6.9.3/coda-src/vice/server.conf.ex 2007-06-26 18:18:19.000000000 +0200 -+++ coda-6.9.3-gt/coda-src/vice/server.conf.ex 2008-07-12 22:54:43.185740582 +0200 -@@ -11,7 +11,7 @@ - # - # Prefix of server tree - # --#vicedir=/vice -+vicedir=/var/lib/vice - - # - # Should the server use private mmaps for RVM diff --git a/coda/net-fs/coda/files/coda-update b/coda/net-fs/coda/files/coda-update deleted file mode 100644 index b1fc1b6..0000000 --- a/coda/net-fs/coda/files/coda-update +++ /dev/null @@ -1,40 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -depend() { - need net auth2 - use logger - after domainname -} - -start() { - if [[ "`cat /var/lib/vice/hostname`" == "`cat /var/lib/vice/db/scm`" ]] ; then - ebegin "Starting updatesrv" - start-stop-daemon --start --background \ - --pidfile /var/lib/vice/misc/updatesrv.pid \ - --exec /usr/sbin/updatesrv - eend $? - fi - - ebegin "Starting updateclnt" - start-stop-daemon --start --background \ - --pidfile /var/lib/vice/misc/updateclnt.pid \ - --exec /usr/sbin/updateclnt -- -h `cat /var/lib/vice/db/scm` - eend $? -} - -stop() { - ebegin "Stopping updatesrv" - start-stop-daemon --stop \ - --pidfile /var/lib/vice/misc/updatesrv.pid \ - --name updatesrv - eend $? - - ebegin "Stopping updateclnt" - start-stop-daemon --stop \ - --pidfile /var/lib/vice/misc/updateclnt.pid \ - --name updateclnt - eend $? -} diff --git a/coda/net-fs/coda/files/codasrv b/coda/net-fs/coda/files/codasrv deleted file mode 100644 index 349020b..0000000 --- a/coda/net-fs/coda/files/codasrv +++ /dev/null @@ -1,26 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -depend() { - need net coda-update auth2 - use logger - after domainname -} - -start() { - ebegin "Starting ${SVCNAME}" - start-stop-daemon --start --background \ - --exec /usr/sbin/codasrv - eend $? -} - -stop() { - ebegin "Stopping ${SVCNAME}" - volmsg=`/usr/sbin/volutil shutdown 2>&1` || echo "${volmsg}" - start-stop-daemon --stop \ - --retry 30/TERM --oknodo \ - --exec /usr/sbin/codasrv - eend $? -} diff --git a/coda/net-fs/coda/files/venus b/coda/net-fs/coda/files/venus deleted file mode 100644 index 4b58c7d..0000000 --- a/coda/net-fs/coda/files/venus +++ /dev/null @@ -1,29 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -depend() { - need net - after codasrv domainname -} - -start() { - ebegin "Starting ${SVCNAME}" - start-stop-daemon --start --background \ - --pidfile /var/lib/coda/venus.cache/pid --make-pidfile \ - --exec /usr/sbin/venus - eend $? -} - -stop() { - ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop \ - --pidfile /var/lib/coda/venus.cache/pid \ - --name venus - eend $? - - ebegin "Unmounting /mnt/coda" - umount -l /mnt/coda - eend $? -} diff --git a/coda/net-fs/coda/metadata.xml b/coda/net-fs/coda/metadata.xml deleted file mode 100644 index fde0080..0000000 --- a/coda/net-fs/coda/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - -net-fs - - chtekk@gentoo.org - Luca Longinotti - - diff --git a/coda/net-libs/rpc2/Manifest b/coda/net-libs/rpc2/Manifest deleted file mode 100644 index 408227c..0000000 --- a/coda/net-libs/rpc2/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST rpc2-2.7.tar.gz 624013 RMD160 d57410399424a08e6a016c4cf517454f6ae3961f SHA1 adcb2eb324d18f8da88b3e7e85ec4551b1591372 SHA256 39ac1b27384cb6529b48986fa3a72687914b67d152ed47ba8ba5342b324dd60d -EBUILD rpc2-2.7.ebuild 641 RMD160 f0de2d9f4713d17758b7ecb38efcb6f30d68badd SHA1 05db001695747383b0b13ad9ad20be6b6930765a SHA256 fc04825bf9a3f4af18b6bdfdfeaf4b2d97a19713833aedd5ccea3e7dfe9b8f33 -MISC metadata.xml 250 RMD160 6aa4816072481129f87c0eb8a85c6a15287da965 SHA1 a8f9a0fb13692c19c95e700e32796c147c6c7804 SHA256 1ed32cc76b9bd8664c2bfd7d84f4186b444d5d39659b40523d0bc27e0ebb9846 diff --git a/coda/net-libs/rpc2/metadata.xml b/coda/net-libs/rpc2/metadata.xml deleted file mode 100644 index fde0080..0000000 --- a/coda/net-libs/rpc2/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - -net-fs - - chtekk@gentoo.org - Luca Longinotti - - diff --git a/coda/net-libs/rpc2/rpc2-2.7.ebuild b/coda/net-libs/rpc2/rpc2-2.7.ebuild deleted file mode 100644 index e8138ea..0000000 --- a/coda/net-libs/rpc2/rpc2-2.7.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" - -inherit autotools - -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86" - -DESCRIPTION="Remote procedure call package for IP/UDP (used by Coda)." -HOMEPAGE="http://www.coda.cs.cmu.edu/" -SRC_URI="http://www.coda.cs.cmu.edu/pub/${PN}/src/${P}.tar.gz" -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="" - -RDEPEND=">=sys-libs/lwp-2.4" -DEPEND="${RDEPEND} - dev-lang/perl" - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc AUTHORS NEWS README README.ipv6 -} diff --git a/coda/profiles/repo_name b/coda/profiles/repo_name deleted file mode 100644 index ebf05ad..0000000 --- a/coda/profiles/repo_name +++ /dev/null @@ -1 +0,0 @@ -chtekk-coda diff --git a/coda/sys-libs/lwp/Manifest b/coda/sys-libs/lwp/Manifest deleted file mode 100644 index 9b1db13..0000000 --- a/coda/sys-libs/lwp/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX lwp-2.4-imp_dec.patch 349 RMD160 ea2f865f59e702d030688393003a34eb65638b1f SHA1 b942f0f96c80e14a832568e0673d8890693a2be2 SHA256 397618636b439217f784cf0ed3f0935fc07dd652351fed5cf01521197b826747 -DIST lwp-2.4.tar.gz 386511 RMD160 963786da9e39ad2182df3994ff8b4050f30d4cd6 SHA1 c15064a9b5991db14cd00ea0bd8528559a28f57b SHA256 2905ea436d6a9bdd18487e05e2cd253d49d98ec18c662a45310b3a2d913b76c9 -EBUILD lwp-2.4.ebuild 703 RMD160 f68d93599dee71bd8e7012c240e3fd5173e003bb SHA1 1cc9bb1b62aee18fd353f5345e2da14c4394b6bc SHA256 24819562ca3b7191cb3b26cfc4c5e6affaf458ad183bfc9838758b6e298cf71c -MISC metadata.xml 250 RMD160 6aa4816072481129f87c0eb8a85c6a15287da965 SHA1 a8f9a0fb13692c19c95e700e32796c147c6c7804 SHA256 1ed32cc76b9bd8664c2bfd7d84f4186b444d5d39659b40523d0bc27e0ebb9846 diff --git a/coda/sys-libs/lwp/files/lwp-2.4-imp_dec.patch b/coda/sys-libs/lwp/files/lwp-2.4-imp_dec.patch deleted file mode 100644 index 2158f5b..0000000 --- a/coda/sys-libs/lwp/files/lwp-2.4-imp_dec.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lwp-2.4/src/lwp_ucontext.c 2006-07-19 21:52:24.000000000 +0200 -+++ lwp-2.4/src/lwp_ucontext.c 2008-07-12 19:01:57.865778827 +0200 -@@ -18,6 +18,8 @@ - #include - #include - #include -+#include -+#include - #include "lwp_ucontext.h" - - /* if we already have ucontext.h we don't need any of this */ diff --git a/coda/sys-libs/lwp/lwp-2.4.ebuild b/coda/sys-libs/lwp/lwp-2.4.ebuild deleted file mode 100644 index 23ae4e6..0000000 --- a/coda/sys-libs/lwp/lwp-2.4.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" - -inherit autotools eutils - -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" - -DESCRIPTION="Lightweight process library (used by Coda). This is NOT libwww-perl." -HOMEPAGE="http://www.coda.cs.cmu.edu/" -SRC_URI="http://www.coda.cs.cmu.edu/pub/${PN}/src/${P}.tar.gz" -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="" - -DEPEND="" -RDEPEND="" - -src_unpack() { - unpack ${A} - - cd "${S}" - epatch "${FILESDIR}/${P}-imp_dec.patch" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc AUTHORS NEWS PORTING README -} diff --git a/coda/sys-libs/lwp/metadata.xml b/coda/sys-libs/lwp/metadata.xml deleted file mode 100644 index fde0080..0000000 --- a/coda/sys-libs/lwp/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - -net-fs - - chtekk@gentoo.org - Luca Longinotti - - diff --git a/coda/sys-libs/rvm/Manifest b/coda/sys-libs/rvm/Manifest deleted file mode 100644 index 5803697..0000000 --- a/coda/sys-libs/rvm/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST rvm-1.15.tar.gz 554417 RMD160 33697e65725fb82d099eaf1fc3bb34b17aa9ab01 SHA1 d4aa3e034cd26812191250982ff4266cc90c0243 SHA256 8edcf5895e5d8a47e40ba4e3ce71cb677de050793ac0e0c0fdad74877bc74540 -EBUILD rvm-1.15.ebuild 598 RMD160 37b64663afd19182d658be8879b8591e4b80ae20 SHA1 b30fc918bd58b8e77a9e52ee7b6dfd9391a4aacf SHA256 5880d77a435920303e4e28144bb3f1d2918316d5e46836ac42da9101bd71f193 -MISC metadata.xml 250 RMD160 6aa4816072481129f87c0eb8a85c6a15287da965 SHA1 a8f9a0fb13692c19c95e700e32796c147c6c7804 SHA256 1ed32cc76b9bd8664c2bfd7d84f4186b444d5d39659b40523d0bc27e0ebb9846 diff --git a/coda/sys-libs/rvm/metadata.xml b/coda/sys-libs/rvm/metadata.xml deleted file mode 100644 index fde0080..0000000 --- a/coda/sys-libs/rvm/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - -net-fs - - chtekk@gentoo.org - Luca Longinotti - - diff --git a/coda/sys-libs/rvm/rvm-1.15.ebuild b/coda/sys-libs/rvm/rvm-1.15.ebuild deleted file mode 100644 index 28518bd..0000000 --- a/coda/sys-libs/rvm/rvm-1.15.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" - -inherit autotools - -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86" - -DESCRIPTION="Recoverable Virtual Memory (used by Coda)." -HOMEPAGE="http://www.coda.cs.cmu.edu/" -SRC_URI="http://www.coda.cs.cmu.edu/pub/${PN}/src/${P}.tar.gz" -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="" - -DEPEND=">=sys-libs/lwp-2.4" -RDEPEND="${DEPEND}" - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc AUTHORS NEWS README -} diff --git a/syscp/patches/gentoo-config-files/bind-ssl/etc_libnss-mysql-root.cfg b/syscp/patches/gentoo-config-files/bind-ssl/etc_libnss-mysql-root.cfg deleted file mode 100644 index 6498977..0000000 --- a/syscp/patches/gentoo-config-files/bind-ssl/etc_libnss-mysql-root.cfg +++ /dev/null @@ -1,2 +0,0 @@ -username -password diff --git a/syscp/patches/gentoo-config-files/bind-ssl/etc_libnss-mysql.cfg b/syscp/patches/gentoo-config-files/bind-ssl/etc_libnss-mysql.cfg deleted file mode 100644 index d284192..0000000 --- a/syscp/patches/gentoo-config-files/bind-ssl/etc_libnss-mysql.cfg +++ /dev/null @@ -1,38 +0,0 @@ -getpwnam SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ - FROM ftp_users \ - WHERE username='%1$s' \ - LIMIT 1 -getpwuid SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ - FROM ftp_users \ - WHERE uid='%1$u' \ - LIMIT 1 -getspnam SELECT username,password,UNIX_TIMESTAMP()-10,'1','2','7','-1','-1','0' \ - FROM ftp_users \ - WHERE username='%1$s' \ - LIMIT 1 -getpwent SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ - FROM ftp_users -getspent SELECT username,password,UNIX_TIMESTAMP()-10,'1','2','7','-1','-1','0' \ - FROM ftp_users -getgrnam SELECT groupname,'x',gid \ - FROM ftp_groups \ - WHERE groupname='%1$s' \ - LIMIT 1 -getgrgid SELECT groupname,'x',gid \ - FROM ftp_groups \ - WHERE gid='%1$u' \ - LIMIT 1 -getgrent SELECT groupname,'x',gid \ - FROM ftp_groups -memsbygid SELECT username \ - FROM ftp_users \ - WHERE gid='%1$u' -gidsbymem SELECT gid \ - FROM ftp_users \ - WHERE username='%1$s' - -host -database -username -password -socket /var/run/mysqld/mysqld.sock diff --git a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/bind/etc_bind_default.zone b/syscp/patches/gentoo-config-files/bind-ssl/gentoo/bind/etc_bind_default.zone deleted file mode 100644 index 817b9bc..0000000 --- a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/bind/etc_bind_default.zone +++ /dev/null @@ -1,21 +0,0 @@ -$TTL 1W -@ IN SOA ns root ( - 2004060501 ; serial - 8H ; refresh - 2H ; retry - 1W ; expiry - 11h) ; minimum - - IN NS ns - IN MX 10 mail - - IN A - IN MX 10 mail - -* IN A - IN MX 10 mail - -ns IN A - -mail IN A - IN MX 10 mail diff --git a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/courier/etc_courier-imap_imapd b/syscp/patches/gentoo-config-files/bind-ssl/gentoo/courier/etc_courier-imap_imapd deleted file mode 100644 index f594e41..0000000 --- a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/courier/etc_courier-imap_imapd +++ /dev/null @@ -1,376 +0,0 @@ -##VERSION: $Id: imapd.dist.in,v 1.32 2004/11/25 04:57:04 mrsam Exp $ -# -# imapd created from imapd.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# Copyright 1998 - 2004 Double Precision, Inc. See COPYING for -# distribution information. -# -# This configuration file sets various options for the Courier-IMAP server -# when used with the couriertcpd server. -# A lot of the stuff here is documented in the manual page for couriertcpd. -# -# NOTE - do not use \ to split long variable contents on multiple lines. -# This will break the default imapd.rc script, which parses this file. -# -##NAME: ADDRESS:0 -# -# Address to listen on, can be set to a single IP address. -# -# ADDRESS=127.0.0.1 - -ADDRESS=0 - -##NAME: PORT:1 -# -# Port numbers that connections are accepted on. The default is 143, -# the standard IMAP port. -# -# Multiple port numbers can be separated by commas. When multiple port -# numbers are used it is possible to select a specific IP address for a -# given port as "ip.port". For example, "127.0.0.1.900,192.68.0.1.900" -# accepts connections on port 900 on IP addresses 127.0.0.1 and 192.68.0.1 -# The previous ADDRESS setting is a default for ports that do not have -# a specified IP address. - -PORT=143 - -##NAME: AUTHSERVICE:0 -# -# It's possible to authenticate using a different 'service' parameter -# depending on the connection's port. This only works with authentication -# modules that use the 'service' parameter, such as PAM. Example: -# -# AUTHSERVICE143=imap -# AUTHSERVICE993=imaps - -##NAME: MAXDAEMONS:0 -# -# Maximum number of IMAP servers started -# - -MAXDAEMONS=50 - -##NAME: MAXPERIP:0 -# -# Maximum number of connections to accept from the same IP address - -MAXPERIP=10 - -##NAME: PIDFILE:0 -# -# File where couriertcpd will save its process ID -# - -PIDFILE=/var/run/imapd.pid - -##NAME: TCPDOPTS:0 -# -# Miscellaneous couriertcpd options that shouldn't be changed. -# - -TCPDOPTS="-nodnslookup -noidentlookup" - -##NAME: IMAP_CAPABILITY:1 -# -# IMAP_CAPABILITY specifies what most of the response should be to the -# CAPABILITY command. -# -# If you have properly configured Courier to use CRAM-MD5 or CRAM-SHA1 -# authentication (see INSTALL), set IMAP_CAPABILITY as follows: -# -# IMAP_CAPABILITY="IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 IDLE" -# - -IMAP_CAPABILITY="IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA IDLE" - -##NAME: KEYWORDS_CAPABILITY:0 -# -# IMAP_KEYWORDS=1 enables custom IMAP keywords. Set this option to 0 to -# disable custom keywords. - -IMAP_KEYWORDS=1 - -##NAME: SMAP1_CAPABILITY:0 -# -# EXPERIMENTAL -# -# To enable the experimental "Simple Mail Access Protocol" extensions, -# uncomment the following setting. -# -# SMAP_CAPABILITY=SMAP1 - -##NAME: IMAP_CAPABILITY_ORIG:1 -# -# For use by webadmin - -IMAP_CAPABILITY_ORIG="IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 IDLE" - -##NAME: IMAP_PROXY:0 -# -# Enable proxying. See README.proxy - -IMAP_PROXY=0 - -##NAME: IMAP_PROXY_FOREIGN:0 -# -# Proxying to non-Courier servers. Re-sends the CAPABILITY command after -# logging in to the remote server. May not work with all IMAP clients. - -IMAP_PROXY_FOREIGN=0 - -##NAME: IMAP_IDLE_TIMEOUT:0 -# -# This setting controls how often -# the server polls for changes to the folder, in IDLE mode (in seconds). - -IMAP_IDLE_TIMEOUT=60 - -##NAME: IMAP_CAPABILITY_TLS:0 -# -# The following setting will advertise SASL PLAIN authentication after -# STARTTLS is established. If you want to allow SASL PLAIN authentication -# with or without TLS then just comment this out, and add AUTH=PLAIN to -# IMAP_CAPABILITY - -IMAP_CAPABILITY_TLS="$IMAP_CAPABILITY AUTH=PLAIN" - -##NAME: IMAP_TLS_ORIG:0 -# -# For use by webadmin - -IMAP_CAPABILITY_TLS_ORIG="$IMAP_CAPABILITY_ORIG AUTH=PLAIN" - -##NAME: IMAP_DISABLETHREADSORT:0 -# -# Set IMAP_DISABLETHREADSORT to disable the THREAD and SORT commands - -# server side sorting and threading. -# -# Those capabilities will still be advertised, but the server will reject -# them. Set this option if you want to disable all the extra load from -# server-side threading and sorting. Not advertising those capabilities -# will simply result in the clients reading the entire folder, and sorting -# it on the client side. That will still put some load on the server. -# advertising these capabilities, but rejecting the commands, will stop this -# silliness. -# - -IMAP_DISABLETHREADSORT=0 - -##NAME: IMAP_CHECK_ALL_FOLDERS:0 -# -# Set IMAP_CHECK_ALL_FOLDERS to 1 if you want the server to check for new -# mail in every folder. Not all IMAP clients use the IMAP's new mail -# indicator, but some do. Normally new mail is checked only in INBOX, -# because it is a comparatively time consuming operation, and it would be -# a complete waste of time unless mail filters are used to deliver -# mail directly to folders. -# -# When IMAP clients are used which support new mail indication, and when -# mail filters are used to sort incoming mail into folders, setting -# IMAP_CHECK_ALL_FOLDERS to 1 will allow IMAP clients to announce new -# mail in folders. Note that this will result in slightly more load on the -# server. -# - -IMAP_CHECK_ALL_FOLDERS=0 - -##NAME: IMAP_OBSOLETE_CLIENT:0 -# -# Set IMAP_OBSOLETE_CLIENT if your IMAP client expects \\NoInferiors to mean -# what \\HasNoChildren really means. - -IMAP_OBSOLETE_CLIENT=0 - -##NAME: IMAP_UMASK:0 -# -# IMAP_UMASK sets the umask of the server process. The value of IMAP_UMASK is -# simply passed to the "umask" command. The default value is 022. -# -# This feature is mostly useful for shared folders, where the file permissions -# of the messages may be important. - -IMAP_UMASK=027 - -##NAME: IMAP_ULIMITD:0 -# -# IMAP_ULIMITD sets the maximum size of the data segment of the server -# process. The value of IMAP_ULIMITD is simply passed to the "ulimit -d" -# command (or ulimit -v). The argument to ulimi sets the upper limit on the -# size of the data segment of the server process, in kilobytes. The default -# value of 65536 sets a very generous limit of 64 megabytes, which should -# be more than plenty for anyone. -# -# This feature is used as an additional safety check that should stop -# any potential denial-of-service attacks that exploit any kind of -# a memory leak to exhaust all the available memory on the server. -# It is theoretically possible that obscenely huge folders will also -# result in the server running out of memory when doing server-side -# sorting (by my calculations you have to have at least 100,000 messages -# in a single folder, for that to happen). - -IMAP_ULIMITD=65536 - -##NAME: IMAP_USELOCKS:0 -# -# Setting IMAP_USELOCKS to 1 will use dot-locking to support concurrent -# multiple access to the same folder. This incurs slight additional -# overhead. Concurrent multiple access will still work without this setting, -# however occasionally a minor race condition may result in an IMAP client -# downloading the same message twice, or a keyword update will fail. -# -# IMAP_USELOCKS=1 is strongly recommended when shared folders are used. - -IMAP_USELOCKS=1 - -##NAME: IMAP_SHAREDINDEXFILE:0 -# -# The index of all accessible folders. Do not change this setting unless -# you know what you're doing. See README.sharedfolders for additional -# information. - -IMAP_SHAREDINDEXFILE=/etc/courier-imap/shared/index - -##NAME: IMAP_ENHANCEDIDLE:0 -# -# If Courier was compiled with the File Alteration Monitor, setting -# IMAP_ENHANCEDIDLE to 1 enables enhanced IDLE mode, where multiple -# clients may open the same folder concurrently, and receive updates to -# folder contents in realtime. See the imapd(8) man page for additional -# information. -# -# IMPORTANT: IMAP_USELOCKS *MUST* also be set to 1, and IDLE must be included -# in the IMAP_CAPABILITY list. -# - -IMAP_ENHANCEDIDLE=0 - -##NAME: IMAP_TRASHFOLDERNAME:0 -# -# The name of the magic trash Folder. For MSOE compatibility, -# you can set IMAP_TRASHFOLDERNAME="Deleted Items". -# -# IMPORTANT: If you change this, you must also change IMAP_EMPTYTRASH - -IMAP_TRASHFOLDERNAME=Trash - -##NAME: IMAP_EMPTYTRASH:0 -# -# The following setting is optional, and causes messages from the given -# folder to be automatically deleted after the given number of days. -# IMAP_EMPTYTRASH is a comma-separated list of folder:days. The default -# setting, below, purges 7 day old messages from the Trash folder. -# Another useful setting would be: -# -# IMAP_EMPTYTRASH=Trash:7,Sent:30 -# -# This would also delete messages from the Sent folder (presumably copies -# of sent mail) after 30 days. This is a global setting that is applied to -# every mail account, and is probably useful in a controlled, corporate -# environment. -# -# Important: the purging is controlled by CTIME, not MTIME (the file time -# as shown by ls). It is perfectly ordinary to see stuff in Trash that's -# a year old. That's the file modification time, MTIME, that's displayed. -# This is generally when the message was originally delivered to this -# mailbox. Purging is controlled by a different timestamp, CTIME, which is -# changed when the file is moved to the Trash folder (and at other times too). -# -# You might want to disable this setting in certain situations - it results -# in a stat() of every file in each folder, at login and logout. -# - -IMAP_EMPTYTRASH=Trash:7 - -##NAME: IMAP_MOVE_EXPUNGE_TO_TRASH:0 -# -# Set IMAP_MOVE_EXPUNGE_TO_TRASH to move expunged messages to Trash. This -# effectively allows an undo of message deletion by fishing the deleted -# mail from trash. Trash can be manually expunged as usually, and mail -# will get automatically expunged from Trash according to IMAP_EMPTYTRASH. -# -# NOTE: shared folders are still expunged as usual. Shared folders are -# not affected. -# - -IMAP_MOVE_EXPUNGE_TO_TRASH=0 - - -##NAME: OUTBOX:0 -# -# The next set of options deal with the "Outbox" enhancement. -# Uncomment the following setting to create a special folder, named -# INBOX.Outbox -# -# OUTBOX=.Outbox - -##NAME: SENDMAIL:0 -# -# If OUTBOX is defined, mail can be sent via the IMAP connection by copying -# a message to the INBOX.Outbox folder. For all practical matters, -# INBOX.Outbox looks and behaves just like any other IMAP folder. If this -# folder doesn't exist it must be created by the IMAP mail client, just -# like any other IMAP folder. The kicker: any message copied or moved to -# this folder is will be E-mailed by the Courier-IMAP server, by running -# the SENDMAIL program. Therefore, messages copied or moved to this -# folder must be well-formed RFC-2822 messages, with the recipient list -# specified in the To:, Cc:, and Bcc: headers. Courier-IMAP relies on -# SENDMAIL to read the recipient list from these headers (and delete the Bcc: -# header) by running the command "$SENDMAIL -oi -t -f $SENDER", with the -# message piped on standard input. $SENDER will be the return address -# of the message, which is set by the authentication module. -# -# DO NOT MODIFY SENDMAIL, below, unless you know what you're doing. -# - -SENDMAIL=/usr/sbin/sendmail - -##NAME: HEADERFROM:0 -# -# For administrative and oversight purposes, the return address, $SENDER -# will also be saved in the X-IMAP-Sender mail header. This header gets -# added to the sent E-mail (but it doesn't get saved in the copy of the -# message that's saved in the folder) -# -# WARNING - By enabling OUTBOX above, *every* IMAP mail client will receive -# the magic OUTBOX treatment. Therefore advance LARTing is in order for -# _all_ of your lusers, until every one of them is aware of this. Otherwise if -# OUTBOX is left at its default setting - a folder name that might be used -# accidentally - some people may be in for a rude surprise. You can redefine -# the name of the magic folder by changing OUTBOX, above. You should do that -# and pick a less-obvious name. Perhaps brand it with your organizational -# name ( OUTBOX=.WidgetsAndSonsOutbox ) - -HEADERFROM=X-IMAP-Sender - -##NAME: IMAPDSTART:0 -# -# IMAPDSTART is not used directly. Rather, this is a convenient flag to -# be read by your system startup script in /etc/rc.d, like this: -# -# . /etc/courier-imap/imapd -# -# case x$IMAPDSTART in -# x[yY]*) -# /usr/lib/courier-imap/imapd.rc start -# ;; -# esac -# -# The default setting is going to be NO, so you'll have to manually flip -# it to yes. - -IMAPDSTART=YES - -##NAME: MAILDIRPATH:0 -# -# MAILDIRPATH - directory name of the maildir directory. -# -MAILDIRPATH=Maildir - -#Hardwire a value for ${MAILDIR} -MAILDIR=.maildir -MAILDIRPATH=.maildir -#Put any program for ${PRERUN} here -PRERUN= diff --git a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/courier/etc_courier-imap_imapd-ssl b/syscp/patches/gentoo-config-files/bind-ssl/gentoo/courier/etc_courier-imap_imapd-ssl deleted file mode 100644 index 76dbcf7..0000000 --- a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/courier/etc_courier-imap_imapd-ssl +++ /dev/null @@ -1,199 +0,0 @@ -##VERSION: $Id: imapd-ssl.dist.in,v 1.11 2004/10/21 00:45:35 mrsam Exp $ -# -# imapd-ssl created from imapd-ssl.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# Copyright 2000 - 2004 Double Precision, Inc. See COPYING for -# distribution information. -# -# This configuration file sets various options for the Courier-IMAP server -# when used to handle SSL IMAP connections. -# -# SSL and non-SSL connections are handled by a dedicated instance of the -# couriertcpd daemon. If you are accepting both SSL and non-SSL IMAP -# connections, you will start two instances of couriertcpd, one on the -# IMAP port 143, and another one on the IMAP-SSL port 993. -# -# Download OpenSSL from http://www.openssl.org/ -# -##NAME: SSLPORT:1 -# -# Options in the imapd-ssl configuration file AUGMENT the options in the -# imapd configuration file. First the imapd configuration file is read, -# then the imapd-ssl configuration file, so we do not have to redefine -# anything. -# -# However, some things do have to be redefined. The port number is -# specified by SSLPORT, instead of PORT. The default port is port 993. -# -# Multiple port numbers can be separated by commas. When multiple port -# numbers are used it is possibly to select a specific IP address for a -# given port as "ip.port". For example, "127.0.0.1.900,192.68.0.1.900" -# accepts connections on port 900 on IP addresses 127.0.0.1 and 192.68.0.1 -# The SSLADDRESS setting is a default for ports that do not have -# a specified IP address. - -SSLPORT=993 - -##NAME: SSLADDRESS:0 -# -# Address to listen on, can be set to a single IP address. -# -# SSLADDRESS=127.0.0.1 - -SSLADDRESS=0 - -##NAME: SSLPIDFILE:0 -# -# That's the SSL IMAP port we'll listen on. -# Feel free to redefine MAXDAEMONS, TCPDOPTS, and MAXPERIP. - -SSLPIDFILE=/var/run/imapd-ssl.pid - -##NAME: IMAPDSSLSTART:0 -# -# Different pid files, so that both instances of couriertcpd can coexist -# happily. -# -# You can also redefine IMAP_CAPABILITY, although I can't -# think of why you'd want to do that. -# -# -# Ok, the following settings are new to imapd-ssl: -# -# Whether or not to start IMAP over SSL on simap port: - -IMAPDSSLSTART=YES - -##NAME: IMAPDSTARTTLS:0 -# -# Whether or not to implement IMAP STARTTLS extension instead: - -IMAPDSTARTTLS=YES - -##NAME: IMAP_TLS_REQUIRED:1 -# -# Set IMAP_TLS_REQUIRED to 1 if you REQUIRE STARTTLS for everyone. -# (this option advertises the LOGINDISABLED IMAP capability, until STARTTLS -# is issued). - -IMAP_TLS_REQUIRED=0 - -######################################################################### -# -# The following variables configure IMAP over SSL. If OpenSSL is available -# during configuration, the couriertls helper gets compiled, and upon -# installation a dummy TLS_CERTFILE gets generated. courieresmtpd will -# automatically advertise the ESMTP STARTTLS extension if both TLS_CERTFILE -# and COURIERTLS exist. -# -# WARNING: Peer certificate verification has NOT yet been tested. Proceed -# at your own risk. Only the basic SSL/TLS functionality is known to be -# working. Keep this in mind as you play with the following variables. -# -##NAME: COURIERTLS:0 -# - -COURIERTLS=/usr/sbin/couriertls - -##NAME: TLS_PROTOCOL:0 -# -# TLS_PROTOCOL sets the protocol version. The possible versions are: -# -# SSL2 - SSLv2 -# SSL3 - SSLv3 -# TLS1 - TLS1 - -TLS_PROTOCOL=SSL3 - -##NAME: TLS_STARTTLS_PROTOCOL:0 -# -# TLS_STARTTLS_PROTOCOL is used instead of TLS_PROTOCOL for the IMAP STARTTLS -# extension, as opposed to IMAP over SSL on port 993. -# - -TLS_STARTTLS_PROTOCOL=TLS1 - -##NAME: TLS_CIPHER_LIST:0 -# -# TLS_CIPHER_LIST optionally sets the list of ciphers to be used by the -# OpenSSL library. In most situations you can leave TLS_CIPHER_LIST -# undefined -# -# TLS_CIPHER_LIST="ALL:!ADH:RC4+RSA:+SSLv2:@STRENGTH" - -##NAME: TLS_TIMEOUT:0 -# TLS_TIMEOUT is currently not implemented, and reserved for future use. -# This is supposed to be an inactivity timeout, but its not yet implemented. -# - -##NAME: TLS_DHCERTFILE:0 -# -# TLS_DHCERTFILE - PEM file that stores our Diffie-Hellman cipher pair. -# When OpenSSL is compiled to use Diffie-Hellman ciphers instead of RSA -# you must generate a DH pair that will be used. In most situations the -# DH pair is to be treated as confidential, and the file specified by -# TLS_DHCERTFILE must not be world-readable. -# -# TLS_DHCERTFILE= - -##NAME: TLS_CERTFILE:0 -# -# TLS_CERTFILE - certificate to use. TLS_CERTFILE is required for SSL/TLS -# servers, and is optional for SSL/TLS clients. TLS_CERTFILE is usually -# treated as confidential, and must not be world-readable. -# -TLS_CERTFILE=/etc/ssl/server/.crt_and_key - -##NAME: TLS_TRUSTCERTS:0 -# -# TLS_TRUSTCERTS=pathname - load trusted certificates from pathname. -# pathname can be a file or a directory. If a file, the file should -# contain a list of trusted certificates, in PEM format. If a -# directory, the directory should contain the trusted certificates, -# in PEM format, one per file and hashed using OpenSSL's c_rehash -# script. TLS_TRUSTCERTS is used by SSL/TLS clients (by specifying -# the -domain option) and by SSL/TLS servers (TLS_VERIFYPEER is set -# to PEER or REQUIREPEER). -# -# -# TLS_TRUSTCERTS= - -##NAME: TLS_VERIFYPEER:0 -# -# TLS_VERIFYPEER - how to verify client certificates. The possible values of -# this setting are: -# -# NONE - do not verify anything -# -# PEER - verify the client certificate, if one's presented -# -# REQUIREPEER - require a client certificate, fail if one's not presented -# -# -TLS_VERIFYPEER=NONE - -##NAME: TLS_CACHE:0 -# -# A TLS/SSL session cache may slightly improve response for IMAP clients -# that open multiple SSL sessions to the server. TLS_CACHEFILE will be -# automatically created, TLS_CACHESIZE bytes long, and used as a cache -# buffer. -# -# This is an experimental feature and should be disabled if it causes -# problems with SSL clients. Disable SSL caching by commenting out the -# following settings: - -TLS_CACHEFILE=/var/lib/courier-imap/couriersslcache -TLS_CACHESIZE=524288 - -##NAME: MAILDIRPATH:0 -# -# MAILDIRPATH - directory name of the maildir directory. -# -MAILDIRPATH=Maildir - -#Hardwire a value for ${MAILDIR} -MAILDIRPATH=.maildir diff --git a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/courier/etc_courier-imap_pop3d b/syscp/patches/gentoo-config-files/bind-ssl/gentoo/courier/etc_courier-imap_pop3d deleted file mode 100644 index 71502ae..0000000 --- a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/courier/etc_courier-imap_pop3d +++ /dev/null @@ -1,127 +0,0 @@ -##VERSION: $Id: pop3d.dist.in,v 1.11 2004/10/30 15:39:38 mrsam Exp $ -# -# pop3d created from pop3d.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# Copyright 1998 - 2004 Double Precision, Inc. See COPYING for -# distribution information. -# -# Courier POP3 daemon configuration -# -##NAME: PIDFILE:0 -# - -PIDFILE=/var/run/pop3d.pid - -##NAME: MAXDAEMONS:0 -# -# Maximum number of POP3 servers started -# - -MAXDAEMONS=50 - -##NAME: MAXPERIP:4 -# -# Maximum number of connections to accept from the same IP address - -MAXPERIP=5 - -##NAME: POP3AUTH:1 -# -# To advertise the SASL capability, per RFC 2449, uncomment the POP3AUTH -# variable: -# -# POP3AUTH="LOGIN" -# -# If you have configured the CRAM-MD5 or CRAM-SHA1, set POP3AUTH to something -# like this: -# -# POP3AUTH="LOGIN CRAM-MD5 CRAM-SHA1" - -POP3AUTH="" - -##NAME: POP3AUTH_ORIG:0 -# -# For use by webadmin - -POP3AUTH_ORIG="LOGIN CRAM-MD5 CRAM-SHA1" - -##NAME: POP3AUTH_TLS:1 -# -# To also advertise SASL PLAIN if SSL is enabled, uncomment the -# POP3AUTH_TLS environment variable: -# -# POP3AUTH_TLS="LOGIN PLAIN" - -POP3AUTH_TLS="" - -##NAME: POP3AUTH_TLS_ORIG:0 -# -# For use by webadmin - -POP3AUTH_TLS_ORIG="LOGIN PLAIN" - -##NAME: POP3_PROXY:0 -# -# Enable proxying. See README.proxy - -POP3_PROXY=0 - -##NAME: PORT:1 -# -# Port to listen on for connections. The default is port 110. -# -# Multiple port numbers can be separated by commas. When multiple port -# numbers are used it is possibly to select a specific IP address for a -# given port as "ip.port". For example, "127.0.0.1.900,192.68.0.1.900" -# accepts connections on port 900 on IP addresses 127.0.0.1 and 192.68.0.1 -# The ADDRESS setting is a default for ports that do not have a specified -# IP address. - -PORT=110 - -##NAME: ADDRESS:0 -# -# IP address to listen on. 0 means all IP addresses. - -ADDRESS=0 - -##NAME: TCPDOPTS:0 -# -# Other couriertcpd(1) options. The following defaults should be fine. -# - -TCPDOPTS="-nodnslookup -noidentlookup" - -##NAME: POP3DSTART:0 -# -# POP3DSTART is not referenced anywhere in the standard Courier programs -# or scripts. Rather, this is a convenient flag to be read by your system -# startup script in /etc/rc.d, like this: -# -# . /etc/courier-imap/pop3d -# case x$POP3DSTART in -# x[yY]*) -# /usr/lib/courier-imap/pop3d.rc start -# ;; -# esac -# -# The default setting is going to be NO, until Courier is shipped by default -# with enough platforms so that people get annoyed with having to flip it to -# YES every time. - -POP3DSTART=YES - -##NAME: MAILDIRPATH:0 -# -# MAILDIRPATH - directory name of the maildir directory. -# -MAILDIRPATH=Maildir - -#Hardwire a value for ${MAILDIR} -MAILDIR=.maildir -MAILDIRPATH=.maildir -#Put any program for ${PRERUN} here -PRERUN= diff --git a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/courier/etc_courier-imap_pop3d-ssl b/syscp/patches/gentoo-config-files/bind-ssl/gentoo/courier/etc_courier-imap_pop3d-ssl deleted file mode 100644 index a0267a0..0000000 --- a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/courier/etc_courier-imap_pop3d-ssl +++ /dev/null @@ -1,186 +0,0 @@ -##VERSION: $Id: pop3d-ssl.dist.in,v 1.12 2004/10/21 00:45:35 mrsam Exp $ -# -# pop3d-ssl created from pop3d-ssl.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# Copyright 2000-2004 Double Precision, Inc. See COPYING for -# distribution information. -# -# This configuration file sets various options for the Courier-IMAP server -# when used to handle SSL POP3 connections. -# -# SSL and non-SSL connections are handled by a dedicated instance of the -# couriertcpd daemon. If you are accepting both SSL and non-SSL POP3 -# connections, you will start two instances of couriertcpd, one on the -# POP3 port 110, and another one on the POP3-SSL port 995. -# -# Download OpenSSL from http://www.openssl.org/ -# -##NAME: SSLPORT:0 -# -# Options in the pop3d-ssl configuration file AUGMENT the options in the -# pop3d configuration file. First the pop3d configuration file is read, -# then the pop3d-ssl configuration file, so we do not have to redefine -# anything. -# -# However, some things do have to be redefined. The port number is -# specified by SSLPORT, instead of PORT. The default port is port 995. -# -# Multiple port numbers can be separated by commas. When multiple port -# numbers are used it is possibly to select a specific IP address for a -# given port as "ip.port". For example, "127.0.0.1.900,192.68.0.1.900" -# accepts connections on port 900 on IP addresses 127.0.0.1 and 192.68.0.1 -# The SSLADDRESS setting is a default for ports that do not have -# a specified IP address. - -SSLPORT=995 - -##NAME: SSLADDRESS:0 -# -# Address to listen on, can be set to a single IP address. -# -# SSLADDRESS=127.0.0.1 - -SSLADDRESS=0 - -##NAME: SSLPIDFILE:0 -# -# -# - -SSLPIDFILE=/var/run/pop3d-ssl.pid - -##NAME: POP3DSSLSTART:0 -# -# Whether or not to start POP3 over SSL on spop3 port: - -POP3DSSLSTART=YES - -##NAME: POP3_STARTTLS:0 -# -# Whether or not to implement the POP3 STLS extension: - -POP3_STARTTLS=YES - -##NAME: POP3_TLS_REQUIRED:1 -# -# Set POP3_TLS_REQUIRED to 1 if you REQUIRE STARTTLS for everyone. -# (this option advertises the LOGINDISABLED POP3 capability, until STARTTLS -# is issued). - -POP3_TLS_REQUIRED=0 - -##NAME: COURIERTLS:0 -# -# The following variables configure POP3 over SSL. If OpenSSL is available -# during configuration, the couriertls helper gets compiled, and upon -# installation a dummy TLS_CERTFILE gets generated. courieresmtpd will -# automatically advertise the ESMTP STARTTLS extension if both TLS_CERTFILE -# and COURIERTLS exist. -# -# WARNING: Peer certificate verification has NOT yet been tested. Proceed -# at your own risk. Only the basic SSL/TLS functionality is known to be -# working. Keep this in mind as you play with the following variables. - -COURIERTLS=/usr/sbin/couriertls - -##NAME: TLS_PROTOCOL:0 -# -# TLS_PROTOCOL sets the protocol version. The possible versions are: -# -# SSL2 - SSLv2 -# SSL3 - SSLv3 -# TLS1 - TLS1 - -TLS_PROTOCOL=SSL3 - -##NAME: TLS_STARTTLS_PROTOCOL:0 -# -# TLS_STARTTLS_PROTOCOL is used instead of TLS_PROTOCOL for the POP3 STARTTLS -# extension, as opposed to POP3 over SSL on port 995. -# - -TLS_STARTTLS_PROTOCOL=TLS1 - -##NAME: TLS_CIPHER_LIST:0 -# -# TLS_CIPHER_LIST optionally sets the list of ciphers to be used by the -# OpenSSL library. In most situations you can leave TLS_CIPHER_LIST -# undefined -# -# TLS_CIPHER_LIST="ALL:!ADH:RC4+RSA:+SSLv2:@STRENGTH" - -##NAME: TLS_TIMEOUT:0 -# TLS_TIMEOUT is currently not implemented, and reserved for future use. -# This is supposed to be an inactivity timeout, but its not yet implemented. -# - -##NAME: TLS_DHCERTFILE:0 -# -# TLS_DHCERTFILE - PEM file that stores our Diffie-Hellman cipher pair. -# When OpenSSL is compiled to use Diffie-Hellman ciphers instead of RSA -# you must generate a DH pair that will be used. In most situations the -# DH pair is to be treated as confidential, and the file specified by -# TLS_DHCERTFILE must not be world-readable. -# -# TLS_DHCERTFILE= - -##NAME: TLS_CERTFILE:0 -# -# TLS_CERTFILE - certificate to use. TLS_CERTFILE is required for SSL/TLS -# servers, and is optional for SSL/TLS clients. TLS_CERTFILE is usually -# treated as confidential, and must not be world-readable. -# -TLS_CERTFILE=/etc/ssl/server/.crt_and_key - -##NAME: TLS_TRUSTCERTS:0 -# -# TLS_TRUSTCERTS=pathname - load trusted certificates from pathname. -# pathname can be a file or a directory. If a file, the file should -# contain a list of trusted certificates, in PEM format. If a -# directory, the directory should contain the trusted certificates, -# in PEM format, one per file and hashed using OpenSSL's c_rehash -# script. TLS_TRUSTCERTS is used by SSL/TLS clients (by specifying -# the -domain option) and by SSL/TLS servers (TLS_VERIFYPEER is set -# to PEER or REQUIREPEER). -# -# -# TLS_TRUSTCERTS= - -##NAME: TLS_VERIFYPEER:0 -# -# TLS_VERIFYPEER - how to verify client certificates. The possible values of -# this setting are: -# -# NONE - do not verify anything -# -# PEER - verify the client certificate, if one's presented -# -# REQUIREPEER - require a client certificate, fail if one's not presented -# -# -TLS_VERIFYPEER=NONE - -##NAME: TLS_CACHE:0 -# -# A TLS/SSL session cache may slightly improve response for long-running -# POP3 clients. TLS_CACHEFILE will be automatically created, TLS_CACHESIZE -# bytes long, and used as a cache buffer. -# -# This is an experimental feature and should be disabled if it causes -# problems with SSL clients. Disable SSL caching by commenting out the -# following settings: - -TLS_CACHEFILE=/var/lib/courier-imap/couriersslcache -TLS_CACHESIZE=524288 - -##NAME: MAILDIRPATH:0 -# -# MAILDIRPATH - directory name of the maildir directory. -# -MAILDIRPATH=Maildir - -#Hardwire a value for ${MAILDIR} -MAILDIRPATH=.maildir diff --git a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/courier/etc_courier_authlib_authdaemonrc b/syscp/patches/gentoo-config-files/bind-ssl/gentoo/courier/etc_courier_authlib_authdaemonrc deleted file mode 100644 index 867a12d..0000000 --- a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/courier/etc_courier_authlib_authdaemonrc +++ /dev/null @@ -1,93 +0,0 @@ -##VERSION: $Id: authdaemonrc.in,v 1.12 2005/07/05 12:25:08 mrsam Exp $ -# -# Copyright 2000-2005 Double Precision, Inc. See COPYING for -# distribution information. -# -# authdaemonrc created from authdaemonrc.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# This file configures authdaemond, the resident authentication daemon. -# -# Comments in this file are ignored. Although this file is intended to -# be sourced as a shell script, authdaemond parses it manually, so -# the acceptable syntax is a bit limited. Multiline variable contents, -# with the \ continuation character, are not allowed. Everything must -# fit on one line. Do not use any additional whitespace for indentation, -# or anything else. - -##NAME: authmodulelist:2 -# -# The authentication modules that are linked into authdaemond. The -# default list is installed. You may selectively disable modules simply -# by removing them from the following list. The available modules you -# can use are: authuserdb authpam authshadow authmysql authcustom authpipe - -authmodulelist="authmysql" - -##NAME: authmodulelistorig:3 -# -# This setting is used by Courier's webadmin module, and should be left -# alone - -authmodulelistorig="authuserdb authpam authshadow authmysql authcustom authpipe" - -##NAME: daemons:0 -# -# The number of daemon processes that are started. authdaemon is typically -# installed where authentication modules are relatively expensive: such -# as authldap, or authmysql, so it's better to have a number of them running. -# PLEASE NOTE: Some platforms may experience a problem if there's more than -# one daemon. Specifically, SystemV derived platforms that use TLI with -# socket emulation. I'm suspicious of TLI's ability to handle multiple -# processes accepting connections on the same filesystem domain socket. -# -# You may need to increase daemons if as your system load increases. Symptoms -# include sporadic authentication failures. If you start getting -# authentication failures, increase daemons. However, the default of 5 -# SHOULD be sufficient. Bumping up daemon count is only a short-term -# solution. The permanent solution is to add more resources: RAM, faster -# disks, faster CPUs... - -daemons=5 - -##NAME: authdaemonvar:2 -# -# authdaemonvar is here, but is not used directly by authdaemond. It's -# used by various configuration and build scripts, so don't touch it! - -authdaemonvar=/var/lib/courier/authdaemon - -##NAME: DEBUG_LOGIN:0 -# -# Dump additional diagnostics to syslog -# -# DEBUG_LOGIN=0 - turn off debugging -# DEBUG_LOGIN=1 - turn on debugging -# DEBUG_LOGIN=2 - turn on debugging + log passwords too -# -# ** YES ** - DEBUG_LOGIN=2 places passwords into syslog. -# -# Note that most information is sent to syslog at level 'debug', so -# you may need to modify your /etc/syslog.conf to be able to see it. - -DEBUG_LOGIN=0 - -##NAME: DEFAULTOPTIONS:0 -# -# A comma-separated list of option=value pairs. Each option is applied -# to an account if the account does not have its own specific value for -# that option. So for example, you can set -# DEFAULTOPTIONS="disablewebmail=1,disableimap=1" -# and then enable webmail and/or imap on individual accounts by setting -# disablewebmail=0 and/or disableimap=0 on the account. - -DEFAULTOPTIONS="" - -##NAME: LOGGEROPTS:0 -# -# courierlogger(1) options, e.g. to set syslog facility -# - -LOGGEROPTS="" diff --git a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/courier/etc_courier_authlib_authmysqlrc b/syscp/patches/gentoo-config-files/bind-ssl/gentoo/courier/etc_courier_authlib_authmysqlrc deleted file mode 100644 index fec6508..0000000 --- a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/courier/etc_courier_authlib_authmysqlrc +++ /dev/null @@ -1,12 +0,0 @@ -MYSQL_SERVER -MYSQL_USERNAME -MYSQL_PASSWORD -MYSQL_PORT 0 -MYSQL_DATABASE -MYSQL_USER_TABLE mail_users -MYSQL_CRYPT_PWFIELD password_enc -MYSQL_UID_FIELD -MYSQL_GID_FIELD -MYSQL_LOGIN_FIELD username -MYSQL_HOME_FIELD "" -MYSQL_MAILDIR_FIELD maildir diff --git a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/cron/etc_cron.d_syscp b/syscp/patches/gentoo-config-files/bind-ssl/gentoo/cron/etc_cron.d_syscp deleted file mode 100644 index 4afe408..0000000 --- a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/cron/etc_cron.d_syscp +++ /dev/null @@ -1,10 +0,0 @@ -# -# Set PATH, otherwise restart-scripts won't find start-stop-daemon -# -PATH=/sbin:/bin:/usr/sbin:/usr/bin -# -# Regular cron jobs for the syscp package -# -# Please check that all following paths are correct -# -*/5 * * * * root /usr/lib/php4/bin/php -q -c /etc/php/syscp-cronjob/php.ini /var/www/syscp/scripts/cronscript.php diff --git a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/cron/etc_php_syscp-cronjob_php.ini b/syscp/patches/gentoo-config-files/bind-ssl/gentoo/cron/etc_php_syscp-cronjob_php.ini deleted file mode 100644 index 74c8316..0000000 --- a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/cron/etc_php_syscp-cronjob_php.ini +++ /dev/null @@ -1,61 +0,0 @@ -short_open_tag = On -asp_tags = Off -precision = 14 -output_buffering = Off -allow_call_time_pass_reference = Off -safe_mode = Off -safe_mode_gid = Off -safe_mode_include_dir = "/usr/share/php/:/usr/share/php4/:/usr/share/php5/" -safe_mode_allowed_env_vars = PHP_ -safe_mode_protected_env_vars = LD_LIBRARY_PATH -open_basedir = -disable_functions = -disable_classes = -expose_php = Off -max_execution_time = 180 -max_input_time = 120 -memory_limit = 32M -post_max_size = 32M -error_reporting = E_ALL & ~E_NOTICE -display_errors = On -display_startup_errors = Off -log_errors = Off -log_errors_max_len = 1024 -ignore_repeated_errors = Off -ignore_repeated_source = Off -report_memleaks = On -track_errors = Off -html_errors = Off -variables_order = "GPCS" -register_globals = Off -register_argc_argv = Off -gpc_order = "GPC" -magic_quotes_gpc = Off -magic_quotes_runtime = Off -magic_quotes_sybase = Off -include_path = ".:/usr/share/php/:/usr/share/php4/:/usr/share/php5/" -enable_dl = Off -file_uploads = On -upload_tmp_dir = "/tmp/" -upload_max_filesize = 32M -allow_url_fopen = Off -session.save_handler = files -session.save_path = "/tmp/" -session.use_cookies = 1 -session.name = PHPSESSID -session.auto_start = 0 -session.cookie_lifetime = 0 -session.cookie_path = / -session.cookie_domain = -session.serialize_handler = php -session.gc_probability = 1 -session.gc_divisor = 1000 -session.gc_maxlifetime = 1440 -session.bug_compat_42 = 0 -session.bug_compat_warn = 1 -session.referer_check = -session.entropy_length = 16 -session.entropy_file = /dev/urandom -session.cache_limiter = nocache -session.cache_expire = 180 -session.use_trans_sid = 0 diff --git a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/cron/etc_php_syscp-vhost_php.ini b/syscp/patches/gentoo-config-files/bind-ssl/gentoo/cron/etc_php_syscp-vhost_php.ini deleted file mode 100644 index 048c26c..0000000 --- a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/cron/etc_php_syscp-vhost_php.ini +++ /dev/null @@ -1,61 +0,0 @@ -short_open_tag = On -asp_tags = Off -precision = 14 -output_buffering = 4096 -allow_call_time_pass_reference = Off -safe_mode = Off -safe_mode_gid = Off -safe_mode_include_dir = "/usr/share/php/:/usr/share/php4/:/usr/share/php5/" -safe_mode_allowed_env_vars = PHP_ -safe_mode_protected_env_vars = LD_LIBRARY_PATH -open_basedir = "/var/www/syscp/:/var/www/syscp-suphp/syscp/:/var/www/syscpwebs/:/usr/share/php/:/usr/share/php4/:/usr/share/php5/" -disable_functions = exec,passthru,shell_exec,system,proc_close,proc_get_status,proc_nice,proc_open,proc_terminate -disable_classes = -expose_php = Off -max_execution_time = 30 -max_input_time = 60 -memory_limit = 16M -post_max_size = 12M -error_reporting = E_ALL & ~E_NOTICE -display_errors = Off -display_startup_errors = Off -log_errors = On -log_errors_max_len = 1024 -ignore_repeated_errors = Off -ignore_repeated_source = Off -report_memleaks = On -track_errors = Off -html_errors = Off -variables_order = "GPCS" -register_globals = Off -register_argc_argv = Off -gpc_order = "GPC" -magic_quotes_gpc = Off -magic_quotes_runtime = Off -magic_quotes_sybase = Off -include_path = ".:/usr/share/php/:/usr/share/php4/:/usr/share/php5/" -enable_dl = Off -file_uploads = On -upload_tmp_dir = "/var/www/syscp-suphp/syscp/" -upload_max_filesize = 32M -allow_url_fopen = Off -session.save_handler = files -session.save_path = "/var/www/syscp-suphp/syscp/" -session.use_cookies = 1 -session.name = PHPSESSID -session.auto_start = 0 -session.cookie_lifetime = 0 -session.cookie_path = / -session.cookie_domain = -session.serialize_handler = php -session.gc_probability = 1 -session.gc_divisor = 1000 -session.gc_maxlifetime = 1440 -session.bug_compat_42 = 0 -session.bug_compat_warn = 1 -session.referer_check = -session.entropy_length = 16 -session.entropy_file = /dev/urandom -session.cache_limiter = nocache -session.cache_expire = 180 -session.use_trans_sid = 0 diff --git a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/postfix/etc_postfix_main.cf b/syscp/patches/gentoo-config-files/bind-ssl/gentoo/postfix/etc_postfix_main.cf deleted file mode 100644 index 97b10e0..0000000 --- a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/postfix/etc_postfix_main.cf +++ /dev/null @@ -1,65 +0,0 @@ -# Postfix directories settings -command_directory = /usr/sbin -daemon_directory = /usr/lib/postfix -queue_directory = /var/spool/postfix -sample_directory = /etc/postfix -manpage_directory = /usr/share/man -readme_directory = /usr/share/doc/postfix-2.1.5-r2/readme -html_directory = no - -# Postfix programs paths settings -mailq_path = /usr/bin/mailq -newaliases_path = /usr/bin/newaliases -sendmail_path = /usr/sbin/sendmail - -# General Postfix configuration -myhostname = -mydestination = $myhostname, $mydomain, localhost.$myhostname, localhost.$mydomain, localhost -mynetworks = 127.0.0.0/8 -inet_interfaces = all -mail_owner = postfix -setgid_group = postdrop -smtpd_banner = $myhostname ESMTP Mailserver -smtpd_helo_required = yes -append_dot_mydomain = no -biff = no - -# Postfix Debugger configuration -debug_peer_level = 2 -debugger_command = - PATH=/bin:/usr/bin:/usr/local/bin; export PATH; (echo cont; - echo where) | gdb $daemon_directory/$process_name $process_id 2>&1 - >$config_directory/$process_name.$process_id.log & sleep 5 - -# Postfix performance settings -default_destination_concurrency_limit = 20 -local_destination_concurrency_limit = 2 - -# Virtual delivery settings -virtual_transport = virtual -virtual_mailbox_base = -virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf -virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf -virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf -virtual_uid_maps = static: -virtual_gid_maps = static: - -# Local delivery settings -local_transport = local -alias_database = hash:/etc/mail/aliases -alias_maps = $alias_database - -# SASL settings -smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination -smtpd_sasl_auth_enable = yes -smtpd_sasl_local_domain = $myhostname -smtpd_sasl_security_options = noanonymous -broken_sasl_auth_clients = yes - -# TLS settings -smtpd_use_tls = yes -smtpd_tls_cert_file = /etc/ssl/server/.crt -smtpd_tls_key_file = /etc/ssl/server/.key -smtpd_tls_auth_only = no -smtpd_tls_session_cache_timeout = 3600s -tls_random_source = dev:/dev/urandom diff --git a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/postfix/etc_postfix_mysql-virtual_alias_maps.cf b/syscp/patches/gentoo-config-files/bind-ssl/gentoo/postfix/etc_postfix_mysql-virtual_alias_maps.cf deleted file mode 100644 index c921e6f..0000000 --- a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/postfix/etc_postfix_mysql-virtual_alias_maps.cf +++ /dev/null @@ -1,8 +0,0 @@ -user = -password = -dbname = -table = mail_virtual -select_field = destination -where_field = email -additional_conditions = and destination <> '' and destination <> ' ' -hosts = diff --git a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf b/syscp/patches/gentoo-config-files/bind-ssl/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf deleted file mode 100644 index 4484bee..0000000 --- a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf +++ /dev/null @@ -1,8 +0,0 @@ -user = -password = -dbname = -table = panel_domains -select_field = domain -where_field = domain -additional_conditions = and isemaildomain = '1' -hosts = diff --git a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf b/syscp/patches/gentoo-config-files/bind-ssl/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf deleted file mode 100644 index 7e0f79a..0000000 --- a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf +++ /dev/null @@ -1,7 +0,0 @@ -user = -password = -dbname = -table = mail_users -select_field = maildir -where_field = email -hosts = diff --git a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/postfix/etc_sasl2_smtpd.conf b/syscp/patches/gentoo-config-files/bind-ssl/gentoo/postfix/etc_sasl2_smtpd.conf deleted file mode 100644 index 2089cbb..0000000 --- a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/postfix/etc_sasl2_smtpd.conf +++ /dev/null @@ -1,12 +0,0 @@ -pwcheck_method: auxprop -auxprop_plugin: sql -allowanonymouslogin: no -allowplaintext: yes -mech_list: PLAIN LOGIN -password_format: crypt -sql_engine: mysql -sql_hostnames: -sql_user: -sql_passwd: -sql_database: -sql_select: SELECT password_enc FROM mail_users where username='%u@%r' diff --git a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/proftpd/etc_proftpd_proftpd.conf b/syscp/patches/gentoo-config-files/bind-ssl/gentoo/proftpd/etc_proftpd_proftpd.conf deleted file mode 100644 index 1e04b6d..0000000 --- a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/proftpd/etc_proftpd_proftpd.conf +++ /dev/null @@ -1,89 +0,0 @@ -# Server settings -ServerName " FTP Server" -ServerType standalone -ServerIdent off -DefaultServer on -Port 21 -MaxInstances 50 - -# General settings -DeferWelcome on -MultilineRFC2228 on -ShowSymlinks on -AllowOverwrite on -AllowStoreRestart on -AllowRetrieveRestart on -UseReverseDNS off -IdentLookups off -ListOptions "-al" -DisplayFirstChdir .message - -# Modules settings -#DelayEngine off - -# Timeout settings -TimeoutLogin 120 -TimeoutNoTransfer 600 -TimeoutStalled 600 -TimeoutIdle 600 - -# Security settings -RootLogin off -RequireValidShell off -User syscpftpd -Group syscpftpd -Umask 133 022 -DefaultRoot ~ -DenyFilter \*.*/ - -# Per-Directory settings - -Umask 133 022 -AllowOverwrite on - - -# SQL settings -SQLAuthTypes Crypt -SQLAuthenticate users* groups* -SQLConnectInfo @ -SQLUserInfo ftp_users username password uid gid homedir shell -SQLGroupInfo ftp_groups groupname gid members -SQLUserWhereClause "login_enabled = 'y'" - -SQLLog PASS login -SQLNamedQuery login UPDATE "last_login=now(), login_count=login_count+1 WHERE username='%u'" ftp_users - -SQLLog RETR download -SQLNamedQuery download UPDATE "down_count=down_count+1, down_bytes=down_bytes+%b WHERE username='%u'" ftp_users - -SQLLog STOR upload -SQLNamedQuery upload UPDATE "up_count=up_count+1, up_bytes=up_bytes+%b WHERE username='%u'" ftp_users - -# TLS settings - -TLSEngine on -TLSLog /var/log/proftpd-tls.log -TLSProtocol SSLv23 -TLSTimeoutHandshake 120 -# Really important for WinClients -TLSOptions NoCertRequest -TLSRSACertificateFile /etc/ssl/server/.crt -TLSRSACertificateKeyFile /etc/ssl/server/.key -# Authenticate client that want to use FTP over TLS? -TLSVerifyClient off -# Uncomment the following line to force tls login -TLSRequired off - - -# LOG settings -# Logging Formats -LogFormat default "%h %1 %u %t \"%r\" %s %b" -LogFormat auth "%v [%P] %h %t \"%r\" %s" -LogFormat write "%h %l %u %t \"%r\" %s %b" -# Activate Logging -# all logins -ExtendedLog /var/log/proftpd-auth.log AUTH auth -# file/dir access -ExtendedLog /var/log/proftpd-access.log WRITE,READ write -# everything (be careful, generates_ very_ big logfiles) -#ExtendedLog /var/log/proftpd-all.log ALL default diff --git a/syscp/patches/gentoo-config-files/bind-ssl/syscp-1.2.13-gentoo-admin_configfiles.php-bind-ssl b/syscp/patches/gentoo-config-files/bind-ssl/syscp-1.2.13-gentoo-admin_configfiles.php-bind-ssl deleted file mode 100644 index f13fd5a..0000000 --- a/syscp/patches/gentoo-config-files/bind-ssl/syscp-1.2.13-gentoo-admin_configfiles.php-bind-ssl +++ /dev/null @@ -1,290 +0,0 @@ - - * @copyright (C) 2003-2004 Florian Lippert - * @package Panel - * @version $Id: admin_configfiles.php,v 1.9 2005/06/15 13:53:58 flo Exp $ - * Modified to reflect the Gentoo environment by Luca Longinotti - */ - - define('AREA', 'admin'); - - /** - * Include our init.php, which manages Sessions, Language etc. - */ - require("./lib/init.php"); - - - $configfiles = Array - ( - 'gentoo' => Array - ( - 'label' => 'Gentoo', - 'daemons' => Array - ( - 'apache' => Array - ( - 'label' => 'Apache2 Webserver (HTTP)', - 'commands' => Array - ( - 'touch '.$settings['system']['apacheconf_directory'].'vhosts.d/99_syscp-vhosts.conf', - 'chown root:0 '.$settings['system']['apacheconf_directory'].'vhosts.d/99_syscp-vhosts.conf', - 'chmod 0600 '.$settings['system']['apacheconf_directory'].'vhosts.d/99_syscp-vhosts.conf', - 'echo "Include '.$settings['system']['apacheconf_directory'].'vhosts.d/99_syscp-vhosts.conf" >> /etc/apache2/httpd.conf', - 'mkdir -p '.$settings['system']['documentroot_prefix'], - 'mkdir -p '.$settings['system']['logfiles_directory'] - ), - 'restart' => Array - ( - 'rc-update add apache2 default', - '/etc/init.d/apache2 restart' - ) - ), - 'bind' => Array - ( - 'label' => 'Bind9 Nameserver (DNS)', - 'files' => Array - ( - 'etc_bind_default.zone' => '/etc/bind/default.zone' - ), - 'commands' => Array - ( - 'echo "include \"'.$settings['system']['bindconf_directory'].'syscp_bind.conf\";" >> /etc/bind/named.conf', - 'touch '.$settings['system']['bindconf_directory'].'syscp_bind.conf', - 'chown root:0 '.$settings['system']['bindconf_directory'].'syscp_bind.conf', - 'chmod 0600 '.$settings['system']['bindconf_directory'].'syscp_bind.conf' - ), - 'restart' => Array - ( - 'rc-update add named default', - '/etc/init.d/named restart' - ) - ), - 'courier' => Array - ( - 'label' => 'Courier-IMAP (POP3/IMAP)', - 'files' => Array - ( - 'etc_courier_authlib_authdaemonrc' => '/etc/courier/authlib/authdaemonrc', - 'etc_courier_authlib_authmysqlrc' => '/etc/courier/authlib/authmysqlrc', - 'etc_courier-imap_pop3d' => '/etc/courier-imap/pop3d', - 'etc_courier-imap_imapd' => '/etc/courier-imap/imapd', - 'etc_courier-imap_pop3d-ssl' => '/etc/courier-imap/pop3d-ssl', - 'etc_courier-imap_imapd-ssl' => '/etc/courier-imap/imapd-ssl' - ), - 'commands' => Array - ( - 'rm /etc/courier/authlib/authdaemonrc', - 'rm /etc/courier/authlib/authmysqlrc', - 'rm /etc/courier-imap/pop3d', - 'rm /etc/courier-imap/imapd', - 'rm /etc/courier-imap/pop3d-ssl', - 'rm /etc/courier-imap/imapd-ssl', - 'touch /etc/courier/authlib/authdaemonrc', - 'touch /etc/courier/authlib/authmysqlrc', - 'touch /etc/courier-imap/pop3d', - 'touch /etc/courier-imap/imapd', - 'touch /etc/courier-imap/pop3d-ssl', - 'touch /etc/courier-imap/imapd-ssl', - 'chown root:0 /etc/courier/authlib/authdaemonrc', - 'chown root:0 /etc/courier/authlib/authmysqlrc', - 'chown root:0 /etc/courier-imap/pop3d', - 'chown root:0 /etc/courier-imap/imapd', - 'chown root:0 /etc/courier-imap/pop3d-ssl', - 'chown root:0 /etc/courier-imap/imapd-ssl', - 'chmod 0600 /etc/courier/authlib/authdaemonrc', - 'chmod 0600 /etc/courier/authlib/authmysqlrc', - 'chmod 0600 /etc/courier-imap/pop3d', - 'chmod 0600 /etc/courier-imap/imapd', - 'chmod 0600 /etc/courier-imap/pop3d-ssl', - 'chmod 0600 /etc/courier-imap/imapd-ssl' - ), - 'restart' => Array - ( - 'rc-update add courier-authlib default', - 'rc-update add courier-pop3d default', - 'rc-update add courier-imapd default', - 'rc-update add courier-pop3d-ssl default', - 'rc-update add courier-imapd-ssl default', - '/etc/init.d/courier-authlib restart', - '/etc/init.d/courier-pop3d restart', - '/etc/init.d/courier-imapd restart', - '/etc/init.d/courier-pop3d-ssl restart', - '/etc/init.d/courier-imapd-ssl restart' - ) - ), - 'postfix' => Array - ( - 'label' => 'Postfix (MTA)', - 'files' => Array - ( - 'etc_postfix_main.cf' => '/etc/postfix/main.cf', - 'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf', - 'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf', - 'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf', - 'etc_sasl2_smtpd.conf' => '/etc/sasl2/smtpd.conf' - ), - 'commands' => Array - ( - 'mkdir -p '.$settings['system']['vmail_homedir'], - 'chown -R vmail:vmail '.$settings['system']['vmail_homedir'], - 'chmod 0750 '.$settings['system']['vmail_homedir'], - 'rm /etc/postfix/main.cf', - 'touch /etc/postfix/main.cf', - 'touch /etc/postfix/master.cf', - 'touch /etc/postfix/mysql-virtual_alias_maps.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'touch /etc/sasl2/smtpd.conf', - 'chown root:0 /etc/postfix/main.cf', - 'chown root:0 /etc/postfix/master.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_alias_maps.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'chown root:0 /etc/sasl2/smtpd.conf', - 'chmod 0600 /etc/postfix/main.cf', - 'chmod 0600 /etc/postfix/master.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_alias_maps.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'chmod 0600 /etc/sasl2/smtpd.conf' - ), - 'restart' => Array - ( - 'rc-update add postfix default', - '/etc/init.d/postfix restart' - ) - ), - 'proftpd' => Array - ( - 'label' => 'ProFTPd (FTP)', - 'files' => Array - ( - 'etc_proftpd_proftpd.conf' => '/etc/proftpd/proftpd.conf' - ), - 'commands' => Array - ( - 'touch /etc/proftpd/proftpd.conf', - 'chown root:0 /etc/proftpd/proftpd.conf', - 'chmod 0600 /etc/proftpd/proftpd.conf' - ), - 'restart' => Array - ( - 'rc-update add proftpd default', - '/etc/init.d/proftpd restart' - ) - ), - 'cron' => Array - ( - 'label' => 'Crond (cronscript)', - 'files' => Array - ( - 'etc_php_syscp-cronjob_php.ini' => '/etc/php/syscp-cronjob/php.ini', - 'etc_cron.d_syscp' => '/etc/cron.d/syscp' - ), - 'commands' => Array - ( - 'touch /etc/cron.d/syscp', - 'chown root:0 /etc/cron.d/syscp', - 'chmod 0640 /etc/cron.d/syscp', - 'mkdir -p /etc/php/syscp-cronjob', - 'touch /etc/php/syscp-cronjob/php.ini', - 'chown -R root:0 /etc/php/syscp-cronjob', - 'chmod 0750 /etc/php/syscp-cronjob', - 'chmod 0640 /etc/php/syscp-cronjob/php.ini' - ), - 'restart' => Array - ( - 'rc-update add vixie-cron default', - '/etc/init.d/vixie-cron restart' - ) - ) - ) - ) - ); - - /*echo '
';
-	print_r($configfiles);
-	echo '
';*/ - - if( ($page == 'configfiles' || $page == 'overview') && $userinfo['change_serversettings'] == '1') - { - if(isset($_GET['distribution']) && $_GET['distribution']!='' && isset($configfiles[$_GET['distribution']]) && is_array($configfiles[$_GET['distribution']]) && - isset($_GET['daemon']) && $_GET['daemon']!='' && isset($configfiles[$_GET['distribution']]['daemons'][$_GET['daemon']]) && is_array($configfiles[$_GET['distribution']]['daemons'][$_GET['daemon']])) - { - $distribution = addslashes($_GET['distribution']); - $daemon = addslashes($_GET['daemon']); - - if(isset($configfiles[$distribution]['daemons'][$daemon]['commands']) && is_array($configfiles[$distribution]['daemons'][$daemon]['commands'])) - { - $commands = implode("\n", $configfiles[$distribution]['daemons'][$daemon]['commands']); - } - else - { - $commands = ''; - } - - $replace_arr = Array - ( - '' => $sql['user'], - '' => 'MYSQL_PASSWORD', - '' => $sql['db'], - '' => $sql['host'], - '' => $settings['system']['hostname'], - '' => $settings['system']['ipaddress'], - '' => $settings['system']['vmail_homedir'], - '' => $settings['system']['vmail_uid'], - '' => $settings['system']['vmail_gid'] - ); - $files = ''; - if(isset($configfiles[$distribution]['daemons'][$daemon]['files']) && is_array($configfiles[$distribution]['daemons'][$daemon]['files'])) - { - while(list($filename, $realname) = each($configfiles[$distribution]['daemons'][$daemon]['files'])) - { - $file_content = implode('', file('./templates/misc/configfiles/'.$distribution.'/'.$daemon.'/'.$filename)); - $file_content = strtr($file_content, $replace_arr); - $file_content = htmlspecialchars($file_content); - $numbrows = count(explode("\n", $file_content)); - eval("\$files.=\"".getTemplate("configfiles/configfiles_file")."\";"); - } - } - - if(isset($configfiles[$distribution]['daemons'][$daemon]['restart']) && is_array($configfiles[$distribution]['daemons'][$daemon]['restart'])) - { - $restart = implode("\n", $configfiles[$distribution]['daemons'][$daemon]['restart']); - } - else - { - $restart = ''; - } - - eval("echo \"".getTemplate("configfiles/configfiles")."\";"); - } - else - { - $distributions = ''; - while (list($distribution_name, $distribution_details) = each($configfiles)) - { - $daemons = ''; - while(list($daemon_name, $daemon_details) = each($distribution_details['daemons'])) - { - eval("\$daemons.=\"".getTemplate("configfiles/choose_daemon")."\";"); - } - eval("\$distributions.=\"".getTemplate("configfiles/choose_distribution")."\";"); - } - eval("echo \"".getTemplate("configfiles/choose")."\";"); - } - } - -?> diff --git a/syscp/patches/gentoo-config-files/bind-ssl/syscp-1.2.13-gentoo-config-bind-ssl-r2.tar.bz2 b/syscp/patches/gentoo-config-files/bind-ssl/syscp-1.2.13-gentoo-config-bind-ssl-r2.tar.bz2 deleted file mode 100644 index f799689..0000000 Binary files a/syscp/patches/gentoo-config-files/bind-ssl/syscp-1.2.13-gentoo-config-bind-ssl-r2.tar.bz2 and /dev/null differ diff --git a/syscp/patches/gentoo-config-files/bind/etc_libnss-mysql-root.cfg b/syscp/patches/gentoo-config-files/bind/etc_libnss-mysql-root.cfg deleted file mode 100644 index 6498977..0000000 --- a/syscp/patches/gentoo-config-files/bind/etc_libnss-mysql-root.cfg +++ /dev/null @@ -1,2 +0,0 @@ -username -password diff --git a/syscp/patches/gentoo-config-files/bind/etc_libnss-mysql.cfg b/syscp/patches/gentoo-config-files/bind/etc_libnss-mysql.cfg deleted file mode 100644 index d284192..0000000 --- a/syscp/patches/gentoo-config-files/bind/etc_libnss-mysql.cfg +++ /dev/null @@ -1,38 +0,0 @@ -getpwnam SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ - FROM ftp_users \ - WHERE username='%1$s' \ - LIMIT 1 -getpwuid SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ - FROM ftp_users \ - WHERE uid='%1$u' \ - LIMIT 1 -getspnam SELECT username,password,UNIX_TIMESTAMP()-10,'1','2','7','-1','-1','0' \ - FROM ftp_users \ - WHERE username='%1$s' \ - LIMIT 1 -getpwent SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ - FROM ftp_users -getspent SELECT username,password,UNIX_TIMESTAMP()-10,'1','2','7','-1','-1','0' \ - FROM ftp_users -getgrnam SELECT groupname,'x',gid \ - FROM ftp_groups \ - WHERE groupname='%1$s' \ - LIMIT 1 -getgrgid SELECT groupname,'x',gid \ - FROM ftp_groups \ - WHERE gid='%1$u' \ - LIMIT 1 -getgrent SELECT groupname,'x',gid \ - FROM ftp_groups -memsbygid SELECT username \ - FROM ftp_users \ - WHERE gid='%1$u' -gidsbymem SELECT gid \ - FROM ftp_users \ - WHERE username='%1$s' - -host -database -username -password -socket /var/run/mysqld/mysqld.sock diff --git a/syscp/patches/gentoo-config-files/bind/gentoo/bind/etc_bind_default.zone b/syscp/patches/gentoo-config-files/bind/gentoo/bind/etc_bind_default.zone deleted file mode 100644 index 817b9bc..0000000 --- a/syscp/patches/gentoo-config-files/bind/gentoo/bind/etc_bind_default.zone +++ /dev/null @@ -1,21 +0,0 @@ -$TTL 1W -@ IN SOA ns root ( - 2004060501 ; serial - 8H ; refresh - 2H ; retry - 1W ; expiry - 11h) ; minimum - - IN NS ns - IN MX 10 mail - - IN A - IN MX 10 mail - -* IN A - IN MX 10 mail - -ns IN A - -mail IN A - IN MX 10 mail diff --git a/syscp/patches/gentoo-config-files/bind/gentoo/courier/etc_courier-imap_imapd b/syscp/patches/gentoo-config-files/bind/gentoo/courier/etc_courier-imap_imapd deleted file mode 100644 index f594e41..0000000 --- a/syscp/patches/gentoo-config-files/bind/gentoo/courier/etc_courier-imap_imapd +++ /dev/null @@ -1,376 +0,0 @@ -##VERSION: $Id: imapd.dist.in,v 1.32 2004/11/25 04:57:04 mrsam Exp $ -# -# imapd created from imapd.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# Copyright 1998 - 2004 Double Precision, Inc. See COPYING for -# distribution information. -# -# This configuration file sets various options for the Courier-IMAP server -# when used with the couriertcpd server. -# A lot of the stuff here is documented in the manual page for couriertcpd. -# -# NOTE - do not use \ to split long variable contents on multiple lines. -# This will break the default imapd.rc script, which parses this file. -# -##NAME: ADDRESS:0 -# -# Address to listen on, can be set to a single IP address. -# -# ADDRESS=127.0.0.1 - -ADDRESS=0 - -##NAME: PORT:1 -# -# Port numbers that connections are accepted on. The default is 143, -# the standard IMAP port. -# -# Multiple port numbers can be separated by commas. When multiple port -# numbers are used it is possible to select a specific IP address for a -# given port as "ip.port". For example, "127.0.0.1.900,192.68.0.1.900" -# accepts connections on port 900 on IP addresses 127.0.0.1 and 192.68.0.1 -# The previous ADDRESS setting is a default for ports that do not have -# a specified IP address. - -PORT=143 - -##NAME: AUTHSERVICE:0 -# -# It's possible to authenticate using a different 'service' parameter -# depending on the connection's port. This only works with authentication -# modules that use the 'service' parameter, such as PAM. Example: -# -# AUTHSERVICE143=imap -# AUTHSERVICE993=imaps - -##NAME: MAXDAEMONS:0 -# -# Maximum number of IMAP servers started -# - -MAXDAEMONS=50 - -##NAME: MAXPERIP:0 -# -# Maximum number of connections to accept from the same IP address - -MAXPERIP=10 - -##NAME: PIDFILE:0 -# -# File where couriertcpd will save its process ID -# - -PIDFILE=/var/run/imapd.pid - -##NAME: TCPDOPTS:0 -# -# Miscellaneous couriertcpd options that shouldn't be changed. -# - -TCPDOPTS="-nodnslookup -noidentlookup" - -##NAME: IMAP_CAPABILITY:1 -# -# IMAP_CAPABILITY specifies what most of the response should be to the -# CAPABILITY command. -# -# If you have properly configured Courier to use CRAM-MD5 or CRAM-SHA1 -# authentication (see INSTALL), set IMAP_CAPABILITY as follows: -# -# IMAP_CAPABILITY="IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 IDLE" -# - -IMAP_CAPABILITY="IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA IDLE" - -##NAME: KEYWORDS_CAPABILITY:0 -# -# IMAP_KEYWORDS=1 enables custom IMAP keywords. Set this option to 0 to -# disable custom keywords. - -IMAP_KEYWORDS=1 - -##NAME: SMAP1_CAPABILITY:0 -# -# EXPERIMENTAL -# -# To enable the experimental "Simple Mail Access Protocol" extensions, -# uncomment the following setting. -# -# SMAP_CAPABILITY=SMAP1 - -##NAME: IMAP_CAPABILITY_ORIG:1 -# -# For use by webadmin - -IMAP_CAPABILITY_ORIG="IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 IDLE" - -##NAME: IMAP_PROXY:0 -# -# Enable proxying. See README.proxy - -IMAP_PROXY=0 - -##NAME: IMAP_PROXY_FOREIGN:0 -# -# Proxying to non-Courier servers. Re-sends the CAPABILITY command after -# logging in to the remote server. May not work with all IMAP clients. - -IMAP_PROXY_FOREIGN=0 - -##NAME: IMAP_IDLE_TIMEOUT:0 -# -# This setting controls how often -# the server polls for changes to the folder, in IDLE mode (in seconds). - -IMAP_IDLE_TIMEOUT=60 - -##NAME: IMAP_CAPABILITY_TLS:0 -# -# The following setting will advertise SASL PLAIN authentication after -# STARTTLS is established. If you want to allow SASL PLAIN authentication -# with or without TLS then just comment this out, and add AUTH=PLAIN to -# IMAP_CAPABILITY - -IMAP_CAPABILITY_TLS="$IMAP_CAPABILITY AUTH=PLAIN" - -##NAME: IMAP_TLS_ORIG:0 -# -# For use by webadmin - -IMAP_CAPABILITY_TLS_ORIG="$IMAP_CAPABILITY_ORIG AUTH=PLAIN" - -##NAME: IMAP_DISABLETHREADSORT:0 -# -# Set IMAP_DISABLETHREADSORT to disable the THREAD and SORT commands - -# server side sorting and threading. -# -# Those capabilities will still be advertised, but the server will reject -# them. Set this option if you want to disable all the extra load from -# server-side threading and sorting. Not advertising those capabilities -# will simply result in the clients reading the entire folder, and sorting -# it on the client side. That will still put some load on the server. -# advertising these capabilities, but rejecting the commands, will stop this -# silliness. -# - -IMAP_DISABLETHREADSORT=0 - -##NAME: IMAP_CHECK_ALL_FOLDERS:0 -# -# Set IMAP_CHECK_ALL_FOLDERS to 1 if you want the server to check for new -# mail in every folder. Not all IMAP clients use the IMAP's new mail -# indicator, but some do. Normally new mail is checked only in INBOX, -# because it is a comparatively time consuming operation, and it would be -# a complete waste of time unless mail filters are used to deliver -# mail directly to folders. -# -# When IMAP clients are used which support new mail indication, and when -# mail filters are used to sort incoming mail into folders, setting -# IMAP_CHECK_ALL_FOLDERS to 1 will allow IMAP clients to announce new -# mail in folders. Note that this will result in slightly more load on the -# server. -# - -IMAP_CHECK_ALL_FOLDERS=0 - -##NAME: IMAP_OBSOLETE_CLIENT:0 -# -# Set IMAP_OBSOLETE_CLIENT if your IMAP client expects \\NoInferiors to mean -# what \\HasNoChildren really means. - -IMAP_OBSOLETE_CLIENT=0 - -##NAME: IMAP_UMASK:0 -# -# IMAP_UMASK sets the umask of the server process. The value of IMAP_UMASK is -# simply passed to the "umask" command. The default value is 022. -# -# This feature is mostly useful for shared folders, where the file permissions -# of the messages may be important. - -IMAP_UMASK=027 - -##NAME: IMAP_ULIMITD:0 -# -# IMAP_ULIMITD sets the maximum size of the data segment of the server -# process. The value of IMAP_ULIMITD is simply passed to the "ulimit -d" -# command (or ulimit -v). The argument to ulimi sets the upper limit on the -# size of the data segment of the server process, in kilobytes. The default -# value of 65536 sets a very generous limit of 64 megabytes, which should -# be more than plenty for anyone. -# -# This feature is used as an additional safety check that should stop -# any potential denial-of-service attacks that exploit any kind of -# a memory leak to exhaust all the available memory on the server. -# It is theoretically possible that obscenely huge folders will also -# result in the server running out of memory when doing server-side -# sorting (by my calculations you have to have at least 100,000 messages -# in a single folder, for that to happen). - -IMAP_ULIMITD=65536 - -##NAME: IMAP_USELOCKS:0 -# -# Setting IMAP_USELOCKS to 1 will use dot-locking to support concurrent -# multiple access to the same folder. This incurs slight additional -# overhead. Concurrent multiple access will still work without this setting, -# however occasionally a minor race condition may result in an IMAP client -# downloading the same message twice, or a keyword update will fail. -# -# IMAP_USELOCKS=1 is strongly recommended when shared folders are used. - -IMAP_USELOCKS=1 - -##NAME: IMAP_SHAREDINDEXFILE:0 -# -# The index of all accessible folders. Do not change this setting unless -# you know what you're doing. See README.sharedfolders for additional -# information. - -IMAP_SHAREDINDEXFILE=/etc/courier-imap/shared/index - -##NAME: IMAP_ENHANCEDIDLE:0 -# -# If Courier was compiled with the File Alteration Monitor, setting -# IMAP_ENHANCEDIDLE to 1 enables enhanced IDLE mode, where multiple -# clients may open the same folder concurrently, and receive updates to -# folder contents in realtime. See the imapd(8) man page for additional -# information. -# -# IMPORTANT: IMAP_USELOCKS *MUST* also be set to 1, and IDLE must be included -# in the IMAP_CAPABILITY list. -# - -IMAP_ENHANCEDIDLE=0 - -##NAME: IMAP_TRASHFOLDERNAME:0 -# -# The name of the magic trash Folder. For MSOE compatibility, -# you can set IMAP_TRASHFOLDERNAME="Deleted Items". -# -# IMPORTANT: If you change this, you must also change IMAP_EMPTYTRASH - -IMAP_TRASHFOLDERNAME=Trash - -##NAME: IMAP_EMPTYTRASH:0 -# -# The following setting is optional, and causes messages from the given -# folder to be automatically deleted after the given number of days. -# IMAP_EMPTYTRASH is a comma-separated list of folder:days. The default -# setting, below, purges 7 day old messages from the Trash folder. -# Another useful setting would be: -# -# IMAP_EMPTYTRASH=Trash:7,Sent:30 -# -# This would also delete messages from the Sent folder (presumably copies -# of sent mail) after 30 days. This is a global setting that is applied to -# every mail account, and is probably useful in a controlled, corporate -# environment. -# -# Important: the purging is controlled by CTIME, not MTIME (the file time -# as shown by ls). It is perfectly ordinary to see stuff in Trash that's -# a year old. That's the file modification time, MTIME, that's displayed. -# This is generally when the message was originally delivered to this -# mailbox. Purging is controlled by a different timestamp, CTIME, which is -# changed when the file is moved to the Trash folder (and at other times too). -# -# You might want to disable this setting in certain situations - it results -# in a stat() of every file in each folder, at login and logout. -# - -IMAP_EMPTYTRASH=Trash:7 - -##NAME: IMAP_MOVE_EXPUNGE_TO_TRASH:0 -# -# Set IMAP_MOVE_EXPUNGE_TO_TRASH to move expunged messages to Trash. This -# effectively allows an undo of message deletion by fishing the deleted -# mail from trash. Trash can be manually expunged as usually, and mail -# will get automatically expunged from Trash according to IMAP_EMPTYTRASH. -# -# NOTE: shared folders are still expunged as usual. Shared folders are -# not affected. -# - -IMAP_MOVE_EXPUNGE_TO_TRASH=0 - - -##NAME: OUTBOX:0 -# -# The next set of options deal with the "Outbox" enhancement. -# Uncomment the following setting to create a special folder, named -# INBOX.Outbox -# -# OUTBOX=.Outbox - -##NAME: SENDMAIL:0 -# -# If OUTBOX is defined, mail can be sent via the IMAP connection by copying -# a message to the INBOX.Outbox folder. For all practical matters, -# INBOX.Outbox looks and behaves just like any other IMAP folder. If this -# folder doesn't exist it must be created by the IMAP mail client, just -# like any other IMAP folder. The kicker: any message copied or moved to -# this folder is will be E-mailed by the Courier-IMAP server, by running -# the SENDMAIL program. Therefore, messages copied or moved to this -# folder must be well-formed RFC-2822 messages, with the recipient list -# specified in the To:, Cc:, and Bcc: headers. Courier-IMAP relies on -# SENDMAIL to read the recipient list from these headers (and delete the Bcc: -# header) by running the command "$SENDMAIL -oi -t -f $SENDER", with the -# message piped on standard input. $SENDER will be the return address -# of the message, which is set by the authentication module. -# -# DO NOT MODIFY SENDMAIL, below, unless you know what you're doing. -# - -SENDMAIL=/usr/sbin/sendmail - -##NAME: HEADERFROM:0 -# -# For administrative and oversight purposes, the return address, $SENDER -# will also be saved in the X-IMAP-Sender mail header. This header gets -# added to the sent E-mail (but it doesn't get saved in the copy of the -# message that's saved in the folder) -# -# WARNING - By enabling OUTBOX above, *every* IMAP mail client will receive -# the magic OUTBOX treatment. Therefore advance LARTing is in order for -# _all_ of your lusers, until every one of them is aware of this. Otherwise if -# OUTBOX is left at its default setting - a folder name that might be used -# accidentally - some people may be in for a rude surprise. You can redefine -# the name of the magic folder by changing OUTBOX, above. You should do that -# and pick a less-obvious name. Perhaps brand it with your organizational -# name ( OUTBOX=.WidgetsAndSonsOutbox ) - -HEADERFROM=X-IMAP-Sender - -##NAME: IMAPDSTART:0 -# -# IMAPDSTART is not used directly. Rather, this is a convenient flag to -# be read by your system startup script in /etc/rc.d, like this: -# -# . /etc/courier-imap/imapd -# -# case x$IMAPDSTART in -# x[yY]*) -# /usr/lib/courier-imap/imapd.rc start -# ;; -# esac -# -# The default setting is going to be NO, so you'll have to manually flip -# it to yes. - -IMAPDSTART=YES - -##NAME: MAILDIRPATH:0 -# -# MAILDIRPATH - directory name of the maildir directory. -# -MAILDIRPATH=Maildir - -#Hardwire a value for ${MAILDIR} -MAILDIR=.maildir -MAILDIRPATH=.maildir -#Put any program for ${PRERUN} here -PRERUN= diff --git a/syscp/patches/gentoo-config-files/bind/gentoo/courier/etc_courier-imap_imapd-ssl b/syscp/patches/gentoo-config-files/bind/gentoo/courier/etc_courier-imap_imapd-ssl deleted file mode 100644 index 76dbcf7..0000000 --- a/syscp/patches/gentoo-config-files/bind/gentoo/courier/etc_courier-imap_imapd-ssl +++ /dev/null @@ -1,199 +0,0 @@ -##VERSION: $Id: imapd-ssl.dist.in,v 1.11 2004/10/21 00:45:35 mrsam Exp $ -# -# imapd-ssl created from imapd-ssl.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# Copyright 2000 - 2004 Double Precision, Inc. See COPYING for -# distribution information. -# -# This configuration file sets various options for the Courier-IMAP server -# when used to handle SSL IMAP connections. -# -# SSL and non-SSL connections are handled by a dedicated instance of the -# couriertcpd daemon. If you are accepting both SSL and non-SSL IMAP -# connections, you will start two instances of couriertcpd, one on the -# IMAP port 143, and another one on the IMAP-SSL port 993. -# -# Download OpenSSL from http://www.openssl.org/ -# -##NAME: SSLPORT:1 -# -# Options in the imapd-ssl configuration file AUGMENT the options in the -# imapd configuration file. First the imapd configuration file is read, -# then the imapd-ssl configuration file, so we do not have to redefine -# anything. -# -# However, some things do have to be redefined. The port number is -# specified by SSLPORT, instead of PORT. The default port is port 993. -# -# Multiple port numbers can be separated by commas. When multiple port -# numbers are used it is possibly to select a specific IP address for a -# given port as "ip.port". For example, "127.0.0.1.900,192.68.0.1.900" -# accepts connections on port 900 on IP addresses 127.0.0.1 and 192.68.0.1 -# The SSLADDRESS setting is a default for ports that do not have -# a specified IP address. - -SSLPORT=993 - -##NAME: SSLADDRESS:0 -# -# Address to listen on, can be set to a single IP address. -# -# SSLADDRESS=127.0.0.1 - -SSLADDRESS=0 - -##NAME: SSLPIDFILE:0 -# -# That's the SSL IMAP port we'll listen on. -# Feel free to redefine MAXDAEMONS, TCPDOPTS, and MAXPERIP. - -SSLPIDFILE=/var/run/imapd-ssl.pid - -##NAME: IMAPDSSLSTART:0 -# -# Different pid files, so that both instances of couriertcpd can coexist -# happily. -# -# You can also redefine IMAP_CAPABILITY, although I can't -# think of why you'd want to do that. -# -# -# Ok, the following settings are new to imapd-ssl: -# -# Whether or not to start IMAP over SSL on simap port: - -IMAPDSSLSTART=YES - -##NAME: IMAPDSTARTTLS:0 -# -# Whether or not to implement IMAP STARTTLS extension instead: - -IMAPDSTARTTLS=YES - -##NAME: IMAP_TLS_REQUIRED:1 -# -# Set IMAP_TLS_REQUIRED to 1 if you REQUIRE STARTTLS for everyone. -# (this option advertises the LOGINDISABLED IMAP capability, until STARTTLS -# is issued). - -IMAP_TLS_REQUIRED=0 - -######################################################################### -# -# The following variables configure IMAP over SSL. If OpenSSL is available -# during configuration, the couriertls helper gets compiled, and upon -# installation a dummy TLS_CERTFILE gets generated. courieresmtpd will -# automatically advertise the ESMTP STARTTLS extension if both TLS_CERTFILE -# and COURIERTLS exist. -# -# WARNING: Peer certificate verification has NOT yet been tested. Proceed -# at your own risk. Only the basic SSL/TLS functionality is known to be -# working. Keep this in mind as you play with the following variables. -# -##NAME: COURIERTLS:0 -# - -COURIERTLS=/usr/sbin/couriertls - -##NAME: TLS_PROTOCOL:0 -# -# TLS_PROTOCOL sets the protocol version. The possible versions are: -# -# SSL2 - SSLv2 -# SSL3 - SSLv3 -# TLS1 - TLS1 - -TLS_PROTOCOL=SSL3 - -##NAME: TLS_STARTTLS_PROTOCOL:0 -# -# TLS_STARTTLS_PROTOCOL is used instead of TLS_PROTOCOL for the IMAP STARTTLS -# extension, as opposed to IMAP over SSL on port 993. -# - -TLS_STARTTLS_PROTOCOL=TLS1 - -##NAME: TLS_CIPHER_LIST:0 -# -# TLS_CIPHER_LIST optionally sets the list of ciphers to be used by the -# OpenSSL library. In most situations you can leave TLS_CIPHER_LIST -# undefined -# -# TLS_CIPHER_LIST="ALL:!ADH:RC4+RSA:+SSLv2:@STRENGTH" - -##NAME: TLS_TIMEOUT:0 -# TLS_TIMEOUT is currently not implemented, and reserved for future use. -# This is supposed to be an inactivity timeout, but its not yet implemented. -# - -##NAME: TLS_DHCERTFILE:0 -# -# TLS_DHCERTFILE - PEM file that stores our Diffie-Hellman cipher pair. -# When OpenSSL is compiled to use Diffie-Hellman ciphers instead of RSA -# you must generate a DH pair that will be used. In most situations the -# DH pair is to be treated as confidential, and the file specified by -# TLS_DHCERTFILE must not be world-readable. -# -# TLS_DHCERTFILE= - -##NAME: TLS_CERTFILE:0 -# -# TLS_CERTFILE - certificate to use. TLS_CERTFILE is required for SSL/TLS -# servers, and is optional for SSL/TLS clients. TLS_CERTFILE is usually -# treated as confidential, and must not be world-readable. -# -TLS_CERTFILE=/etc/ssl/server/.crt_and_key - -##NAME: TLS_TRUSTCERTS:0 -# -# TLS_TRUSTCERTS=pathname - load trusted certificates from pathname. -# pathname can be a file or a directory. If a file, the file should -# contain a list of trusted certificates, in PEM format. If a -# directory, the directory should contain the trusted certificates, -# in PEM format, one per file and hashed using OpenSSL's c_rehash -# script. TLS_TRUSTCERTS is used by SSL/TLS clients (by specifying -# the -domain option) and by SSL/TLS servers (TLS_VERIFYPEER is set -# to PEER or REQUIREPEER). -# -# -# TLS_TRUSTCERTS= - -##NAME: TLS_VERIFYPEER:0 -# -# TLS_VERIFYPEER - how to verify client certificates. The possible values of -# this setting are: -# -# NONE - do not verify anything -# -# PEER - verify the client certificate, if one's presented -# -# REQUIREPEER - require a client certificate, fail if one's not presented -# -# -TLS_VERIFYPEER=NONE - -##NAME: TLS_CACHE:0 -# -# A TLS/SSL session cache may slightly improve response for IMAP clients -# that open multiple SSL sessions to the server. TLS_CACHEFILE will be -# automatically created, TLS_CACHESIZE bytes long, and used as a cache -# buffer. -# -# This is an experimental feature and should be disabled if it causes -# problems with SSL clients. Disable SSL caching by commenting out the -# following settings: - -TLS_CACHEFILE=/var/lib/courier-imap/couriersslcache -TLS_CACHESIZE=524288 - -##NAME: MAILDIRPATH:0 -# -# MAILDIRPATH - directory name of the maildir directory. -# -MAILDIRPATH=Maildir - -#Hardwire a value for ${MAILDIR} -MAILDIRPATH=.maildir diff --git a/syscp/patches/gentoo-config-files/bind/gentoo/courier/etc_courier-imap_pop3d b/syscp/patches/gentoo-config-files/bind/gentoo/courier/etc_courier-imap_pop3d deleted file mode 100644 index 71502ae..0000000 --- a/syscp/patches/gentoo-config-files/bind/gentoo/courier/etc_courier-imap_pop3d +++ /dev/null @@ -1,127 +0,0 @@ -##VERSION: $Id: pop3d.dist.in,v 1.11 2004/10/30 15:39:38 mrsam Exp $ -# -# pop3d created from pop3d.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# Copyright 1998 - 2004 Double Precision, Inc. See COPYING for -# distribution information. -# -# Courier POP3 daemon configuration -# -##NAME: PIDFILE:0 -# - -PIDFILE=/var/run/pop3d.pid - -##NAME: MAXDAEMONS:0 -# -# Maximum number of POP3 servers started -# - -MAXDAEMONS=50 - -##NAME: MAXPERIP:4 -# -# Maximum number of connections to accept from the same IP address - -MAXPERIP=5 - -##NAME: POP3AUTH:1 -# -# To advertise the SASL capability, per RFC 2449, uncomment the POP3AUTH -# variable: -# -# POP3AUTH="LOGIN" -# -# If you have configured the CRAM-MD5 or CRAM-SHA1, set POP3AUTH to something -# like this: -# -# POP3AUTH="LOGIN CRAM-MD5 CRAM-SHA1" - -POP3AUTH="" - -##NAME: POP3AUTH_ORIG:0 -# -# For use by webadmin - -POP3AUTH_ORIG="LOGIN CRAM-MD5 CRAM-SHA1" - -##NAME: POP3AUTH_TLS:1 -# -# To also advertise SASL PLAIN if SSL is enabled, uncomment the -# POP3AUTH_TLS environment variable: -# -# POP3AUTH_TLS="LOGIN PLAIN" - -POP3AUTH_TLS="" - -##NAME: POP3AUTH_TLS_ORIG:0 -# -# For use by webadmin - -POP3AUTH_TLS_ORIG="LOGIN PLAIN" - -##NAME: POP3_PROXY:0 -# -# Enable proxying. See README.proxy - -POP3_PROXY=0 - -##NAME: PORT:1 -# -# Port to listen on for connections. The default is port 110. -# -# Multiple port numbers can be separated by commas. When multiple port -# numbers are used it is possibly to select a specific IP address for a -# given port as "ip.port". For example, "127.0.0.1.900,192.68.0.1.900" -# accepts connections on port 900 on IP addresses 127.0.0.1 and 192.68.0.1 -# The ADDRESS setting is a default for ports that do not have a specified -# IP address. - -PORT=110 - -##NAME: ADDRESS:0 -# -# IP address to listen on. 0 means all IP addresses. - -ADDRESS=0 - -##NAME: TCPDOPTS:0 -# -# Other couriertcpd(1) options. The following defaults should be fine. -# - -TCPDOPTS="-nodnslookup -noidentlookup" - -##NAME: POP3DSTART:0 -# -# POP3DSTART is not referenced anywhere in the standard Courier programs -# or scripts. Rather, this is a convenient flag to be read by your system -# startup script in /etc/rc.d, like this: -# -# . /etc/courier-imap/pop3d -# case x$POP3DSTART in -# x[yY]*) -# /usr/lib/courier-imap/pop3d.rc start -# ;; -# esac -# -# The default setting is going to be NO, until Courier is shipped by default -# with enough platforms so that people get annoyed with having to flip it to -# YES every time. - -POP3DSTART=YES - -##NAME: MAILDIRPATH:0 -# -# MAILDIRPATH - directory name of the maildir directory. -# -MAILDIRPATH=Maildir - -#Hardwire a value for ${MAILDIR} -MAILDIR=.maildir -MAILDIRPATH=.maildir -#Put any program for ${PRERUN} here -PRERUN= diff --git a/syscp/patches/gentoo-config-files/bind/gentoo/courier/etc_courier-imap_pop3d-ssl b/syscp/patches/gentoo-config-files/bind/gentoo/courier/etc_courier-imap_pop3d-ssl deleted file mode 100644 index a0267a0..0000000 --- a/syscp/patches/gentoo-config-files/bind/gentoo/courier/etc_courier-imap_pop3d-ssl +++ /dev/null @@ -1,186 +0,0 @@ -##VERSION: $Id: pop3d-ssl.dist.in,v 1.12 2004/10/21 00:45:35 mrsam Exp $ -# -# pop3d-ssl created from pop3d-ssl.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# Copyright 2000-2004 Double Precision, Inc. See COPYING for -# distribution information. -# -# This configuration file sets various options for the Courier-IMAP server -# when used to handle SSL POP3 connections. -# -# SSL and non-SSL connections are handled by a dedicated instance of the -# couriertcpd daemon. If you are accepting both SSL and non-SSL POP3 -# connections, you will start two instances of couriertcpd, one on the -# POP3 port 110, and another one on the POP3-SSL port 995. -# -# Download OpenSSL from http://www.openssl.org/ -# -##NAME: SSLPORT:0 -# -# Options in the pop3d-ssl configuration file AUGMENT the options in the -# pop3d configuration file. First the pop3d configuration file is read, -# then the pop3d-ssl configuration file, so we do not have to redefine -# anything. -# -# However, some things do have to be redefined. The port number is -# specified by SSLPORT, instead of PORT. The default port is port 995. -# -# Multiple port numbers can be separated by commas. When multiple port -# numbers are used it is possibly to select a specific IP address for a -# given port as "ip.port". For example, "127.0.0.1.900,192.68.0.1.900" -# accepts connections on port 900 on IP addresses 127.0.0.1 and 192.68.0.1 -# The SSLADDRESS setting is a default for ports that do not have -# a specified IP address. - -SSLPORT=995 - -##NAME: SSLADDRESS:0 -# -# Address to listen on, can be set to a single IP address. -# -# SSLADDRESS=127.0.0.1 - -SSLADDRESS=0 - -##NAME: SSLPIDFILE:0 -# -# -# - -SSLPIDFILE=/var/run/pop3d-ssl.pid - -##NAME: POP3DSSLSTART:0 -# -# Whether or not to start POP3 over SSL on spop3 port: - -POP3DSSLSTART=YES - -##NAME: POP3_STARTTLS:0 -# -# Whether or not to implement the POP3 STLS extension: - -POP3_STARTTLS=YES - -##NAME: POP3_TLS_REQUIRED:1 -# -# Set POP3_TLS_REQUIRED to 1 if you REQUIRE STARTTLS for everyone. -# (this option advertises the LOGINDISABLED POP3 capability, until STARTTLS -# is issued). - -POP3_TLS_REQUIRED=0 - -##NAME: COURIERTLS:0 -# -# The following variables configure POP3 over SSL. If OpenSSL is available -# during configuration, the couriertls helper gets compiled, and upon -# installation a dummy TLS_CERTFILE gets generated. courieresmtpd will -# automatically advertise the ESMTP STARTTLS extension if both TLS_CERTFILE -# and COURIERTLS exist. -# -# WARNING: Peer certificate verification has NOT yet been tested. Proceed -# at your own risk. Only the basic SSL/TLS functionality is known to be -# working. Keep this in mind as you play with the following variables. - -COURIERTLS=/usr/sbin/couriertls - -##NAME: TLS_PROTOCOL:0 -# -# TLS_PROTOCOL sets the protocol version. The possible versions are: -# -# SSL2 - SSLv2 -# SSL3 - SSLv3 -# TLS1 - TLS1 - -TLS_PROTOCOL=SSL3 - -##NAME: TLS_STARTTLS_PROTOCOL:0 -# -# TLS_STARTTLS_PROTOCOL is used instead of TLS_PROTOCOL for the POP3 STARTTLS -# extension, as opposed to POP3 over SSL on port 995. -# - -TLS_STARTTLS_PROTOCOL=TLS1 - -##NAME: TLS_CIPHER_LIST:0 -# -# TLS_CIPHER_LIST optionally sets the list of ciphers to be used by the -# OpenSSL library. In most situations you can leave TLS_CIPHER_LIST -# undefined -# -# TLS_CIPHER_LIST="ALL:!ADH:RC4+RSA:+SSLv2:@STRENGTH" - -##NAME: TLS_TIMEOUT:0 -# TLS_TIMEOUT is currently not implemented, and reserved for future use. -# This is supposed to be an inactivity timeout, but its not yet implemented. -# - -##NAME: TLS_DHCERTFILE:0 -# -# TLS_DHCERTFILE - PEM file that stores our Diffie-Hellman cipher pair. -# When OpenSSL is compiled to use Diffie-Hellman ciphers instead of RSA -# you must generate a DH pair that will be used. In most situations the -# DH pair is to be treated as confidential, and the file specified by -# TLS_DHCERTFILE must not be world-readable. -# -# TLS_DHCERTFILE= - -##NAME: TLS_CERTFILE:0 -# -# TLS_CERTFILE - certificate to use. TLS_CERTFILE is required for SSL/TLS -# servers, and is optional for SSL/TLS clients. TLS_CERTFILE is usually -# treated as confidential, and must not be world-readable. -# -TLS_CERTFILE=/etc/ssl/server/.crt_and_key - -##NAME: TLS_TRUSTCERTS:0 -# -# TLS_TRUSTCERTS=pathname - load trusted certificates from pathname. -# pathname can be a file or a directory. If a file, the file should -# contain a list of trusted certificates, in PEM format. If a -# directory, the directory should contain the trusted certificates, -# in PEM format, one per file and hashed using OpenSSL's c_rehash -# script. TLS_TRUSTCERTS is used by SSL/TLS clients (by specifying -# the -domain option) and by SSL/TLS servers (TLS_VERIFYPEER is set -# to PEER or REQUIREPEER). -# -# -# TLS_TRUSTCERTS= - -##NAME: TLS_VERIFYPEER:0 -# -# TLS_VERIFYPEER - how to verify client certificates. The possible values of -# this setting are: -# -# NONE - do not verify anything -# -# PEER - verify the client certificate, if one's presented -# -# REQUIREPEER - require a client certificate, fail if one's not presented -# -# -TLS_VERIFYPEER=NONE - -##NAME: TLS_CACHE:0 -# -# A TLS/SSL session cache may slightly improve response for long-running -# POP3 clients. TLS_CACHEFILE will be automatically created, TLS_CACHESIZE -# bytes long, and used as a cache buffer. -# -# This is an experimental feature and should be disabled if it causes -# problems with SSL clients. Disable SSL caching by commenting out the -# following settings: - -TLS_CACHEFILE=/var/lib/courier-imap/couriersslcache -TLS_CACHESIZE=524288 - -##NAME: MAILDIRPATH:0 -# -# MAILDIRPATH - directory name of the maildir directory. -# -MAILDIRPATH=Maildir - -#Hardwire a value for ${MAILDIR} -MAILDIRPATH=.maildir diff --git a/syscp/patches/gentoo-config-files/bind/gentoo/courier/etc_courier_authlib_authdaemonrc b/syscp/patches/gentoo-config-files/bind/gentoo/courier/etc_courier_authlib_authdaemonrc deleted file mode 100644 index 867a12d..0000000 --- a/syscp/patches/gentoo-config-files/bind/gentoo/courier/etc_courier_authlib_authdaemonrc +++ /dev/null @@ -1,93 +0,0 @@ -##VERSION: $Id: authdaemonrc.in,v 1.12 2005/07/05 12:25:08 mrsam Exp $ -# -# Copyright 2000-2005 Double Precision, Inc. See COPYING for -# distribution information. -# -# authdaemonrc created from authdaemonrc.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# This file configures authdaemond, the resident authentication daemon. -# -# Comments in this file are ignored. Although this file is intended to -# be sourced as a shell script, authdaemond parses it manually, so -# the acceptable syntax is a bit limited. Multiline variable contents, -# with the \ continuation character, are not allowed. Everything must -# fit on one line. Do not use any additional whitespace for indentation, -# or anything else. - -##NAME: authmodulelist:2 -# -# The authentication modules that are linked into authdaemond. The -# default list is installed. You may selectively disable modules simply -# by removing them from the following list. The available modules you -# can use are: authuserdb authpam authshadow authmysql authcustom authpipe - -authmodulelist="authmysql" - -##NAME: authmodulelistorig:3 -# -# This setting is used by Courier's webadmin module, and should be left -# alone - -authmodulelistorig="authuserdb authpam authshadow authmysql authcustom authpipe" - -##NAME: daemons:0 -# -# The number of daemon processes that are started. authdaemon is typically -# installed where authentication modules are relatively expensive: such -# as authldap, or authmysql, so it's better to have a number of them running. -# PLEASE NOTE: Some platforms may experience a problem if there's more than -# one daemon. Specifically, SystemV derived platforms that use TLI with -# socket emulation. I'm suspicious of TLI's ability to handle multiple -# processes accepting connections on the same filesystem domain socket. -# -# You may need to increase daemons if as your system load increases. Symptoms -# include sporadic authentication failures. If you start getting -# authentication failures, increase daemons. However, the default of 5 -# SHOULD be sufficient. Bumping up daemon count is only a short-term -# solution. The permanent solution is to add more resources: RAM, faster -# disks, faster CPUs... - -daemons=5 - -##NAME: authdaemonvar:2 -# -# authdaemonvar is here, but is not used directly by authdaemond. It's -# used by various configuration and build scripts, so don't touch it! - -authdaemonvar=/var/lib/courier/authdaemon - -##NAME: DEBUG_LOGIN:0 -# -# Dump additional diagnostics to syslog -# -# DEBUG_LOGIN=0 - turn off debugging -# DEBUG_LOGIN=1 - turn on debugging -# DEBUG_LOGIN=2 - turn on debugging + log passwords too -# -# ** YES ** - DEBUG_LOGIN=2 places passwords into syslog. -# -# Note that most information is sent to syslog at level 'debug', so -# you may need to modify your /etc/syslog.conf to be able to see it. - -DEBUG_LOGIN=0 - -##NAME: DEFAULTOPTIONS:0 -# -# A comma-separated list of option=value pairs. Each option is applied -# to an account if the account does not have its own specific value for -# that option. So for example, you can set -# DEFAULTOPTIONS="disablewebmail=1,disableimap=1" -# and then enable webmail and/or imap on individual accounts by setting -# disablewebmail=0 and/or disableimap=0 on the account. - -DEFAULTOPTIONS="" - -##NAME: LOGGEROPTS:0 -# -# courierlogger(1) options, e.g. to set syslog facility -# - -LOGGEROPTS="" diff --git a/syscp/patches/gentoo-config-files/bind/gentoo/courier/etc_courier_authlib_authmysqlrc b/syscp/patches/gentoo-config-files/bind/gentoo/courier/etc_courier_authlib_authmysqlrc deleted file mode 100644 index fec6508..0000000 --- a/syscp/patches/gentoo-config-files/bind/gentoo/courier/etc_courier_authlib_authmysqlrc +++ /dev/null @@ -1,12 +0,0 @@ -MYSQL_SERVER -MYSQL_USERNAME -MYSQL_PASSWORD -MYSQL_PORT 0 -MYSQL_DATABASE -MYSQL_USER_TABLE mail_users -MYSQL_CRYPT_PWFIELD password_enc -MYSQL_UID_FIELD -MYSQL_GID_FIELD -MYSQL_LOGIN_FIELD username -MYSQL_HOME_FIELD "" -MYSQL_MAILDIR_FIELD maildir diff --git a/syscp/patches/gentoo-config-files/bind/gentoo/cron/etc_cron.d_syscp b/syscp/patches/gentoo-config-files/bind/gentoo/cron/etc_cron.d_syscp deleted file mode 100644 index 4afe408..0000000 --- a/syscp/patches/gentoo-config-files/bind/gentoo/cron/etc_cron.d_syscp +++ /dev/null @@ -1,10 +0,0 @@ -# -# Set PATH, otherwise restart-scripts won't find start-stop-daemon -# -PATH=/sbin:/bin:/usr/sbin:/usr/bin -# -# Regular cron jobs for the syscp package -# -# Please check that all following paths are correct -# -*/5 * * * * root /usr/lib/php4/bin/php -q -c /etc/php/syscp-cronjob/php.ini /var/www/syscp/scripts/cronscript.php diff --git a/syscp/patches/gentoo-config-files/bind/gentoo/cron/etc_php_syscp-cronjob_php.ini b/syscp/patches/gentoo-config-files/bind/gentoo/cron/etc_php_syscp-cronjob_php.ini deleted file mode 100644 index 74c8316..0000000 --- a/syscp/patches/gentoo-config-files/bind/gentoo/cron/etc_php_syscp-cronjob_php.ini +++ /dev/null @@ -1,61 +0,0 @@ -short_open_tag = On -asp_tags = Off -precision = 14 -output_buffering = Off -allow_call_time_pass_reference = Off -safe_mode = Off -safe_mode_gid = Off -safe_mode_include_dir = "/usr/share/php/:/usr/share/php4/:/usr/share/php5/" -safe_mode_allowed_env_vars = PHP_ -safe_mode_protected_env_vars = LD_LIBRARY_PATH -open_basedir = -disable_functions = -disable_classes = -expose_php = Off -max_execution_time = 180 -max_input_time = 120 -memory_limit = 32M -post_max_size = 32M -error_reporting = E_ALL & ~E_NOTICE -display_errors = On -display_startup_errors = Off -log_errors = Off -log_errors_max_len = 1024 -ignore_repeated_errors = Off -ignore_repeated_source = Off -report_memleaks = On -track_errors = Off -html_errors = Off -variables_order = "GPCS" -register_globals = Off -register_argc_argv = Off -gpc_order = "GPC" -magic_quotes_gpc = Off -magic_quotes_runtime = Off -magic_quotes_sybase = Off -include_path = ".:/usr/share/php/:/usr/share/php4/:/usr/share/php5/" -enable_dl = Off -file_uploads = On -upload_tmp_dir = "/tmp/" -upload_max_filesize = 32M -allow_url_fopen = Off -session.save_handler = files -session.save_path = "/tmp/" -session.use_cookies = 1 -session.name = PHPSESSID -session.auto_start = 0 -session.cookie_lifetime = 0 -session.cookie_path = / -session.cookie_domain = -session.serialize_handler = php -session.gc_probability = 1 -session.gc_divisor = 1000 -session.gc_maxlifetime = 1440 -session.bug_compat_42 = 0 -session.bug_compat_warn = 1 -session.referer_check = -session.entropy_length = 16 -session.entropy_file = /dev/urandom -session.cache_limiter = nocache -session.cache_expire = 180 -session.use_trans_sid = 0 diff --git a/syscp/patches/gentoo-config-files/bind/gentoo/cron/etc_php_syscp-vhost_php.ini b/syscp/patches/gentoo-config-files/bind/gentoo/cron/etc_php_syscp-vhost_php.ini deleted file mode 100644 index 048c26c..0000000 --- a/syscp/patches/gentoo-config-files/bind/gentoo/cron/etc_php_syscp-vhost_php.ini +++ /dev/null @@ -1,61 +0,0 @@ -short_open_tag = On -asp_tags = Off -precision = 14 -output_buffering = 4096 -allow_call_time_pass_reference = Off -safe_mode = Off -safe_mode_gid = Off -safe_mode_include_dir = "/usr/share/php/:/usr/share/php4/:/usr/share/php5/" -safe_mode_allowed_env_vars = PHP_ -safe_mode_protected_env_vars = LD_LIBRARY_PATH -open_basedir = "/var/www/syscp/:/var/www/syscp-suphp/syscp/:/var/www/syscpwebs/:/usr/share/php/:/usr/share/php4/:/usr/share/php5/" -disable_functions = exec,passthru,shell_exec,system,proc_close,proc_get_status,proc_nice,proc_open,proc_terminate -disable_classes = -expose_php = Off -max_execution_time = 30 -max_input_time = 60 -memory_limit = 16M -post_max_size = 12M -error_reporting = E_ALL & ~E_NOTICE -display_errors = Off -display_startup_errors = Off -log_errors = On -log_errors_max_len = 1024 -ignore_repeated_errors = Off -ignore_repeated_source = Off -report_memleaks = On -track_errors = Off -html_errors = Off -variables_order = "GPCS" -register_globals = Off -register_argc_argv = Off -gpc_order = "GPC" -magic_quotes_gpc = Off -magic_quotes_runtime = Off -magic_quotes_sybase = Off -include_path = ".:/usr/share/php/:/usr/share/php4/:/usr/share/php5/" -enable_dl = Off -file_uploads = On -upload_tmp_dir = "/var/www/syscp-suphp/syscp/" -upload_max_filesize = 32M -allow_url_fopen = Off -session.save_handler = files -session.save_path = "/var/www/syscp-suphp/syscp/" -session.use_cookies = 1 -session.name = PHPSESSID -session.auto_start = 0 -session.cookie_lifetime = 0 -session.cookie_path = / -session.cookie_domain = -session.serialize_handler = php -session.gc_probability = 1 -session.gc_divisor = 1000 -session.gc_maxlifetime = 1440 -session.bug_compat_42 = 0 -session.bug_compat_warn = 1 -session.referer_check = -session.entropy_length = 16 -session.entropy_file = /dev/urandom -session.cache_limiter = nocache -session.cache_expire = 180 -session.use_trans_sid = 0 diff --git a/syscp/patches/gentoo-config-files/bind/gentoo/postfix/etc_postfix_main.cf b/syscp/patches/gentoo-config-files/bind/gentoo/postfix/etc_postfix_main.cf deleted file mode 100644 index 9013dd6..0000000 --- a/syscp/patches/gentoo-config-files/bind/gentoo/postfix/etc_postfix_main.cf +++ /dev/null @@ -1,65 +0,0 @@ -# Postfix directories settings -command_directory = /usr/sbin -daemon_directory = /usr/lib/postfix -queue_directory = /var/spool/postfix -sample_directory = /etc/postfix -manpage_directory = /usr/share/man -readme_directory = /usr/share/doc/postfix-2.1.5-r2/readme -html_directory = no - -# Postfix programs paths settings -mailq_path = /usr/bin/mailq -newaliases_path = /usr/bin/newaliases -sendmail_path = /usr/sbin/sendmail - -# General Postfix configuration -myhostname = -mydestination = $myhostname, $mydomain, localhost.$myhostname, localhost.$mydomain, localhost -mynetworks = 127.0.0.0/8 -inet_interfaces = all -mail_owner = postfix -setgid_group = postdrop -smtpd_banner = $myhostname ESMTP Mailserver -smtpd_helo_required = yes -append_dot_mydomain = no -biff = no - -# Postfix Debugger configuration -debug_peer_level = 2 -debugger_command = - PATH=/bin:/usr/bin:/usr/local/bin; export PATH; (echo cont; - echo where) | gdb $daemon_directory/$process_name $process_id 2>&1 - >$config_directory/$process_name.$process_id.log & sleep 5 - -# Postfix performance settings -default_destination_concurrency_limit = 20 -local_destination_concurrency_limit = 2 - -# Virtual delivery settings -virtual_transport = virtual -virtual_mailbox_base = -virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf -virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf -virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf -virtual_uid_maps = static: -virtual_gid_maps = static: - -# Local delivery settings -local_transport = local -alias_database = hash:/etc/mail/aliases -alias_maps = $alias_database - -# SASL settings -smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination -smtpd_sasl_auth_enable = yes -smtpd_sasl_local_domain = $myhostname -smtpd_sasl_security_options = noanonymous -broken_sasl_auth_clients = yes - -# TLS settings -#smtpd_use_tls = yes -#smtpd_tls_cert_file = /etc/ssl/server/.crt -#smtpd_tls_key_file = /etc/ssl/server/.key -#smtpd_tls_auth_only = no -#smtpd_tls_session_cache_timeout = 3600s -#tls_random_source = dev:/dev/urandom diff --git a/syscp/patches/gentoo-config-files/bind/gentoo/postfix/etc_postfix_mysql-virtual_alias_maps.cf b/syscp/patches/gentoo-config-files/bind/gentoo/postfix/etc_postfix_mysql-virtual_alias_maps.cf deleted file mode 100644 index c921e6f..0000000 --- a/syscp/patches/gentoo-config-files/bind/gentoo/postfix/etc_postfix_mysql-virtual_alias_maps.cf +++ /dev/null @@ -1,8 +0,0 @@ -user = -password = -dbname = -table = mail_virtual -select_field = destination -where_field = email -additional_conditions = and destination <> '' and destination <> ' ' -hosts = diff --git a/syscp/patches/gentoo-config-files/bind/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf b/syscp/patches/gentoo-config-files/bind/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf deleted file mode 100644 index 4484bee..0000000 --- a/syscp/patches/gentoo-config-files/bind/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf +++ /dev/null @@ -1,8 +0,0 @@ -user = -password = -dbname = -table = panel_domains -select_field = domain -where_field = domain -additional_conditions = and isemaildomain = '1' -hosts = diff --git a/syscp/patches/gentoo-config-files/bind/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf b/syscp/patches/gentoo-config-files/bind/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf deleted file mode 100644 index 7e0f79a..0000000 --- a/syscp/patches/gentoo-config-files/bind/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf +++ /dev/null @@ -1,7 +0,0 @@ -user = -password = -dbname = -table = mail_users -select_field = maildir -where_field = email -hosts = diff --git a/syscp/patches/gentoo-config-files/bind/gentoo/postfix/etc_sasl2_smtpd.conf b/syscp/patches/gentoo-config-files/bind/gentoo/postfix/etc_sasl2_smtpd.conf deleted file mode 100644 index 2089cbb..0000000 --- a/syscp/patches/gentoo-config-files/bind/gentoo/postfix/etc_sasl2_smtpd.conf +++ /dev/null @@ -1,12 +0,0 @@ -pwcheck_method: auxprop -auxprop_plugin: sql -allowanonymouslogin: no -allowplaintext: yes -mech_list: PLAIN LOGIN -password_format: crypt -sql_engine: mysql -sql_hostnames: -sql_user: -sql_passwd: -sql_database: -sql_select: SELECT password_enc FROM mail_users where username='%u@%r' diff --git a/syscp/patches/gentoo-config-files/bind/gentoo/proftpd/etc_proftpd_proftpd.conf b/syscp/patches/gentoo-config-files/bind/gentoo/proftpd/etc_proftpd_proftpd.conf deleted file mode 100644 index 5e56215..0000000 --- a/syscp/patches/gentoo-config-files/bind/gentoo/proftpd/etc_proftpd_proftpd.conf +++ /dev/null @@ -1,89 +0,0 @@ -# Server settings -ServerName " FTP Server" -ServerType standalone -ServerIdent off -DefaultServer on -Port 21 -MaxInstances 50 - -# General settings -DeferWelcome on -MultilineRFC2228 on -ShowSymlinks on -AllowOverwrite on -AllowStoreRestart on -AllowRetrieveRestart on -UseReverseDNS off -IdentLookups off -ListOptions "-al" -DisplayFirstChdir .message - -# Modules settings -#DelayEngine off - -# Timeout settings -TimeoutLogin 120 -TimeoutNoTransfer 600 -TimeoutStalled 600 -TimeoutIdle 600 - -# Security settings -RootLogin off -RequireValidShell off -User syscpftpd -Group syscpftpd -Umask 133 022 -DefaultRoot ~ -DenyFilter \*.*/ - -# Per-Directory settings - -Umask 133 022 -AllowOverwrite on - - -# SQL settings -SQLAuthTypes Crypt -SQLAuthenticate users* groups* -SQLConnectInfo @ -SQLUserInfo ftp_users username password uid gid homedir shell -SQLGroupInfo ftp_groups groupname gid members -SQLUserWhereClause "login_enabled = 'y'" - -SQLLog PASS login -SQLNamedQuery login UPDATE "last_login=now(), login_count=login_count+1 WHERE username='%u'" ftp_users - -SQLLog RETR download -SQLNamedQuery download UPDATE "down_count=down_count+1, down_bytes=down_bytes+%b WHERE username='%u'" ftp_users - -SQLLog STOR upload -SQLNamedQuery upload UPDATE "up_count=up_count+1, up_bytes=up_bytes+%b WHERE username='%u'" ftp_users - -# TLS settings -# -#TLSEngine on -#TLSLog /var/log/proftpd-tls.log -#TLSProtocol SSLv23 -#TLSTimeoutHandshake 120 -# Really important for WinClients -#TLSOptions NoCertRequest -#TLSRSACertificateFile /etc/ssl/server/.crt -#TLSRSACertificateKeyFile /etc/ssl/server/.key -# Authenticate client that want to use FTP over TLS? -#TLSVerifyClient off -# Uncomment the following line to force tls login -#TLSRequired off -# - -# LOG settings -# Logging Formats -LogFormat default "%h %1 %u %t \"%r\" %s %b" -LogFormat auth "%v [%P] %h %t \"%r\" %s" -LogFormat write "%h %l %u %t \"%r\" %s %b" -# Activate Logging -# all logins -ExtendedLog /var/log/proftpd-auth.log AUTH auth -# file/dir access -ExtendedLog /var/log/proftpd-access.log WRITE,READ write -# everything (be careful, generates_ very_ big logfiles) -#ExtendedLog /var/log/proftpd-all.log ALL default diff --git a/syscp/patches/gentoo-config-files/bind/syscp-1.2.13-gentoo-admin_configfiles.php-bind b/syscp/patches/gentoo-config-files/bind/syscp-1.2.13-gentoo-admin_configfiles.php-bind deleted file mode 100644 index ff64f20..0000000 --- a/syscp/patches/gentoo-config-files/bind/syscp-1.2.13-gentoo-admin_configfiles.php-bind +++ /dev/null @@ -1,286 +0,0 @@ - - * @copyright (C) 2003-2004 Florian Lippert - * @package Panel - * @version $Id: admin_configfiles.php,v 1.9 2005/06/15 13:53:58 flo Exp $ - * Modified to reflect the Gentoo environment by Luca Longinotti - */ - - define('AREA', 'admin'); - - /** - * Include our init.php, which manages Sessions, Language etc. - */ - require("./lib/init.php"); - - - $configfiles = Array - ( - 'gentoo' => Array - ( - 'label' => 'Gentoo', - 'daemons' => Array - ( - 'apache' => Array - ( - 'label' => 'Apache2 Webserver (HTTP)', - 'commands' => Array - ( - 'touch '.$settings['system']['apacheconf_directory'].'vhosts.d/99_syscp-vhosts.conf', - 'chown root:0 '.$settings['system']['apacheconf_directory'].'vhosts.d/99_syscp-vhosts.conf', - 'chmod 0600 '.$settings['system']['apacheconf_directory'].'vhosts.d/99_syscp-vhosts.conf', - 'echo "Include '.$settings['system']['apacheconf_directory'].'vhosts.d/99_syscp-vhosts.conf" >> /etc/apache2/httpd.conf', - 'mkdir -p '.$settings['system']['documentroot_prefix'], - 'mkdir -p '.$settings['system']['logfiles_directory'] - ), - 'restart' => Array - ( - 'rc-update add apache2 default', - '/etc/init.d/apache2 restart' - ) - ), - 'bind' => Array - ( - 'label' => 'Bind9 Nameserver (DNS)', - 'files' => Array - ( - 'etc_bind_default.zone' => '/etc/bind/default.zone' - ), - 'commands' => Array - ( - 'echo "include \"'.$settings['system']['bindconf_directory'].'syscp_bind.conf\";" >> /etc/bind/named.conf', - 'touch '.$settings['system']['bindconf_directory'].'syscp_bind.conf', - 'chown root:0 '.$settings['system']['bindconf_directory'].'syscp_bind.conf', - 'chmod 0600 '.$settings['system']['bindconf_directory'].'syscp_bind.conf' - ), - 'restart' => Array - ( - 'rc-update add named default', - '/etc/init.d/named restart' - ) - ), - 'courier' => Array - ( - 'label' => 'Courier-IMAP (POP3/IMAP)', - 'files' => Array - ( - 'etc_courier_authlib_authdaemonrc' => '/etc/courier/authlib/authdaemonrc', - 'etc_courier_authlib_authmysqlrc' => '/etc/courier/authlib/authmysqlrc', - 'etc_courier-imap_pop3d' => '/etc/courier-imap/pop3d', - 'etc_courier-imap_imapd' => '/etc/courier-imap/imapd', - 'etc_courier-imap_pop3d-ssl' => '/etc/courier-imap/pop3d-ssl', - 'etc_courier-imap_imapd-ssl' => '/etc/courier-imap/imapd-ssl' - ), - 'commands' => Array - ( - 'rm /etc/courier/authlib/authdaemonrc', - 'rm /etc/courier/authlib/authmysqlrc', - 'rm /etc/courier-imap/pop3d', - 'rm /etc/courier-imap/imapd', - 'rm /etc/courier-imap/pop3d-ssl', - 'rm /etc/courier-imap/imapd-ssl', - 'touch /etc/courier/authlib/authdaemonrc', - 'touch /etc/courier/authlib/authmysqlrc', - 'touch /etc/courier-imap/pop3d', - 'touch /etc/courier-imap/imapd', - 'touch /etc/courier-imap/pop3d-ssl', - 'touch /etc/courier-imap/imapd-ssl', - 'chown root:0 /etc/courier/authlib/authdaemonrc', - 'chown root:0 /etc/courier/authlib/authmysqlrc', - 'chown root:0 /etc/courier-imap/pop3d', - 'chown root:0 /etc/courier-imap/imapd', - 'chown root:0 /etc/courier-imap/pop3d-ssl', - 'chown root:0 /etc/courier-imap/imapd-ssl', - 'chmod 0600 /etc/courier/authlib/authdaemonrc', - 'chmod 0600 /etc/courier/authlib/authmysqlrc', - 'chmod 0600 /etc/courier-imap/pop3d', - 'chmod 0600 /etc/courier-imap/imapd', - 'chmod 0600 /etc/courier-imap/pop3d-ssl', - 'chmod 0600 /etc/courier-imap/imapd-ssl' - ), - 'restart' => Array - ( - 'rc-update add courier-authlib default', - 'rc-update add courier-pop3d default', - 'rc-update add courier-imapd default', - '/etc/init.d/courier-authlib restart', - '/etc/init.d/courier-pop3d restart', - '/etc/init.d/courier-imapd restart' - ) - ), - 'postfix' => Array - ( - 'label' => 'Postfix (MTA)', - 'files' => Array - ( - 'etc_postfix_main.cf' => '/etc/postfix/main.cf', - 'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf', - 'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf', - 'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf', - 'etc_sasl2_smtpd.conf' => '/etc/sasl2/smtpd.conf' - ), - 'commands' => Array - ( - 'mkdir -p '.$settings['system']['vmail_homedir'], - 'chown -R vmail:vmail '.$settings['system']['vmail_homedir'], - 'chmod 0750 '.$settings['system']['vmail_homedir'], - 'rm /etc/postfix/main.cf', - 'touch /etc/postfix/main.cf', - 'touch /etc/postfix/master.cf', - 'touch /etc/postfix/mysql-virtual_alias_maps.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'touch /etc/sasl2/smtpd.conf', - 'chown root:0 /etc/postfix/main.cf', - 'chown root:0 /etc/postfix/master.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_alias_maps.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'chown root:0 /etc/sasl2/smtpd.conf', - 'chmod 0600 /etc/postfix/main.cf', - 'chmod 0600 /etc/postfix/master.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_alias_maps.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'chmod 0600 /etc/sasl2/smtpd.conf' - ), - 'restart' => Array - ( - 'rc-update add postfix default', - '/etc/init.d/postfix restart' - ) - ), - 'proftpd' => Array - ( - 'label' => 'ProFTPd (FTP)', - 'files' => Array - ( - 'etc_proftpd_proftpd.conf' => '/etc/proftpd/proftpd.conf' - ), - 'commands' => Array - ( - 'touch /etc/proftpd/proftpd.conf', - 'chown root:0 /etc/proftpd/proftpd.conf', - 'chmod 0600 /etc/proftpd/proftpd.conf' - ), - 'restart' => Array - ( - 'rc-update add proftpd default', - '/etc/init.d/proftpd restart' - ) - ), - 'cron' => Array - ( - 'label' => 'Crond (cronscript)', - 'files' => Array - ( - 'etc_php_syscp-cronjob_php.ini' => '/etc/php/syscp-cronjob/php.ini', - 'etc_cron.d_syscp' => '/etc/cron.d/syscp' - ), - 'commands' => Array - ( - 'touch /etc/cron.d/syscp', - 'chown root:0 /etc/cron.d/syscp', - 'chmod 0640 /etc/cron.d/syscp', - 'mkdir -p /etc/php/syscp-cronjob', - 'touch /etc/php/syscp-cronjob/php.ini', - 'chown -R root:0 /etc/php/syscp-cronjob', - 'chmod 0750 /etc/php/syscp-cronjob', - 'chmod 0640 /etc/php/syscp-cronjob/php.ini' - ), - 'restart' => Array - ( - 'rc-update add vixie-cron default', - '/etc/init.d/vixie-cron restart' - ) - ) - ) - ) - ); - - /*echo '
';
-	print_r($configfiles);
-	echo '
';*/ - - if( ($page == 'configfiles' || $page == 'overview') && $userinfo['change_serversettings'] == '1') - { - if(isset($_GET['distribution']) && $_GET['distribution']!='' && isset($configfiles[$_GET['distribution']]) && is_array($configfiles[$_GET['distribution']]) && - isset($_GET['daemon']) && $_GET['daemon']!='' && isset($configfiles[$_GET['distribution']]['daemons'][$_GET['daemon']]) && is_array($configfiles[$_GET['distribution']]['daemons'][$_GET['daemon']])) - { - $distribution = addslashes($_GET['distribution']); - $daemon = addslashes($_GET['daemon']); - - if(isset($configfiles[$distribution]['daemons'][$daemon]['commands']) && is_array($configfiles[$distribution]['daemons'][$daemon]['commands'])) - { - $commands = implode("\n", $configfiles[$distribution]['daemons'][$daemon]['commands']); - } - else - { - $commands = ''; - } - - $replace_arr = Array - ( - '' => $sql['user'], - '' => 'MYSQL_PASSWORD', - '' => $sql['db'], - '' => $sql['host'], - '' => $settings['system']['hostname'], - '' => $settings['system']['ipaddress'], - '' => $settings['system']['vmail_homedir'], - '' => $settings['system']['vmail_uid'], - '' => $settings['system']['vmail_gid'] - ); - $files = ''; - if(isset($configfiles[$distribution]['daemons'][$daemon]['files']) && is_array($configfiles[$distribution]['daemons'][$daemon]['files'])) - { - while(list($filename, $realname) = each($configfiles[$distribution]['daemons'][$daemon]['files'])) - { - $file_content = implode('', file('./templates/misc/configfiles/'.$distribution.'/'.$daemon.'/'.$filename)); - $file_content = strtr($file_content, $replace_arr); - $file_content = htmlspecialchars($file_content); - $numbrows = count(explode("\n", $file_content)); - eval("\$files.=\"".getTemplate("configfiles/configfiles_file")."\";"); - } - } - - if(isset($configfiles[$distribution]['daemons'][$daemon]['restart']) && is_array($configfiles[$distribution]['daemons'][$daemon]['restart'])) - { - $restart = implode("\n", $configfiles[$distribution]['daemons'][$daemon]['restart']); - } - else - { - $restart = ''; - } - - eval("echo \"".getTemplate("configfiles/configfiles")."\";"); - } - else - { - $distributions = ''; - while (list($distribution_name, $distribution_details) = each($configfiles)) - { - $daemons = ''; - while(list($daemon_name, $daemon_details) = each($distribution_details['daemons'])) - { - eval("\$daemons.=\"".getTemplate("configfiles/choose_daemon")."\";"); - } - eval("\$distributions.=\"".getTemplate("configfiles/choose_distribution")."\";"); - } - eval("echo \"".getTemplate("configfiles/choose")."\";"); - } - } - -?> diff --git a/syscp/patches/gentoo-config-files/bind/syscp-1.2.13-gentoo-config-bind-r2.tar.bz2 b/syscp/patches/gentoo-config-files/bind/syscp-1.2.13-gentoo-config-bind-r2.tar.bz2 deleted file mode 100644 index e859f7c..0000000 Binary files a/syscp/patches/gentoo-config-files/bind/syscp-1.2.13-gentoo-config-bind-r2.tar.bz2 and /dev/null differ diff --git a/syscp/patches/gentoo-config-files/nodns-ssl/etc_libnss-mysql-root.cfg b/syscp/patches/gentoo-config-files/nodns-ssl/etc_libnss-mysql-root.cfg deleted file mode 100644 index 6498977..0000000 --- a/syscp/patches/gentoo-config-files/nodns-ssl/etc_libnss-mysql-root.cfg +++ /dev/null @@ -1,2 +0,0 @@ -username -password diff --git a/syscp/patches/gentoo-config-files/nodns-ssl/etc_libnss-mysql.cfg b/syscp/patches/gentoo-config-files/nodns-ssl/etc_libnss-mysql.cfg deleted file mode 100644 index d284192..0000000 --- a/syscp/patches/gentoo-config-files/nodns-ssl/etc_libnss-mysql.cfg +++ /dev/null @@ -1,38 +0,0 @@ -getpwnam SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ - FROM ftp_users \ - WHERE username='%1$s' \ - LIMIT 1 -getpwuid SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ - FROM ftp_users \ - WHERE uid='%1$u' \ - LIMIT 1 -getspnam SELECT username,password,UNIX_TIMESTAMP()-10,'1','2','7','-1','-1','0' \ - FROM ftp_users \ - WHERE username='%1$s' \ - LIMIT 1 -getpwent SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ - FROM ftp_users -getspent SELECT username,password,UNIX_TIMESTAMP()-10,'1','2','7','-1','-1','0' \ - FROM ftp_users -getgrnam SELECT groupname,'x',gid \ - FROM ftp_groups \ - WHERE groupname='%1$s' \ - LIMIT 1 -getgrgid SELECT groupname,'x',gid \ - FROM ftp_groups \ - WHERE gid='%1$u' \ - LIMIT 1 -getgrent SELECT groupname,'x',gid \ - FROM ftp_groups -memsbygid SELECT username \ - FROM ftp_users \ - WHERE gid='%1$u' -gidsbymem SELECT gid \ - FROM ftp_users \ - WHERE username='%1$s' - -host -database -username -password -socket /var/run/mysqld/mysqld.sock diff --git a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/courier/etc_courier-imap_imapd b/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/courier/etc_courier-imap_imapd deleted file mode 100644 index f594e41..0000000 --- a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/courier/etc_courier-imap_imapd +++ /dev/null @@ -1,376 +0,0 @@ -##VERSION: $Id: imapd.dist.in,v 1.32 2004/11/25 04:57:04 mrsam Exp $ -# -# imapd created from imapd.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# Copyright 1998 - 2004 Double Precision, Inc. See COPYING for -# distribution information. -# -# This configuration file sets various options for the Courier-IMAP server -# when used with the couriertcpd server. -# A lot of the stuff here is documented in the manual page for couriertcpd. -# -# NOTE - do not use \ to split long variable contents on multiple lines. -# This will break the default imapd.rc script, which parses this file. -# -##NAME: ADDRESS:0 -# -# Address to listen on, can be set to a single IP address. -# -# ADDRESS=127.0.0.1 - -ADDRESS=0 - -##NAME: PORT:1 -# -# Port numbers that connections are accepted on. The default is 143, -# the standard IMAP port. -# -# Multiple port numbers can be separated by commas. When multiple port -# numbers are used it is possible to select a specific IP address for a -# given port as "ip.port". For example, "127.0.0.1.900,192.68.0.1.900" -# accepts connections on port 900 on IP addresses 127.0.0.1 and 192.68.0.1 -# The previous ADDRESS setting is a default for ports that do not have -# a specified IP address. - -PORT=143 - -##NAME: AUTHSERVICE:0 -# -# It's possible to authenticate using a different 'service' parameter -# depending on the connection's port. This only works with authentication -# modules that use the 'service' parameter, such as PAM. Example: -# -# AUTHSERVICE143=imap -# AUTHSERVICE993=imaps - -##NAME: MAXDAEMONS:0 -# -# Maximum number of IMAP servers started -# - -MAXDAEMONS=50 - -##NAME: MAXPERIP:0 -# -# Maximum number of connections to accept from the same IP address - -MAXPERIP=10 - -##NAME: PIDFILE:0 -# -# File where couriertcpd will save its process ID -# - -PIDFILE=/var/run/imapd.pid - -##NAME: TCPDOPTS:0 -# -# Miscellaneous couriertcpd options that shouldn't be changed. -# - -TCPDOPTS="-nodnslookup -noidentlookup" - -##NAME: IMAP_CAPABILITY:1 -# -# IMAP_CAPABILITY specifies what most of the response should be to the -# CAPABILITY command. -# -# If you have properly configured Courier to use CRAM-MD5 or CRAM-SHA1 -# authentication (see INSTALL), set IMAP_CAPABILITY as follows: -# -# IMAP_CAPABILITY="IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 IDLE" -# - -IMAP_CAPABILITY="IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA IDLE" - -##NAME: KEYWORDS_CAPABILITY:0 -# -# IMAP_KEYWORDS=1 enables custom IMAP keywords. Set this option to 0 to -# disable custom keywords. - -IMAP_KEYWORDS=1 - -##NAME: SMAP1_CAPABILITY:0 -# -# EXPERIMENTAL -# -# To enable the experimental "Simple Mail Access Protocol" extensions, -# uncomment the following setting. -# -# SMAP_CAPABILITY=SMAP1 - -##NAME: IMAP_CAPABILITY_ORIG:1 -# -# For use by webadmin - -IMAP_CAPABILITY_ORIG="IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 IDLE" - -##NAME: IMAP_PROXY:0 -# -# Enable proxying. See README.proxy - -IMAP_PROXY=0 - -##NAME: IMAP_PROXY_FOREIGN:0 -# -# Proxying to non-Courier servers. Re-sends the CAPABILITY command after -# logging in to the remote server. May not work with all IMAP clients. - -IMAP_PROXY_FOREIGN=0 - -##NAME: IMAP_IDLE_TIMEOUT:0 -# -# This setting controls how often -# the server polls for changes to the folder, in IDLE mode (in seconds). - -IMAP_IDLE_TIMEOUT=60 - -##NAME: IMAP_CAPABILITY_TLS:0 -# -# The following setting will advertise SASL PLAIN authentication after -# STARTTLS is established. If you want to allow SASL PLAIN authentication -# with or without TLS then just comment this out, and add AUTH=PLAIN to -# IMAP_CAPABILITY - -IMAP_CAPABILITY_TLS="$IMAP_CAPABILITY AUTH=PLAIN" - -##NAME: IMAP_TLS_ORIG:0 -# -# For use by webadmin - -IMAP_CAPABILITY_TLS_ORIG="$IMAP_CAPABILITY_ORIG AUTH=PLAIN" - -##NAME: IMAP_DISABLETHREADSORT:0 -# -# Set IMAP_DISABLETHREADSORT to disable the THREAD and SORT commands - -# server side sorting and threading. -# -# Those capabilities will still be advertised, but the server will reject -# them. Set this option if you want to disable all the extra load from -# server-side threading and sorting. Not advertising those capabilities -# will simply result in the clients reading the entire folder, and sorting -# it on the client side. That will still put some load on the server. -# advertising these capabilities, but rejecting the commands, will stop this -# silliness. -# - -IMAP_DISABLETHREADSORT=0 - -##NAME: IMAP_CHECK_ALL_FOLDERS:0 -# -# Set IMAP_CHECK_ALL_FOLDERS to 1 if you want the server to check for new -# mail in every folder. Not all IMAP clients use the IMAP's new mail -# indicator, but some do. Normally new mail is checked only in INBOX, -# because it is a comparatively time consuming operation, and it would be -# a complete waste of time unless mail filters are used to deliver -# mail directly to folders. -# -# When IMAP clients are used which support new mail indication, and when -# mail filters are used to sort incoming mail into folders, setting -# IMAP_CHECK_ALL_FOLDERS to 1 will allow IMAP clients to announce new -# mail in folders. Note that this will result in slightly more load on the -# server. -# - -IMAP_CHECK_ALL_FOLDERS=0 - -##NAME: IMAP_OBSOLETE_CLIENT:0 -# -# Set IMAP_OBSOLETE_CLIENT if your IMAP client expects \\NoInferiors to mean -# what \\HasNoChildren really means. - -IMAP_OBSOLETE_CLIENT=0 - -##NAME: IMAP_UMASK:0 -# -# IMAP_UMASK sets the umask of the server process. The value of IMAP_UMASK is -# simply passed to the "umask" command. The default value is 022. -# -# This feature is mostly useful for shared folders, where the file permissions -# of the messages may be important. - -IMAP_UMASK=027 - -##NAME: IMAP_ULIMITD:0 -# -# IMAP_ULIMITD sets the maximum size of the data segment of the server -# process. The value of IMAP_ULIMITD is simply passed to the "ulimit -d" -# command (or ulimit -v). The argument to ulimi sets the upper limit on the -# size of the data segment of the server process, in kilobytes. The default -# value of 65536 sets a very generous limit of 64 megabytes, which should -# be more than plenty for anyone. -# -# This feature is used as an additional safety check that should stop -# any potential denial-of-service attacks that exploit any kind of -# a memory leak to exhaust all the available memory on the server. -# It is theoretically possible that obscenely huge folders will also -# result in the server running out of memory when doing server-side -# sorting (by my calculations you have to have at least 100,000 messages -# in a single folder, for that to happen). - -IMAP_ULIMITD=65536 - -##NAME: IMAP_USELOCKS:0 -# -# Setting IMAP_USELOCKS to 1 will use dot-locking to support concurrent -# multiple access to the same folder. This incurs slight additional -# overhead. Concurrent multiple access will still work without this setting, -# however occasionally a minor race condition may result in an IMAP client -# downloading the same message twice, or a keyword update will fail. -# -# IMAP_USELOCKS=1 is strongly recommended when shared folders are used. - -IMAP_USELOCKS=1 - -##NAME: IMAP_SHAREDINDEXFILE:0 -# -# The index of all accessible folders. Do not change this setting unless -# you know what you're doing. See README.sharedfolders for additional -# information. - -IMAP_SHAREDINDEXFILE=/etc/courier-imap/shared/index - -##NAME: IMAP_ENHANCEDIDLE:0 -# -# If Courier was compiled with the File Alteration Monitor, setting -# IMAP_ENHANCEDIDLE to 1 enables enhanced IDLE mode, where multiple -# clients may open the same folder concurrently, and receive updates to -# folder contents in realtime. See the imapd(8) man page for additional -# information. -# -# IMPORTANT: IMAP_USELOCKS *MUST* also be set to 1, and IDLE must be included -# in the IMAP_CAPABILITY list. -# - -IMAP_ENHANCEDIDLE=0 - -##NAME: IMAP_TRASHFOLDERNAME:0 -# -# The name of the magic trash Folder. For MSOE compatibility, -# you can set IMAP_TRASHFOLDERNAME="Deleted Items". -# -# IMPORTANT: If you change this, you must also change IMAP_EMPTYTRASH - -IMAP_TRASHFOLDERNAME=Trash - -##NAME: IMAP_EMPTYTRASH:0 -# -# The following setting is optional, and causes messages from the given -# folder to be automatically deleted after the given number of days. -# IMAP_EMPTYTRASH is a comma-separated list of folder:days. The default -# setting, below, purges 7 day old messages from the Trash folder. -# Another useful setting would be: -# -# IMAP_EMPTYTRASH=Trash:7,Sent:30 -# -# This would also delete messages from the Sent folder (presumably copies -# of sent mail) after 30 days. This is a global setting that is applied to -# every mail account, and is probably useful in a controlled, corporate -# environment. -# -# Important: the purging is controlled by CTIME, not MTIME (the file time -# as shown by ls). It is perfectly ordinary to see stuff in Trash that's -# a year old. That's the file modification time, MTIME, that's displayed. -# This is generally when the message was originally delivered to this -# mailbox. Purging is controlled by a different timestamp, CTIME, which is -# changed when the file is moved to the Trash folder (and at other times too). -# -# You might want to disable this setting in certain situations - it results -# in a stat() of every file in each folder, at login and logout. -# - -IMAP_EMPTYTRASH=Trash:7 - -##NAME: IMAP_MOVE_EXPUNGE_TO_TRASH:0 -# -# Set IMAP_MOVE_EXPUNGE_TO_TRASH to move expunged messages to Trash. This -# effectively allows an undo of message deletion by fishing the deleted -# mail from trash. Trash can be manually expunged as usually, and mail -# will get automatically expunged from Trash according to IMAP_EMPTYTRASH. -# -# NOTE: shared folders are still expunged as usual. Shared folders are -# not affected. -# - -IMAP_MOVE_EXPUNGE_TO_TRASH=0 - - -##NAME: OUTBOX:0 -# -# The next set of options deal with the "Outbox" enhancement. -# Uncomment the following setting to create a special folder, named -# INBOX.Outbox -# -# OUTBOX=.Outbox - -##NAME: SENDMAIL:0 -# -# If OUTBOX is defined, mail can be sent via the IMAP connection by copying -# a message to the INBOX.Outbox folder. For all practical matters, -# INBOX.Outbox looks and behaves just like any other IMAP folder. If this -# folder doesn't exist it must be created by the IMAP mail client, just -# like any other IMAP folder. The kicker: any message copied or moved to -# this folder is will be E-mailed by the Courier-IMAP server, by running -# the SENDMAIL program. Therefore, messages copied or moved to this -# folder must be well-formed RFC-2822 messages, with the recipient list -# specified in the To:, Cc:, and Bcc: headers. Courier-IMAP relies on -# SENDMAIL to read the recipient list from these headers (and delete the Bcc: -# header) by running the command "$SENDMAIL -oi -t -f $SENDER", with the -# message piped on standard input. $SENDER will be the return address -# of the message, which is set by the authentication module. -# -# DO NOT MODIFY SENDMAIL, below, unless you know what you're doing. -# - -SENDMAIL=/usr/sbin/sendmail - -##NAME: HEADERFROM:0 -# -# For administrative and oversight purposes, the return address, $SENDER -# will also be saved in the X-IMAP-Sender mail header. This header gets -# added to the sent E-mail (but it doesn't get saved in the copy of the -# message that's saved in the folder) -# -# WARNING - By enabling OUTBOX above, *every* IMAP mail client will receive -# the magic OUTBOX treatment. Therefore advance LARTing is in order for -# _all_ of your lusers, until every one of them is aware of this. Otherwise if -# OUTBOX is left at its default setting - a folder name that might be used -# accidentally - some people may be in for a rude surprise. You can redefine -# the name of the magic folder by changing OUTBOX, above. You should do that -# and pick a less-obvious name. Perhaps brand it with your organizational -# name ( OUTBOX=.WidgetsAndSonsOutbox ) - -HEADERFROM=X-IMAP-Sender - -##NAME: IMAPDSTART:0 -# -# IMAPDSTART is not used directly. Rather, this is a convenient flag to -# be read by your system startup script in /etc/rc.d, like this: -# -# . /etc/courier-imap/imapd -# -# case x$IMAPDSTART in -# x[yY]*) -# /usr/lib/courier-imap/imapd.rc start -# ;; -# esac -# -# The default setting is going to be NO, so you'll have to manually flip -# it to yes. - -IMAPDSTART=YES - -##NAME: MAILDIRPATH:0 -# -# MAILDIRPATH - directory name of the maildir directory. -# -MAILDIRPATH=Maildir - -#Hardwire a value for ${MAILDIR} -MAILDIR=.maildir -MAILDIRPATH=.maildir -#Put any program for ${PRERUN} here -PRERUN= diff --git a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/courier/etc_courier-imap_imapd-ssl b/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/courier/etc_courier-imap_imapd-ssl deleted file mode 100644 index 76dbcf7..0000000 --- a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/courier/etc_courier-imap_imapd-ssl +++ /dev/null @@ -1,199 +0,0 @@ -##VERSION: $Id: imapd-ssl.dist.in,v 1.11 2004/10/21 00:45:35 mrsam Exp $ -# -# imapd-ssl created from imapd-ssl.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# Copyright 2000 - 2004 Double Precision, Inc. See COPYING for -# distribution information. -# -# This configuration file sets various options for the Courier-IMAP server -# when used to handle SSL IMAP connections. -# -# SSL and non-SSL connections are handled by a dedicated instance of the -# couriertcpd daemon. If you are accepting both SSL and non-SSL IMAP -# connections, you will start two instances of couriertcpd, one on the -# IMAP port 143, and another one on the IMAP-SSL port 993. -# -# Download OpenSSL from http://www.openssl.org/ -# -##NAME: SSLPORT:1 -# -# Options in the imapd-ssl configuration file AUGMENT the options in the -# imapd configuration file. First the imapd configuration file is read, -# then the imapd-ssl configuration file, so we do not have to redefine -# anything. -# -# However, some things do have to be redefined. The port number is -# specified by SSLPORT, instead of PORT. The default port is port 993. -# -# Multiple port numbers can be separated by commas. When multiple port -# numbers are used it is possibly to select a specific IP address for a -# given port as "ip.port". For example, "127.0.0.1.900,192.68.0.1.900" -# accepts connections on port 900 on IP addresses 127.0.0.1 and 192.68.0.1 -# The SSLADDRESS setting is a default for ports that do not have -# a specified IP address. - -SSLPORT=993 - -##NAME: SSLADDRESS:0 -# -# Address to listen on, can be set to a single IP address. -# -# SSLADDRESS=127.0.0.1 - -SSLADDRESS=0 - -##NAME: SSLPIDFILE:0 -# -# That's the SSL IMAP port we'll listen on. -# Feel free to redefine MAXDAEMONS, TCPDOPTS, and MAXPERIP. - -SSLPIDFILE=/var/run/imapd-ssl.pid - -##NAME: IMAPDSSLSTART:0 -# -# Different pid files, so that both instances of couriertcpd can coexist -# happily. -# -# You can also redefine IMAP_CAPABILITY, although I can't -# think of why you'd want to do that. -# -# -# Ok, the following settings are new to imapd-ssl: -# -# Whether or not to start IMAP over SSL on simap port: - -IMAPDSSLSTART=YES - -##NAME: IMAPDSTARTTLS:0 -# -# Whether or not to implement IMAP STARTTLS extension instead: - -IMAPDSTARTTLS=YES - -##NAME: IMAP_TLS_REQUIRED:1 -# -# Set IMAP_TLS_REQUIRED to 1 if you REQUIRE STARTTLS for everyone. -# (this option advertises the LOGINDISABLED IMAP capability, until STARTTLS -# is issued). - -IMAP_TLS_REQUIRED=0 - -######################################################################### -# -# The following variables configure IMAP over SSL. If OpenSSL is available -# during configuration, the couriertls helper gets compiled, and upon -# installation a dummy TLS_CERTFILE gets generated. courieresmtpd will -# automatically advertise the ESMTP STARTTLS extension if both TLS_CERTFILE -# and COURIERTLS exist. -# -# WARNING: Peer certificate verification has NOT yet been tested. Proceed -# at your own risk. Only the basic SSL/TLS functionality is known to be -# working. Keep this in mind as you play with the following variables. -# -##NAME: COURIERTLS:0 -# - -COURIERTLS=/usr/sbin/couriertls - -##NAME: TLS_PROTOCOL:0 -# -# TLS_PROTOCOL sets the protocol version. The possible versions are: -# -# SSL2 - SSLv2 -# SSL3 - SSLv3 -# TLS1 - TLS1 - -TLS_PROTOCOL=SSL3 - -##NAME: TLS_STARTTLS_PROTOCOL:0 -# -# TLS_STARTTLS_PROTOCOL is used instead of TLS_PROTOCOL for the IMAP STARTTLS -# extension, as opposed to IMAP over SSL on port 993. -# - -TLS_STARTTLS_PROTOCOL=TLS1 - -##NAME: TLS_CIPHER_LIST:0 -# -# TLS_CIPHER_LIST optionally sets the list of ciphers to be used by the -# OpenSSL library. In most situations you can leave TLS_CIPHER_LIST -# undefined -# -# TLS_CIPHER_LIST="ALL:!ADH:RC4+RSA:+SSLv2:@STRENGTH" - -##NAME: TLS_TIMEOUT:0 -# TLS_TIMEOUT is currently not implemented, and reserved for future use. -# This is supposed to be an inactivity timeout, but its not yet implemented. -# - -##NAME: TLS_DHCERTFILE:0 -# -# TLS_DHCERTFILE - PEM file that stores our Diffie-Hellman cipher pair. -# When OpenSSL is compiled to use Diffie-Hellman ciphers instead of RSA -# you must generate a DH pair that will be used. In most situations the -# DH pair is to be treated as confidential, and the file specified by -# TLS_DHCERTFILE must not be world-readable. -# -# TLS_DHCERTFILE= - -##NAME: TLS_CERTFILE:0 -# -# TLS_CERTFILE - certificate to use. TLS_CERTFILE is required for SSL/TLS -# servers, and is optional for SSL/TLS clients. TLS_CERTFILE is usually -# treated as confidential, and must not be world-readable. -# -TLS_CERTFILE=/etc/ssl/server/.crt_and_key - -##NAME: TLS_TRUSTCERTS:0 -# -# TLS_TRUSTCERTS=pathname - load trusted certificates from pathname. -# pathname can be a file or a directory. If a file, the file should -# contain a list of trusted certificates, in PEM format. If a -# directory, the directory should contain the trusted certificates, -# in PEM format, one per file and hashed using OpenSSL's c_rehash -# script. TLS_TRUSTCERTS is used by SSL/TLS clients (by specifying -# the -domain option) and by SSL/TLS servers (TLS_VERIFYPEER is set -# to PEER or REQUIREPEER). -# -# -# TLS_TRUSTCERTS= - -##NAME: TLS_VERIFYPEER:0 -# -# TLS_VERIFYPEER - how to verify client certificates. The possible values of -# this setting are: -# -# NONE - do not verify anything -# -# PEER - verify the client certificate, if one's presented -# -# REQUIREPEER - require a client certificate, fail if one's not presented -# -# -TLS_VERIFYPEER=NONE - -##NAME: TLS_CACHE:0 -# -# A TLS/SSL session cache may slightly improve response for IMAP clients -# that open multiple SSL sessions to the server. TLS_CACHEFILE will be -# automatically created, TLS_CACHESIZE bytes long, and used as a cache -# buffer. -# -# This is an experimental feature and should be disabled if it causes -# problems with SSL clients. Disable SSL caching by commenting out the -# following settings: - -TLS_CACHEFILE=/var/lib/courier-imap/couriersslcache -TLS_CACHESIZE=524288 - -##NAME: MAILDIRPATH:0 -# -# MAILDIRPATH - directory name of the maildir directory. -# -MAILDIRPATH=Maildir - -#Hardwire a value for ${MAILDIR} -MAILDIRPATH=.maildir diff --git a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/courier/etc_courier-imap_pop3d b/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/courier/etc_courier-imap_pop3d deleted file mode 100644 index 71502ae..0000000 --- a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/courier/etc_courier-imap_pop3d +++ /dev/null @@ -1,127 +0,0 @@ -##VERSION: $Id: pop3d.dist.in,v 1.11 2004/10/30 15:39:38 mrsam Exp $ -# -# pop3d created from pop3d.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# Copyright 1998 - 2004 Double Precision, Inc. See COPYING for -# distribution information. -# -# Courier POP3 daemon configuration -# -##NAME: PIDFILE:0 -# - -PIDFILE=/var/run/pop3d.pid - -##NAME: MAXDAEMONS:0 -# -# Maximum number of POP3 servers started -# - -MAXDAEMONS=50 - -##NAME: MAXPERIP:4 -# -# Maximum number of connections to accept from the same IP address - -MAXPERIP=5 - -##NAME: POP3AUTH:1 -# -# To advertise the SASL capability, per RFC 2449, uncomment the POP3AUTH -# variable: -# -# POP3AUTH="LOGIN" -# -# If you have configured the CRAM-MD5 or CRAM-SHA1, set POP3AUTH to something -# like this: -# -# POP3AUTH="LOGIN CRAM-MD5 CRAM-SHA1" - -POP3AUTH="" - -##NAME: POP3AUTH_ORIG:0 -# -# For use by webadmin - -POP3AUTH_ORIG="LOGIN CRAM-MD5 CRAM-SHA1" - -##NAME: POP3AUTH_TLS:1 -# -# To also advertise SASL PLAIN if SSL is enabled, uncomment the -# POP3AUTH_TLS environment variable: -# -# POP3AUTH_TLS="LOGIN PLAIN" - -POP3AUTH_TLS="" - -##NAME: POP3AUTH_TLS_ORIG:0 -# -# For use by webadmin - -POP3AUTH_TLS_ORIG="LOGIN PLAIN" - -##NAME: POP3_PROXY:0 -# -# Enable proxying. See README.proxy - -POP3_PROXY=0 - -##NAME: PORT:1 -# -# Port to listen on for connections. The default is port 110. -# -# Multiple port numbers can be separated by commas. When multiple port -# numbers are used it is possibly to select a specific IP address for a -# given port as "ip.port". For example, "127.0.0.1.900,192.68.0.1.900" -# accepts connections on port 900 on IP addresses 127.0.0.1 and 192.68.0.1 -# The ADDRESS setting is a default for ports that do not have a specified -# IP address. - -PORT=110 - -##NAME: ADDRESS:0 -# -# IP address to listen on. 0 means all IP addresses. - -ADDRESS=0 - -##NAME: TCPDOPTS:0 -# -# Other couriertcpd(1) options. The following defaults should be fine. -# - -TCPDOPTS="-nodnslookup -noidentlookup" - -##NAME: POP3DSTART:0 -# -# POP3DSTART is not referenced anywhere in the standard Courier programs -# or scripts. Rather, this is a convenient flag to be read by your system -# startup script in /etc/rc.d, like this: -# -# . /etc/courier-imap/pop3d -# case x$POP3DSTART in -# x[yY]*) -# /usr/lib/courier-imap/pop3d.rc start -# ;; -# esac -# -# The default setting is going to be NO, until Courier is shipped by default -# with enough platforms so that people get annoyed with having to flip it to -# YES every time. - -POP3DSTART=YES - -##NAME: MAILDIRPATH:0 -# -# MAILDIRPATH - directory name of the maildir directory. -# -MAILDIRPATH=Maildir - -#Hardwire a value for ${MAILDIR} -MAILDIR=.maildir -MAILDIRPATH=.maildir -#Put any program for ${PRERUN} here -PRERUN= diff --git a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/courier/etc_courier-imap_pop3d-ssl b/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/courier/etc_courier-imap_pop3d-ssl deleted file mode 100644 index a0267a0..0000000 --- a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/courier/etc_courier-imap_pop3d-ssl +++ /dev/null @@ -1,186 +0,0 @@ -##VERSION: $Id: pop3d-ssl.dist.in,v 1.12 2004/10/21 00:45:35 mrsam Exp $ -# -# pop3d-ssl created from pop3d-ssl.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# Copyright 2000-2004 Double Precision, Inc. See COPYING for -# distribution information. -# -# This configuration file sets various options for the Courier-IMAP server -# when used to handle SSL POP3 connections. -# -# SSL and non-SSL connections are handled by a dedicated instance of the -# couriertcpd daemon. If you are accepting both SSL and non-SSL POP3 -# connections, you will start two instances of couriertcpd, one on the -# POP3 port 110, and another one on the POP3-SSL port 995. -# -# Download OpenSSL from http://www.openssl.org/ -# -##NAME: SSLPORT:0 -# -# Options in the pop3d-ssl configuration file AUGMENT the options in the -# pop3d configuration file. First the pop3d configuration file is read, -# then the pop3d-ssl configuration file, so we do not have to redefine -# anything. -# -# However, some things do have to be redefined. The port number is -# specified by SSLPORT, instead of PORT. The default port is port 995. -# -# Multiple port numbers can be separated by commas. When multiple port -# numbers are used it is possibly to select a specific IP address for a -# given port as "ip.port". For example, "127.0.0.1.900,192.68.0.1.900" -# accepts connections on port 900 on IP addresses 127.0.0.1 and 192.68.0.1 -# The SSLADDRESS setting is a default for ports that do not have -# a specified IP address. - -SSLPORT=995 - -##NAME: SSLADDRESS:0 -# -# Address to listen on, can be set to a single IP address. -# -# SSLADDRESS=127.0.0.1 - -SSLADDRESS=0 - -##NAME: SSLPIDFILE:0 -# -# -# - -SSLPIDFILE=/var/run/pop3d-ssl.pid - -##NAME: POP3DSSLSTART:0 -# -# Whether or not to start POP3 over SSL on spop3 port: - -POP3DSSLSTART=YES - -##NAME: POP3_STARTTLS:0 -# -# Whether or not to implement the POP3 STLS extension: - -POP3_STARTTLS=YES - -##NAME: POP3_TLS_REQUIRED:1 -# -# Set POP3_TLS_REQUIRED to 1 if you REQUIRE STARTTLS for everyone. -# (this option advertises the LOGINDISABLED POP3 capability, until STARTTLS -# is issued). - -POP3_TLS_REQUIRED=0 - -##NAME: COURIERTLS:0 -# -# The following variables configure POP3 over SSL. If OpenSSL is available -# during configuration, the couriertls helper gets compiled, and upon -# installation a dummy TLS_CERTFILE gets generated. courieresmtpd will -# automatically advertise the ESMTP STARTTLS extension if both TLS_CERTFILE -# and COURIERTLS exist. -# -# WARNING: Peer certificate verification has NOT yet been tested. Proceed -# at your own risk. Only the basic SSL/TLS functionality is known to be -# working. Keep this in mind as you play with the following variables. - -COURIERTLS=/usr/sbin/couriertls - -##NAME: TLS_PROTOCOL:0 -# -# TLS_PROTOCOL sets the protocol version. The possible versions are: -# -# SSL2 - SSLv2 -# SSL3 - SSLv3 -# TLS1 - TLS1 - -TLS_PROTOCOL=SSL3 - -##NAME: TLS_STARTTLS_PROTOCOL:0 -# -# TLS_STARTTLS_PROTOCOL is used instead of TLS_PROTOCOL for the POP3 STARTTLS -# extension, as opposed to POP3 over SSL on port 995. -# - -TLS_STARTTLS_PROTOCOL=TLS1 - -##NAME: TLS_CIPHER_LIST:0 -# -# TLS_CIPHER_LIST optionally sets the list of ciphers to be used by the -# OpenSSL library. In most situations you can leave TLS_CIPHER_LIST -# undefined -# -# TLS_CIPHER_LIST="ALL:!ADH:RC4+RSA:+SSLv2:@STRENGTH" - -##NAME: TLS_TIMEOUT:0 -# TLS_TIMEOUT is currently not implemented, and reserved for future use. -# This is supposed to be an inactivity timeout, but its not yet implemented. -# - -##NAME: TLS_DHCERTFILE:0 -# -# TLS_DHCERTFILE - PEM file that stores our Diffie-Hellman cipher pair. -# When OpenSSL is compiled to use Diffie-Hellman ciphers instead of RSA -# you must generate a DH pair that will be used. In most situations the -# DH pair is to be treated as confidential, and the file specified by -# TLS_DHCERTFILE must not be world-readable. -# -# TLS_DHCERTFILE= - -##NAME: TLS_CERTFILE:0 -# -# TLS_CERTFILE - certificate to use. TLS_CERTFILE is required for SSL/TLS -# servers, and is optional for SSL/TLS clients. TLS_CERTFILE is usually -# treated as confidential, and must not be world-readable. -# -TLS_CERTFILE=/etc/ssl/server/.crt_and_key - -##NAME: TLS_TRUSTCERTS:0 -# -# TLS_TRUSTCERTS=pathname - load trusted certificates from pathname. -# pathname can be a file or a directory. If a file, the file should -# contain a list of trusted certificates, in PEM format. If a -# directory, the directory should contain the trusted certificates, -# in PEM format, one per file and hashed using OpenSSL's c_rehash -# script. TLS_TRUSTCERTS is used by SSL/TLS clients (by specifying -# the -domain option) and by SSL/TLS servers (TLS_VERIFYPEER is set -# to PEER or REQUIREPEER). -# -# -# TLS_TRUSTCERTS= - -##NAME: TLS_VERIFYPEER:0 -# -# TLS_VERIFYPEER - how to verify client certificates. The possible values of -# this setting are: -# -# NONE - do not verify anything -# -# PEER - verify the client certificate, if one's presented -# -# REQUIREPEER - require a client certificate, fail if one's not presented -# -# -TLS_VERIFYPEER=NONE - -##NAME: TLS_CACHE:0 -# -# A TLS/SSL session cache may slightly improve response for long-running -# POP3 clients. TLS_CACHEFILE will be automatically created, TLS_CACHESIZE -# bytes long, and used as a cache buffer. -# -# This is an experimental feature and should be disabled if it causes -# problems with SSL clients. Disable SSL caching by commenting out the -# following settings: - -TLS_CACHEFILE=/var/lib/courier-imap/couriersslcache -TLS_CACHESIZE=524288 - -##NAME: MAILDIRPATH:0 -# -# MAILDIRPATH - directory name of the maildir directory. -# -MAILDIRPATH=Maildir - -#Hardwire a value for ${MAILDIR} -MAILDIRPATH=.maildir diff --git a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/courier/etc_courier_authlib_authdaemonrc b/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/courier/etc_courier_authlib_authdaemonrc deleted file mode 100644 index 867a12d..0000000 --- a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/courier/etc_courier_authlib_authdaemonrc +++ /dev/null @@ -1,93 +0,0 @@ -##VERSION: $Id: authdaemonrc.in,v 1.12 2005/07/05 12:25:08 mrsam Exp $ -# -# Copyright 2000-2005 Double Precision, Inc. See COPYING for -# distribution information. -# -# authdaemonrc created from authdaemonrc.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# This file configures authdaemond, the resident authentication daemon. -# -# Comments in this file are ignored. Although this file is intended to -# be sourced as a shell script, authdaemond parses it manually, so -# the acceptable syntax is a bit limited. Multiline variable contents, -# with the \ continuation character, are not allowed. Everything must -# fit on one line. Do not use any additional whitespace for indentation, -# or anything else. - -##NAME: authmodulelist:2 -# -# The authentication modules that are linked into authdaemond. The -# default list is installed. You may selectively disable modules simply -# by removing them from the following list. The available modules you -# can use are: authuserdb authpam authshadow authmysql authcustom authpipe - -authmodulelist="authmysql" - -##NAME: authmodulelistorig:3 -# -# This setting is used by Courier's webadmin module, and should be left -# alone - -authmodulelistorig="authuserdb authpam authshadow authmysql authcustom authpipe" - -##NAME: daemons:0 -# -# The number of daemon processes that are started. authdaemon is typically -# installed where authentication modules are relatively expensive: such -# as authldap, or authmysql, so it's better to have a number of them running. -# PLEASE NOTE: Some platforms may experience a problem if there's more than -# one daemon. Specifically, SystemV derived platforms that use TLI with -# socket emulation. I'm suspicious of TLI's ability to handle multiple -# processes accepting connections on the same filesystem domain socket. -# -# You may need to increase daemons if as your system load increases. Symptoms -# include sporadic authentication failures. If you start getting -# authentication failures, increase daemons. However, the default of 5 -# SHOULD be sufficient. Bumping up daemon count is only a short-term -# solution. The permanent solution is to add more resources: RAM, faster -# disks, faster CPUs... - -daemons=5 - -##NAME: authdaemonvar:2 -# -# authdaemonvar is here, but is not used directly by authdaemond. It's -# used by various configuration and build scripts, so don't touch it! - -authdaemonvar=/var/lib/courier/authdaemon - -##NAME: DEBUG_LOGIN:0 -# -# Dump additional diagnostics to syslog -# -# DEBUG_LOGIN=0 - turn off debugging -# DEBUG_LOGIN=1 - turn on debugging -# DEBUG_LOGIN=2 - turn on debugging + log passwords too -# -# ** YES ** - DEBUG_LOGIN=2 places passwords into syslog. -# -# Note that most information is sent to syslog at level 'debug', so -# you may need to modify your /etc/syslog.conf to be able to see it. - -DEBUG_LOGIN=0 - -##NAME: DEFAULTOPTIONS:0 -# -# A comma-separated list of option=value pairs. Each option is applied -# to an account if the account does not have its own specific value for -# that option. So for example, you can set -# DEFAULTOPTIONS="disablewebmail=1,disableimap=1" -# and then enable webmail and/or imap on individual accounts by setting -# disablewebmail=0 and/or disableimap=0 on the account. - -DEFAULTOPTIONS="" - -##NAME: LOGGEROPTS:0 -# -# courierlogger(1) options, e.g. to set syslog facility -# - -LOGGEROPTS="" diff --git a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/courier/etc_courier_authlib_authmysqlrc b/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/courier/etc_courier_authlib_authmysqlrc deleted file mode 100644 index fec6508..0000000 --- a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/courier/etc_courier_authlib_authmysqlrc +++ /dev/null @@ -1,12 +0,0 @@ -MYSQL_SERVER -MYSQL_USERNAME -MYSQL_PASSWORD -MYSQL_PORT 0 -MYSQL_DATABASE -MYSQL_USER_TABLE mail_users -MYSQL_CRYPT_PWFIELD password_enc -MYSQL_UID_FIELD -MYSQL_GID_FIELD -MYSQL_LOGIN_FIELD username -MYSQL_HOME_FIELD "" -MYSQL_MAILDIR_FIELD maildir diff --git a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/cron/etc_cron.d_syscp b/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/cron/etc_cron.d_syscp deleted file mode 100644 index 4afe408..0000000 --- a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/cron/etc_cron.d_syscp +++ /dev/null @@ -1,10 +0,0 @@ -# -# Set PATH, otherwise restart-scripts won't find start-stop-daemon -# -PATH=/sbin:/bin:/usr/sbin:/usr/bin -# -# Regular cron jobs for the syscp package -# -# Please check that all following paths are correct -# -*/5 * * * * root /usr/lib/php4/bin/php -q -c /etc/php/syscp-cronjob/php.ini /var/www/syscp/scripts/cronscript.php diff --git a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/cron/etc_php_syscp-cronjob_php.ini b/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/cron/etc_php_syscp-cronjob_php.ini deleted file mode 100644 index 74c8316..0000000 --- a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/cron/etc_php_syscp-cronjob_php.ini +++ /dev/null @@ -1,61 +0,0 @@ -short_open_tag = On -asp_tags = Off -precision = 14 -output_buffering = Off -allow_call_time_pass_reference = Off -safe_mode = Off -safe_mode_gid = Off -safe_mode_include_dir = "/usr/share/php/:/usr/share/php4/:/usr/share/php5/" -safe_mode_allowed_env_vars = PHP_ -safe_mode_protected_env_vars = LD_LIBRARY_PATH -open_basedir = -disable_functions = -disable_classes = -expose_php = Off -max_execution_time = 180 -max_input_time = 120 -memory_limit = 32M -post_max_size = 32M -error_reporting = E_ALL & ~E_NOTICE -display_errors = On -display_startup_errors = Off -log_errors = Off -log_errors_max_len = 1024 -ignore_repeated_errors = Off -ignore_repeated_source = Off -report_memleaks = On -track_errors = Off -html_errors = Off -variables_order = "GPCS" -register_globals = Off -register_argc_argv = Off -gpc_order = "GPC" -magic_quotes_gpc = Off -magic_quotes_runtime = Off -magic_quotes_sybase = Off -include_path = ".:/usr/share/php/:/usr/share/php4/:/usr/share/php5/" -enable_dl = Off -file_uploads = On -upload_tmp_dir = "/tmp/" -upload_max_filesize = 32M -allow_url_fopen = Off -session.save_handler = files -session.save_path = "/tmp/" -session.use_cookies = 1 -session.name = PHPSESSID -session.auto_start = 0 -session.cookie_lifetime = 0 -session.cookie_path = / -session.cookie_domain = -session.serialize_handler = php -session.gc_probability = 1 -session.gc_divisor = 1000 -session.gc_maxlifetime = 1440 -session.bug_compat_42 = 0 -session.bug_compat_warn = 1 -session.referer_check = -session.entropy_length = 16 -session.entropy_file = /dev/urandom -session.cache_limiter = nocache -session.cache_expire = 180 -session.use_trans_sid = 0 diff --git a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/cron/etc_php_syscp-vhost_php.ini b/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/cron/etc_php_syscp-vhost_php.ini deleted file mode 100644 index 048c26c..0000000 --- a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/cron/etc_php_syscp-vhost_php.ini +++ /dev/null @@ -1,61 +0,0 @@ -short_open_tag = On -asp_tags = Off -precision = 14 -output_buffering = 4096 -allow_call_time_pass_reference = Off -safe_mode = Off -safe_mode_gid = Off -safe_mode_include_dir = "/usr/share/php/:/usr/share/php4/:/usr/share/php5/" -safe_mode_allowed_env_vars = PHP_ -safe_mode_protected_env_vars = LD_LIBRARY_PATH -open_basedir = "/var/www/syscp/:/var/www/syscp-suphp/syscp/:/var/www/syscpwebs/:/usr/share/php/:/usr/share/php4/:/usr/share/php5/" -disable_functions = exec,passthru,shell_exec,system,proc_close,proc_get_status,proc_nice,proc_open,proc_terminate -disable_classes = -expose_php = Off -max_execution_time = 30 -max_input_time = 60 -memory_limit = 16M -post_max_size = 12M -error_reporting = E_ALL & ~E_NOTICE -display_errors = Off -display_startup_errors = Off -log_errors = On -log_errors_max_len = 1024 -ignore_repeated_errors = Off -ignore_repeated_source = Off -report_memleaks = On -track_errors = Off -html_errors = Off -variables_order = "GPCS" -register_globals = Off -register_argc_argv = Off -gpc_order = "GPC" -magic_quotes_gpc = Off -magic_quotes_runtime = Off -magic_quotes_sybase = Off -include_path = ".:/usr/share/php/:/usr/share/php4/:/usr/share/php5/" -enable_dl = Off -file_uploads = On -upload_tmp_dir = "/var/www/syscp-suphp/syscp/" -upload_max_filesize = 32M -allow_url_fopen = Off -session.save_handler = files -session.save_path = "/var/www/syscp-suphp/syscp/" -session.use_cookies = 1 -session.name = PHPSESSID -session.auto_start = 0 -session.cookie_lifetime = 0 -session.cookie_path = / -session.cookie_domain = -session.serialize_handler = php -session.gc_probability = 1 -session.gc_divisor = 1000 -session.gc_maxlifetime = 1440 -session.bug_compat_42 = 0 -session.bug_compat_warn = 1 -session.referer_check = -session.entropy_length = 16 -session.entropy_file = /dev/urandom -session.cache_limiter = nocache -session.cache_expire = 180 -session.use_trans_sid = 0 diff --git a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/postfix/etc_postfix_main.cf b/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/postfix/etc_postfix_main.cf deleted file mode 100644 index 97b10e0..0000000 --- a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/postfix/etc_postfix_main.cf +++ /dev/null @@ -1,65 +0,0 @@ -# Postfix directories settings -command_directory = /usr/sbin -daemon_directory = /usr/lib/postfix -queue_directory = /var/spool/postfix -sample_directory = /etc/postfix -manpage_directory = /usr/share/man -readme_directory = /usr/share/doc/postfix-2.1.5-r2/readme -html_directory = no - -# Postfix programs paths settings -mailq_path = /usr/bin/mailq -newaliases_path = /usr/bin/newaliases -sendmail_path = /usr/sbin/sendmail - -# General Postfix configuration -myhostname = -mydestination = $myhostname, $mydomain, localhost.$myhostname, localhost.$mydomain, localhost -mynetworks = 127.0.0.0/8 -inet_interfaces = all -mail_owner = postfix -setgid_group = postdrop -smtpd_banner = $myhostname ESMTP Mailserver -smtpd_helo_required = yes -append_dot_mydomain = no -biff = no - -# Postfix Debugger configuration -debug_peer_level = 2 -debugger_command = - PATH=/bin:/usr/bin:/usr/local/bin; export PATH; (echo cont; - echo where) | gdb $daemon_directory/$process_name $process_id 2>&1 - >$config_directory/$process_name.$process_id.log & sleep 5 - -# Postfix performance settings -default_destination_concurrency_limit = 20 -local_destination_concurrency_limit = 2 - -# Virtual delivery settings -virtual_transport = virtual -virtual_mailbox_base = -virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf -virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf -virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf -virtual_uid_maps = static: -virtual_gid_maps = static: - -# Local delivery settings -local_transport = local -alias_database = hash:/etc/mail/aliases -alias_maps = $alias_database - -# SASL settings -smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination -smtpd_sasl_auth_enable = yes -smtpd_sasl_local_domain = $myhostname -smtpd_sasl_security_options = noanonymous -broken_sasl_auth_clients = yes - -# TLS settings -smtpd_use_tls = yes -smtpd_tls_cert_file = /etc/ssl/server/.crt -smtpd_tls_key_file = /etc/ssl/server/.key -smtpd_tls_auth_only = no -smtpd_tls_session_cache_timeout = 3600s -tls_random_source = dev:/dev/urandom diff --git a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/postfix/etc_postfix_mysql-virtual_alias_maps.cf b/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/postfix/etc_postfix_mysql-virtual_alias_maps.cf deleted file mode 100644 index c921e6f..0000000 --- a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/postfix/etc_postfix_mysql-virtual_alias_maps.cf +++ /dev/null @@ -1,8 +0,0 @@ -user = -password = -dbname = -table = mail_virtual -select_field = destination -where_field = email -additional_conditions = and destination <> '' and destination <> ' ' -hosts = diff --git a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf b/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf deleted file mode 100644 index 4484bee..0000000 --- a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf +++ /dev/null @@ -1,8 +0,0 @@ -user = -password = -dbname = -table = panel_domains -select_field = domain -where_field = domain -additional_conditions = and isemaildomain = '1' -hosts = diff --git a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf b/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf deleted file mode 100644 index 7e0f79a..0000000 --- a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf +++ /dev/null @@ -1,7 +0,0 @@ -user = -password = -dbname = -table = mail_users -select_field = maildir -where_field = email -hosts = diff --git a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/postfix/etc_sasl2_smtpd.conf b/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/postfix/etc_sasl2_smtpd.conf deleted file mode 100644 index 2089cbb..0000000 --- a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/postfix/etc_sasl2_smtpd.conf +++ /dev/null @@ -1,12 +0,0 @@ -pwcheck_method: auxprop -auxprop_plugin: sql -allowanonymouslogin: no -allowplaintext: yes -mech_list: PLAIN LOGIN -password_format: crypt -sql_engine: mysql -sql_hostnames: -sql_user: -sql_passwd: -sql_database: -sql_select: SELECT password_enc FROM mail_users where username='%u@%r' diff --git a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/proftpd/etc_proftpd_proftpd.conf b/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/proftpd/etc_proftpd_proftpd.conf deleted file mode 100644 index 1e04b6d..0000000 --- a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/proftpd/etc_proftpd_proftpd.conf +++ /dev/null @@ -1,89 +0,0 @@ -# Server settings -ServerName " FTP Server" -ServerType standalone -ServerIdent off -DefaultServer on -Port 21 -MaxInstances 50 - -# General settings -DeferWelcome on -MultilineRFC2228 on -ShowSymlinks on -AllowOverwrite on -AllowStoreRestart on -AllowRetrieveRestart on -UseReverseDNS off -IdentLookups off -ListOptions "-al" -DisplayFirstChdir .message - -# Modules settings -#DelayEngine off - -# Timeout settings -TimeoutLogin 120 -TimeoutNoTransfer 600 -TimeoutStalled 600 -TimeoutIdle 600 - -# Security settings -RootLogin off -RequireValidShell off -User syscpftpd -Group syscpftpd -Umask 133 022 -DefaultRoot ~ -DenyFilter \*.*/ - -# Per-Directory settings - -Umask 133 022 -AllowOverwrite on - - -# SQL settings -SQLAuthTypes Crypt -SQLAuthenticate users* groups* -SQLConnectInfo @ -SQLUserInfo ftp_users username password uid gid homedir shell -SQLGroupInfo ftp_groups groupname gid members -SQLUserWhereClause "login_enabled = 'y'" - -SQLLog PASS login -SQLNamedQuery login UPDATE "last_login=now(), login_count=login_count+1 WHERE username='%u'" ftp_users - -SQLLog RETR download -SQLNamedQuery download UPDATE "down_count=down_count+1, down_bytes=down_bytes+%b WHERE username='%u'" ftp_users - -SQLLog STOR upload -SQLNamedQuery upload UPDATE "up_count=up_count+1, up_bytes=up_bytes+%b WHERE username='%u'" ftp_users - -# TLS settings - -TLSEngine on -TLSLog /var/log/proftpd-tls.log -TLSProtocol SSLv23 -TLSTimeoutHandshake 120 -# Really important for WinClients -TLSOptions NoCertRequest -TLSRSACertificateFile /etc/ssl/server/.crt -TLSRSACertificateKeyFile /etc/ssl/server/.key -# Authenticate client that want to use FTP over TLS? -TLSVerifyClient off -# Uncomment the following line to force tls login -TLSRequired off - - -# LOG settings -# Logging Formats -LogFormat default "%h %1 %u %t \"%r\" %s %b" -LogFormat auth "%v [%P] %h %t \"%r\" %s" -LogFormat write "%h %l %u %t \"%r\" %s %b" -# Activate Logging -# all logins -ExtendedLog /var/log/proftpd-auth.log AUTH auth -# file/dir access -ExtendedLog /var/log/proftpd-access.log WRITE,READ write -# everything (be careful, generates_ very_ big logfiles) -#ExtendedLog /var/log/proftpd-all.log ALL default diff --git a/syscp/patches/gentoo-config-files/nodns-ssl/syscp-1.2.13-gentoo-admin_configfiles.php-nodns-ssl b/syscp/patches/gentoo-config-files/nodns-ssl/syscp-1.2.13-gentoo-admin_configfiles.php-nodns-ssl deleted file mode 100644 index 83565e4..0000000 --- a/syscp/patches/gentoo-config-files/nodns-ssl/syscp-1.2.13-gentoo-admin_configfiles.php-nodns-ssl +++ /dev/null @@ -1,270 +0,0 @@ - - * @copyright (C) 2003-2004 Florian Lippert - * @package Panel - * @version $Id: admin_configfiles.php,v 1.9 2005/06/15 13:53:58 flo Exp $ - * Modified to reflect the Gentoo environment by Luca Longinotti - */ - - define('AREA', 'admin'); - - /** - * Include our init.php, which manages Sessions, Language etc. - */ - require("./lib/init.php"); - - - $configfiles = Array - ( - 'gentoo' => Array - ( - 'label' => 'Gentoo', - 'daemons' => Array - ( - 'apache' => Array - ( - 'label' => 'Apache2 Webserver (HTTP)', - 'commands' => Array - ( - 'touch '.$settings['system']['apacheconf_directory'].'vhosts.d/99_syscp-vhosts.conf', - 'chown root:0 '.$settings['system']['apacheconf_directory'].'vhosts.d/99_syscp-vhosts.conf', - 'chmod 0600 '.$settings['system']['apacheconf_directory'].'vhosts.d/99_syscp-vhosts.conf', - 'echo "Include '.$settings['system']['apacheconf_directory'].'vhosts.d/99_syscp-vhosts.conf" >> /etc/apache2/httpd.conf', - 'mkdir -p '.$settings['system']['documentroot_prefix'], - 'mkdir -p '.$settings['system']['logfiles_directory'] - ), - 'restart' => Array - ( - 'rc-update add apache2 default', - '/etc/init.d/apache2 restart' - ) - ), - 'courier' => Array - ( - 'label' => 'Courier-IMAP (POP3/IMAP)', - 'files' => Array - ( - 'etc_courier_authlib_authdaemonrc' => '/etc/courier/authlib/authdaemonrc', - 'etc_courier_authlib_authmysqlrc' => '/etc/courier/authlib/authmysqlrc', - 'etc_courier-imap_pop3d' => '/etc/courier-imap/pop3d', - 'etc_courier-imap_imapd' => '/etc/courier-imap/imapd', - 'etc_courier-imap_pop3d-ssl' => '/etc/courier-imap/pop3d-ssl', - 'etc_courier-imap_imapd-ssl' => '/etc/courier-imap/imapd-ssl' - ), - 'commands' => Array - ( - 'rm /etc/courier/authlib/authdaemonrc', - 'rm /etc/courier/authlib/authmysqlrc', - 'rm /etc/courier-imap/pop3d', - 'rm /etc/courier-imap/imapd', - 'rm /etc/courier-imap/pop3d-ssl', - 'rm /etc/courier-imap/imapd-ssl', - 'touch /etc/courier/authlib/authdaemonrc', - 'touch /etc/courier/authlib/authmysqlrc', - 'touch /etc/courier-imap/pop3d', - 'touch /etc/courier-imap/imapd', - 'touch /etc/courier-imap/pop3d-ssl', - 'touch /etc/courier-imap/imapd-ssl', - 'chown root:0 /etc/courier/authlib/authdaemonrc', - 'chown root:0 /etc/courier/authlib/authmysqlrc', - 'chown root:0 /etc/courier-imap/pop3d', - 'chown root:0 /etc/courier-imap/imapd', - 'chown root:0 /etc/courier-imap/pop3d-ssl', - 'chown root:0 /etc/courier-imap/imapd-ssl', - 'chmod 0600 /etc/courier/authlib/authdaemonrc', - 'chmod 0600 /etc/courier/authlib/authmysqlrc', - 'chmod 0600 /etc/courier-imap/pop3d', - 'chmod 0600 /etc/courier-imap/imapd', - 'chmod 0600 /etc/courier-imap/pop3d-ssl', - 'chmod 0600 /etc/courier-imap/imapd-ssl' - ), - 'restart' => Array - ( - 'rc-update add courier-authlib default', - 'rc-update add courier-pop3d default', - 'rc-update add courier-imapd default', - 'rc-update add courier-pop3d-ssl default', - 'rc-update add courier-imapd-ssl default', - '/etc/init.d/courier-authlib restart', - '/etc/init.d/courier-pop3d restart', - '/etc/init.d/courier-imapd restart', - '/etc/init.d/courier-pop3d-ssl restart', - '/etc/init.d/courier-imapd-ssl restart' - ) - ), - 'postfix' => Array - ( - 'label' => 'Postfix (MTA)', - 'files' => Array - ( - 'etc_postfix_main.cf' => '/etc/postfix/main.cf', - 'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf', - 'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf', - 'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf', - 'etc_sasl2_smtpd.conf' => '/etc/sasl2/smtpd.conf' - ), - 'commands' => Array - ( - 'mkdir -p '.$settings['system']['vmail_homedir'], - 'chown -R vmail:vmail '.$settings['system']['vmail_homedir'], - 'chmod 0750 '.$settings['system']['vmail_homedir'], - 'rm /etc/postfix/main.cf', - 'touch /etc/postfix/main.cf', - 'touch /etc/postfix/master.cf', - 'touch /etc/postfix/mysql-virtual_alias_maps.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'touch /etc/sasl2/smtpd.conf', - 'chown root:0 /etc/postfix/main.cf', - 'chown root:0 /etc/postfix/master.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_alias_maps.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'chown root:0 /etc/sasl2/smtpd.conf', - 'chmod 0600 /etc/postfix/main.cf', - 'chmod 0600 /etc/postfix/master.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_alias_maps.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'chmod 0600 /etc/sasl2/smtpd.conf' - ), - 'restart' => Array - ( - 'rc-update add postfix default', - '/etc/init.d/postfix restart' - ) - ), - 'proftpd' => Array - ( - 'label' => 'ProFTPd (FTP)', - 'files' => Array - ( - 'etc_proftpd_proftpd.conf' => '/etc/proftpd/proftpd.conf' - ), - 'commands' => Array - ( - 'touch /etc/proftpd/proftpd.conf', - 'chown root:0 /etc/proftpd/proftpd.conf', - 'chmod 0600 /etc/proftpd/proftpd.conf' - ), - 'restart' => Array - ( - 'rc-update add proftpd default', - '/etc/init.d/proftpd restart' - ) - ), - 'cron' => Array - ( - 'label' => 'Crond (cronscript)', - 'files' => Array - ( - 'etc_php_syscp-cronjob_php.ini' => '/etc/php/syscp-cronjob/php.ini', - 'etc_cron.d_syscp' => '/etc/cron.d/syscp' - ), - 'commands' => Array - ( - 'touch /etc/cron.d/syscp', - 'chown root:0 /etc/cron.d/syscp', - 'chmod 0640 /etc/cron.d/syscp', - 'mkdir -p /etc/php/syscp-cronjob', - 'touch /etc/php/syscp-cronjob/php.ini', - 'chown -R root:0 /etc/php/syscp-cronjob', - 'chmod 0750 /etc/php/syscp-cronjob', - 'chmod 0640 /etc/php/syscp-cronjob/php.ini' - ), - 'restart' => Array - ( - 'rc-update add vixie-cron default', - '/etc/init.d/vixie-cron restart' - ) - ) - ) - ) - ); - - /*echo '
';
-	print_r($configfiles);
-	echo '
';*/ - - if( ($page == 'configfiles' || $page == 'overview') && $userinfo['change_serversettings'] == '1') - { - if(isset($_GET['distribution']) && $_GET['distribution']!='' && isset($configfiles[$_GET['distribution']]) && is_array($configfiles[$_GET['distribution']]) && - isset($_GET['daemon']) && $_GET['daemon']!='' && isset($configfiles[$_GET['distribution']]['daemons'][$_GET['daemon']]) && is_array($configfiles[$_GET['distribution']]['daemons'][$_GET['daemon']])) - { - $distribution = addslashes($_GET['distribution']); - $daemon = addslashes($_GET['daemon']); - - if(isset($configfiles[$distribution]['daemons'][$daemon]['commands']) && is_array($configfiles[$distribution]['daemons'][$daemon]['commands'])) - { - $commands = implode("\n", $configfiles[$distribution]['daemons'][$daemon]['commands']); - } - else - { - $commands = ''; - } - - $replace_arr = Array - ( - '' => $sql['user'], - '' => 'MYSQL_PASSWORD', - '' => $sql['db'], - '' => $sql['host'], - '' => $settings['system']['hostname'], - '' => $settings['system']['ipaddress'], - '' => $settings['system']['vmail_homedir'], - '' => $settings['system']['vmail_uid'], - '' => $settings['system']['vmail_gid'] - ); - $files = ''; - if(isset($configfiles[$distribution]['daemons'][$daemon]['files']) && is_array($configfiles[$distribution]['daemons'][$daemon]['files'])) - { - while(list($filename, $realname) = each($configfiles[$distribution]['daemons'][$daemon]['files'])) - { - $file_content = implode('', file('./templates/misc/configfiles/'.$distribution.'/'.$daemon.'/'.$filename)); - $file_content = strtr($file_content, $replace_arr); - $file_content = htmlspecialchars($file_content); - $numbrows = count(explode("\n", $file_content)); - eval("\$files.=\"".getTemplate("configfiles/configfiles_file")."\";"); - } - } - - if(isset($configfiles[$distribution]['daemons'][$daemon]['restart']) && is_array($configfiles[$distribution]['daemons'][$daemon]['restart'])) - { - $restart = implode("\n", $configfiles[$distribution]['daemons'][$daemon]['restart']); - } - else - { - $restart = ''; - } - - eval("echo \"".getTemplate("configfiles/configfiles")."\";"); - } - else - { - $distributions = ''; - while (list($distribution_name, $distribution_details) = each($configfiles)) - { - $daemons = ''; - while(list($daemon_name, $daemon_details) = each($distribution_details['daemons'])) - { - eval("\$daemons.=\"".getTemplate("configfiles/choose_daemon")."\";"); - } - eval("\$distributions.=\"".getTemplate("configfiles/choose_distribution")."\";"); - } - eval("echo \"".getTemplate("configfiles/choose")."\";"); - } - } - -?> diff --git a/syscp/patches/gentoo-config-files/nodns-ssl/syscp-1.2.13-gentoo-config-nodns-ssl-r2.tar.bz2 b/syscp/patches/gentoo-config-files/nodns-ssl/syscp-1.2.13-gentoo-config-nodns-ssl-r2.tar.bz2 deleted file mode 100644 index b81c77e..0000000 Binary files a/syscp/patches/gentoo-config-files/nodns-ssl/syscp-1.2.13-gentoo-config-nodns-ssl-r2.tar.bz2 and /dev/null differ diff --git a/syscp/patches/gentoo-config-files/nodns/etc_libnss-mysql-root.cfg b/syscp/patches/gentoo-config-files/nodns/etc_libnss-mysql-root.cfg deleted file mode 100644 index 6498977..0000000 --- a/syscp/patches/gentoo-config-files/nodns/etc_libnss-mysql-root.cfg +++ /dev/null @@ -1,2 +0,0 @@ -username -password diff --git a/syscp/patches/gentoo-config-files/nodns/etc_libnss-mysql.cfg b/syscp/patches/gentoo-config-files/nodns/etc_libnss-mysql.cfg deleted file mode 100644 index d284192..0000000 --- a/syscp/patches/gentoo-config-files/nodns/etc_libnss-mysql.cfg +++ /dev/null @@ -1,38 +0,0 @@ -getpwnam SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ - FROM ftp_users \ - WHERE username='%1$s' \ - LIMIT 1 -getpwuid SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ - FROM ftp_users \ - WHERE uid='%1$u' \ - LIMIT 1 -getspnam SELECT username,password,UNIX_TIMESTAMP()-10,'1','2','7','-1','-1','0' \ - FROM ftp_users \ - WHERE username='%1$s' \ - LIMIT 1 -getpwent SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ - FROM ftp_users -getspent SELECT username,password,UNIX_TIMESTAMP()-10,'1','2','7','-1','-1','0' \ - FROM ftp_users -getgrnam SELECT groupname,'x',gid \ - FROM ftp_groups \ - WHERE groupname='%1$s' \ - LIMIT 1 -getgrgid SELECT groupname,'x',gid \ - FROM ftp_groups \ - WHERE gid='%1$u' \ - LIMIT 1 -getgrent SELECT groupname,'x',gid \ - FROM ftp_groups -memsbygid SELECT username \ - FROM ftp_users \ - WHERE gid='%1$u' -gidsbymem SELECT gid \ - FROM ftp_users \ - WHERE username='%1$s' - -host -database -username -password -socket /var/run/mysqld/mysqld.sock diff --git a/syscp/patches/gentoo-config-files/nodns/gentoo/courier/etc_courier-imap_imapd b/syscp/patches/gentoo-config-files/nodns/gentoo/courier/etc_courier-imap_imapd deleted file mode 100644 index f594e41..0000000 --- a/syscp/patches/gentoo-config-files/nodns/gentoo/courier/etc_courier-imap_imapd +++ /dev/null @@ -1,376 +0,0 @@ -##VERSION: $Id: imapd.dist.in,v 1.32 2004/11/25 04:57:04 mrsam Exp $ -# -# imapd created from imapd.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# Copyright 1998 - 2004 Double Precision, Inc. See COPYING for -# distribution information. -# -# This configuration file sets various options for the Courier-IMAP server -# when used with the couriertcpd server. -# A lot of the stuff here is documented in the manual page for couriertcpd. -# -# NOTE - do not use \ to split long variable contents on multiple lines. -# This will break the default imapd.rc script, which parses this file. -# -##NAME: ADDRESS:0 -# -# Address to listen on, can be set to a single IP address. -# -# ADDRESS=127.0.0.1 - -ADDRESS=0 - -##NAME: PORT:1 -# -# Port numbers that connections are accepted on. The default is 143, -# the standard IMAP port. -# -# Multiple port numbers can be separated by commas. When multiple port -# numbers are used it is possible to select a specific IP address for a -# given port as "ip.port". For example, "127.0.0.1.900,192.68.0.1.900" -# accepts connections on port 900 on IP addresses 127.0.0.1 and 192.68.0.1 -# The previous ADDRESS setting is a default for ports that do not have -# a specified IP address. - -PORT=143 - -##NAME: AUTHSERVICE:0 -# -# It's possible to authenticate using a different 'service' parameter -# depending on the connection's port. This only works with authentication -# modules that use the 'service' parameter, such as PAM. Example: -# -# AUTHSERVICE143=imap -# AUTHSERVICE993=imaps - -##NAME: MAXDAEMONS:0 -# -# Maximum number of IMAP servers started -# - -MAXDAEMONS=50 - -##NAME: MAXPERIP:0 -# -# Maximum number of connections to accept from the same IP address - -MAXPERIP=10 - -##NAME: PIDFILE:0 -# -# File where couriertcpd will save its process ID -# - -PIDFILE=/var/run/imapd.pid - -##NAME: TCPDOPTS:0 -# -# Miscellaneous couriertcpd options that shouldn't be changed. -# - -TCPDOPTS="-nodnslookup -noidentlookup" - -##NAME: IMAP_CAPABILITY:1 -# -# IMAP_CAPABILITY specifies what most of the response should be to the -# CAPABILITY command. -# -# If you have properly configured Courier to use CRAM-MD5 or CRAM-SHA1 -# authentication (see INSTALL), set IMAP_CAPABILITY as follows: -# -# IMAP_CAPABILITY="IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 IDLE" -# - -IMAP_CAPABILITY="IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA IDLE" - -##NAME: KEYWORDS_CAPABILITY:0 -# -# IMAP_KEYWORDS=1 enables custom IMAP keywords. Set this option to 0 to -# disable custom keywords. - -IMAP_KEYWORDS=1 - -##NAME: SMAP1_CAPABILITY:0 -# -# EXPERIMENTAL -# -# To enable the experimental "Simple Mail Access Protocol" extensions, -# uncomment the following setting. -# -# SMAP_CAPABILITY=SMAP1 - -##NAME: IMAP_CAPABILITY_ORIG:1 -# -# For use by webadmin - -IMAP_CAPABILITY_ORIG="IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 IDLE" - -##NAME: IMAP_PROXY:0 -# -# Enable proxying. See README.proxy - -IMAP_PROXY=0 - -##NAME: IMAP_PROXY_FOREIGN:0 -# -# Proxying to non-Courier servers. Re-sends the CAPABILITY command after -# logging in to the remote server. May not work with all IMAP clients. - -IMAP_PROXY_FOREIGN=0 - -##NAME: IMAP_IDLE_TIMEOUT:0 -# -# This setting controls how often -# the server polls for changes to the folder, in IDLE mode (in seconds). - -IMAP_IDLE_TIMEOUT=60 - -##NAME: IMAP_CAPABILITY_TLS:0 -# -# The following setting will advertise SASL PLAIN authentication after -# STARTTLS is established. If you want to allow SASL PLAIN authentication -# with or without TLS then just comment this out, and add AUTH=PLAIN to -# IMAP_CAPABILITY - -IMAP_CAPABILITY_TLS="$IMAP_CAPABILITY AUTH=PLAIN" - -##NAME: IMAP_TLS_ORIG:0 -# -# For use by webadmin - -IMAP_CAPABILITY_TLS_ORIG="$IMAP_CAPABILITY_ORIG AUTH=PLAIN" - -##NAME: IMAP_DISABLETHREADSORT:0 -# -# Set IMAP_DISABLETHREADSORT to disable the THREAD and SORT commands - -# server side sorting and threading. -# -# Those capabilities will still be advertised, but the server will reject -# them. Set this option if you want to disable all the extra load from -# server-side threading and sorting. Not advertising those capabilities -# will simply result in the clients reading the entire folder, and sorting -# it on the client side. That will still put some load on the server. -# advertising these capabilities, but rejecting the commands, will stop this -# silliness. -# - -IMAP_DISABLETHREADSORT=0 - -##NAME: IMAP_CHECK_ALL_FOLDERS:0 -# -# Set IMAP_CHECK_ALL_FOLDERS to 1 if you want the server to check for new -# mail in every folder. Not all IMAP clients use the IMAP's new mail -# indicator, but some do. Normally new mail is checked only in INBOX, -# because it is a comparatively time consuming operation, and it would be -# a complete waste of time unless mail filters are used to deliver -# mail directly to folders. -# -# When IMAP clients are used which support new mail indication, and when -# mail filters are used to sort incoming mail into folders, setting -# IMAP_CHECK_ALL_FOLDERS to 1 will allow IMAP clients to announce new -# mail in folders. Note that this will result in slightly more load on the -# server. -# - -IMAP_CHECK_ALL_FOLDERS=0 - -##NAME: IMAP_OBSOLETE_CLIENT:0 -# -# Set IMAP_OBSOLETE_CLIENT if your IMAP client expects \\NoInferiors to mean -# what \\HasNoChildren really means. - -IMAP_OBSOLETE_CLIENT=0 - -##NAME: IMAP_UMASK:0 -# -# IMAP_UMASK sets the umask of the server process. The value of IMAP_UMASK is -# simply passed to the "umask" command. The default value is 022. -# -# This feature is mostly useful for shared folders, where the file permissions -# of the messages may be important. - -IMAP_UMASK=027 - -##NAME: IMAP_ULIMITD:0 -# -# IMAP_ULIMITD sets the maximum size of the data segment of the server -# process. The value of IMAP_ULIMITD is simply passed to the "ulimit -d" -# command (or ulimit -v). The argument to ulimi sets the upper limit on the -# size of the data segment of the server process, in kilobytes. The default -# value of 65536 sets a very generous limit of 64 megabytes, which should -# be more than plenty for anyone. -# -# This feature is used as an additional safety check that should stop -# any potential denial-of-service attacks that exploit any kind of -# a memory leak to exhaust all the available memory on the server. -# It is theoretically possible that obscenely huge folders will also -# result in the server running out of memory when doing server-side -# sorting (by my calculations you have to have at least 100,000 messages -# in a single folder, for that to happen). - -IMAP_ULIMITD=65536 - -##NAME: IMAP_USELOCKS:0 -# -# Setting IMAP_USELOCKS to 1 will use dot-locking to support concurrent -# multiple access to the same folder. This incurs slight additional -# overhead. Concurrent multiple access will still work without this setting, -# however occasionally a minor race condition may result in an IMAP client -# downloading the same message twice, or a keyword update will fail. -# -# IMAP_USELOCKS=1 is strongly recommended when shared folders are used. - -IMAP_USELOCKS=1 - -##NAME: IMAP_SHAREDINDEXFILE:0 -# -# The index of all accessible folders. Do not change this setting unless -# you know what you're doing. See README.sharedfolders for additional -# information. - -IMAP_SHAREDINDEXFILE=/etc/courier-imap/shared/index - -##NAME: IMAP_ENHANCEDIDLE:0 -# -# If Courier was compiled with the File Alteration Monitor, setting -# IMAP_ENHANCEDIDLE to 1 enables enhanced IDLE mode, where multiple -# clients may open the same folder concurrently, and receive updates to -# folder contents in realtime. See the imapd(8) man page for additional -# information. -# -# IMPORTANT: IMAP_USELOCKS *MUST* also be set to 1, and IDLE must be included -# in the IMAP_CAPABILITY list. -# - -IMAP_ENHANCEDIDLE=0 - -##NAME: IMAP_TRASHFOLDERNAME:0 -# -# The name of the magic trash Folder. For MSOE compatibility, -# you can set IMAP_TRASHFOLDERNAME="Deleted Items". -# -# IMPORTANT: If you change this, you must also change IMAP_EMPTYTRASH - -IMAP_TRASHFOLDERNAME=Trash - -##NAME: IMAP_EMPTYTRASH:0 -# -# The following setting is optional, and causes messages from the given -# folder to be automatically deleted after the given number of days. -# IMAP_EMPTYTRASH is a comma-separated list of folder:days. The default -# setting, below, purges 7 day old messages from the Trash folder. -# Another useful setting would be: -# -# IMAP_EMPTYTRASH=Trash:7,Sent:30 -# -# This would also delete messages from the Sent folder (presumably copies -# of sent mail) after 30 days. This is a global setting that is applied to -# every mail account, and is probably useful in a controlled, corporate -# environment. -# -# Important: the purging is controlled by CTIME, not MTIME (the file time -# as shown by ls). It is perfectly ordinary to see stuff in Trash that's -# a year old. That's the file modification time, MTIME, that's displayed. -# This is generally when the message was originally delivered to this -# mailbox. Purging is controlled by a different timestamp, CTIME, which is -# changed when the file is moved to the Trash folder (and at other times too). -# -# You might want to disable this setting in certain situations - it results -# in a stat() of every file in each folder, at login and logout. -# - -IMAP_EMPTYTRASH=Trash:7 - -##NAME: IMAP_MOVE_EXPUNGE_TO_TRASH:0 -# -# Set IMAP_MOVE_EXPUNGE_TO_TRASH to move expunged messages to Trash. This -# effectively allows an undo of message deletion by fishing the deleted -# mail from trash. Trash can be manually expunged as usually, and mail -# will get automatically expunged from Trash according to IMAP_EMPTYTRASH. -# -# NOTE: shared folders are still expunged as usual. Shared folders are -# not affected. -# - -IMAP_MOVE_EXPUNGE_TO_TRASH=0 - - -##NAME: OUTBOX:0 -# -# The next set of options deal with the "Outbox" enhancement. -# Uncomment the following setting to create a special folder, named -# INBOX.Outbox -# -# OUTBOX=.Outbox - -##NAME: SENDMAIL:0 -# -# If OUTBOX is defined, mail can be sent via the IMAP connection by copying -# a message to the INBOX.Outbox folder. For all practical matters, -# INBOX.Outbox looks and behaves just like any other IMAP folder. If this -# folder doesn't exist it must be created by the IMAP mail client, just -# like any other IMAP folder. The kicker: any message copied or moved to -# this folder is will be E-mailed by the Courier-IMAP server, by running -# the SENDMAIL program. Therefore, messages copied or moved to this -# folder must be well-formed RFC-2822 messages, with the recipient list -# specified in the To:, Cc:, and Bcc: headers. Courier-IMAP relies on -# SENDMAIL to read the recipient list from these headers (and delete the Bcc: -# header) by running the command "$SENDMAIL -oi -t -f $SENDER", with the -# message piped on standard input. $SENDER will be the return address -# of the message, which is set by the authentication module. -# -# DO NOT MODIFY SENDMAIL, below, unless you know what you're doing. -# - -SENDMAIL=/usr/sbin/sendmail - -##NAME: HEADERFROM:0 -# -# For administrative and oversight purposes, the return address, $SENDER -# will also be saved in the X-IMAP-Sender mail header. This header gets -# added to the sent E-mail (but it doesn't get saved in the copy of the -# message that's saved in the folder) -# -# WARNING - By enabling OUTBOX above, *every* IMAP mail client will receive -# the magic OUTBOX treatment. Therefore advance LARTing is in order for -# _all_ of your lusers, until every one of them is aware of this. Otherwise if -# OUTBOX is left at its default setting - a folder name that might be used -# accidentally - some people may be in for a rude surprise. You can redefine -# the name of the magic folder by changing OUTBOX, above. You should do that -# and pick a less-obvious name. Perhaps brand it with your organizational -# name ( OUTBOX=.WidgetsAndSonsOutbox ) - -HEADERFROM=X-IMAP-Sender - -##NAME: IMAPDSTART:0 -# -# IMAPDSTART is not used directly. Rather, this is a convenient flag to -# be read by your system startup script in /etc/rc.d, like this: -# -# . /etc/courier-imap/imapd -# -# case x$IMAPDSTART in -# x[yY]*) -# /usr/lib/courier-imap/imapd.rc start -# ;; -# esac -# -# The default setting is going to be NO, so you'll have to manually flip -# it to yes. - -IMAPDSTART=YES - -##NAME: MAILDIRPATH:0 -# -# MAILDIRPATH - directory name of the maildir directory. -# -MAILDIRPATH=Maildir - -#Hardwire a value for ${MAILDIR} -MAILDIR=.maildir -MAILDIRPATH=.maildir -#Put any program for ${PRERUN} here -PRERUN= diff --git a/syscp/patches/gentoo-config-files/nodns/gentoo/courier/etc_courier-imap_imapd-ssl b/syscp/patches/gentoo-config-files/nodns/gentoo/courier/etc_courier-imap_imapd-ssl deleted file mode 100644 index 76dbcf7..0000000 --- a/syscp/patches/gentoo-config-files/nodns/gentoo/courier/etc_courier-imap_imapd-ssl +++ /dev/null @@ -1,199 +0,0 @@ -##VERSION: $Id: imapd-ssl.dist.in,v 1.11 2004/10/21 00:45:35 mrsam Exp $ -# -# imapd-ssl created from imapd-ssl.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# Copyright 2000 - 2004 Double Precision, Inc. See COPYING for -# distribution information. -# -# This configuration file sets various options for the Courier-IMAP server -# when used to handle SSL IMAP connections. -# -# SSL and non-SSL connections are handled by a dedicated instance of the -# couriertcpd daemon. If you are accepting both SSL and non-SSL IMAP -# connections, you will start two instances of couriertcpd, one on the -# IMAP port 143, and another one on the IMAP-SSL port 993. -# -# Download OpenSSL from http://www.openssl.org/ -# -##NAME: SSLPORT:1 -# -# Options in the imapd-ssl configuration file AUGMENT the options in the -# imapd configuration file. First the imapd configuration file is read, -# then the imapd-ssl configuration file, so we do not have to redefine -# anything. -# -# However, some things do have to be redefined. The port number is -# specified by SSLPORT, instead of PORT. The default port is port 993. -# -# Multiple port numbers can be separated by commas. When multiple port -# numbers are used it is possibly to select a specific IP address for a -# given port as "ip.port". For example, "127.0.0.1.900,192.68.0.1.900" -# accepts connections on port 900 on IP addresses 127.0.0.1 and 192.68.0.1 -# The SSLADDRESS setting is a default for ports that do not have -# a specified IP address. - -SSLPORT=993 - -##NAME: SSLADDRESS:0 -# -# Address to listen on, can be set to a single IP address. -# -# SSLADDRESS=127.0.0.1 - -SSLADDRESS=0 - -##NAME: SSLPIDFILE:0 -# -# That's the SSL IMAP port we'll listen on. -# Feel free to redefine MAXDAEMONS, TCPDOPTS, and MAXPERIP. - -SSLPIDFILE=/var/run/imapd-ssl.pid - -##NAME: IMAPDSSLSTART:0 -# -# Different pid files, so that both instances of couriertcpd can coexist -# happily. -# -# You can also redefine IMAP_CAPABILITY, although I can't -# think of why you'd want to do that. -# -# -# Ok, the following settings are new to imapd-ssl: -# -# Whether or not to start IMAP over SSL on simap port: - -IMAPDSSLSTART=YES - -##NAME: IMAPDSTARTTLS:0 -# -# Whether or not to implement IMAP STARTTLS extension instead: - -IMAPDSTARTTLS=YES - -##NAME: IMAP_TLS_REQUIRED:1 -# -# Set IMAP_TLS_REQUIRED to 1 if you REQUIRE STARTTLS for everyone. -# (this option advertises the LOGINDISABLED IMAP capability, until STARTTLS -# is issued). - -IMAP_TLS_REQUIRED=0 - -######################################################################### -# -# The following variables configure IMAP over SSL. If OpenSSL is available -# during configuration, the couriertls helper gets compiled, and upon -# installation a dummy TLS_CERTFILE gets generated. courieresmtpd will -# automatically advertise the ESMTP STARTTLS extension if both TLS_CERTFILE -# and COURIERTLS exist. -# -# WARNING: Peer certificate verification has NOT yet been tested. Proceed -# at your own risk. Only the basic SSL/TLS functionality is known to be -# working. Keep this in mind as you play with the following variables. -# -##NAME: COURIERTLS:0 -# - -COURIERTLS=/usr/sbin/couriertls - -##NAME: TLS_PROTOCOL:0 -# -# TLS_PROTOCOL sets the protocol version. The possible versions are: -# -# SSL2 - SSLv2 -# SSL3 - SSLv3 -# TLS1 - TLS1 - -TLS_PROTOCOL=SSL3 - -##NAME: TLS_STARTTLS_PROTOCOL:0 -# -# TLS_STARTTLS_PROTOCOL is used instead of TLS_PROTOCOL for the IMAP STARTTLS -# extension, as opposed to IMAP over SSL on port 993. -# - -TLS_STARTTLS_PROTOCOL=TLS1 - -##NAME: TLS_CIPHER_LIST:0 -# -# TLS_CIPHER_LIST optionally sets the list of ciphers to be used by the -# OpenSSL library. In most situations you can leave TLS_CIPHER_LIST -# undefined -# -# TLS_CIPHER_LIST="ALL:!ADH:RC4+RSA:+SSLv2:@STRENGTH" - -##NAME: TLS_TIMEOUT:0 -# TLS_TIMEOUT is currently not implemented, and reserved for future use. -# This is supposed to be an inactivity timeout, but its not yet implemented. -# - -##NAME: TLS_DHCERTFILE:0 -# -# TLS_DHCERTFILE - PEM file that stores our Diffie-Hellman cipher pair. -# When OpenSSL is compiled to use Diffie-Hellman ciphers instead of RSA -# you must generate a DH pair that will be used. In most situations the -# DH pair is to be treated as confidential, and the file specified by -# TLS_DHCERTFILE must not be world-readable. -# -# TLS_DHCERTFILE= - -##NAME: TLS_CERTFILE:0 -# -# TLS_CERTFILE - certificate to use. TLS_CERTFILE is required for SSL/TLS -# servers, and is optional for SSL/TLS clients. TLS_CERTFILE is usually -# treated as confidential, and must not be world-readable. -# -TLS_CERTFILE=/etc/ssl/server/.crt_and_key - -##NAME: TLS_TRUSTCERTS:0 -# -# TLS_TRUSTCERTS=pathname - load trusted certificates from pathname. -# pathname can be a file or a directory. If a file, the file should -# contain a list of trusted certificates, in PEM format. If a -# directory, the directory should contain the trusted certificates, -# in PEM format, one per file and hashed using OpenSSL's c_rehash -# script. TLS_TRUSTCERTS is used by SSL/TLS clients (by specifying -# the -domain option) and by SSL/TLS servers (TLS_VERIFYPEER is set -# to PEER or REQUIREPEER). -# -# -# TLS_TRUSTCERTS= - -##NAME: TLS_VERIFYPEER:0 -# -# TLS_VERIFYPEER - how to verify client certificates. The possible values of -# this setting are: -# -# NONE - do not verify anything -# -# PEER - verify the client certificate, if one's presented -# -# REQUIREPEER - require a client certificate, fail if one's not presented -# -# -TLS_VERIFYPEER=NONE - -##NAME: TLS_CACHE:0 -# -# A TLS/SSL session cache may slightly improve response for IMAP clients -# that open multiple SSL sessions to the server. TLS_CACHEFILE will be -# automatically created, TLS_CACHESIZE bytes long, and used as a cache -# buffer. -# -# This is an experimental feature and should be disabled if it causes -# problems with SSL clients. Disable SSL caching by commenting out the -# following settings: - -TLS_CACHEFILE=/var/lib/courier-imap/couriersslcache -TLS_CACHESIZE=524288 - -##NAME: MAILDIRPATH:0 -# -# MAILDIRPATH - directory name of the maildir directory. -# -MAILDIRPATH=Maildir - -#Hardwire a value for ${MAILDIR} -MAILDIRPATH=.maildir diff --git a/syscp/patches/gentoo-config-files/nodns/gentoo/courier/etc_courier-imap_pop3d b/syscp/patches/gentoo-config-files/nodns/gentoo/courier/etc_courier-imap_pop3d deleted file mode 100644 index 71502ae..0000000 --- a/syscp/patches/gentoo-config-files/nodns/gentoo/courier/etc_courier-imap_pop3d +++ /dev/null @@ -1,127 +0,0 @@ -##VERSION: $Id: pop3d.dist.in,v 1.11 2004/10/30 15:39:38 mrsam Exp $ -# -# pop3d created from pop3d.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# Copyright 1998 - 2004 Double Precision, Inc. See COPYING for -# distribution information. -# -# Courier POP3 daemon configuration -# -##NAME: PIDFILE:0 -# - -PIDFILE=/var/run/pop3d.pid - -##NAME: MAXDAEMONS:0 -# -# Maximum number of POP3 servers started -# - -MAXDAEMONS=50 - -##NAME: MAXPERIP:4 -# -# Maximum number of connections to accept from the same IP address - -MAXPERIP=5 - -##NAME: POP3AUTH:1 -# -# To advertise the SASL capability, per RFC 2449, uncomment the POP3AUTH -# variable: -# -# POP3AUTH="LOGIN" -# -# If you have configured the CRAM-MD5 or CRAM-SHA1, set POP3AUTH to something -# like this: -# -# POP3AUTH="LOGIN CRAM-MD5 CRAM-SHA1" - -POP3AUTH="" - -##NAME: POP3AUTH_ORIG:0 -# -# For use by webadmin - -POP3AUTH_ORIG="LOGIN CRAM-MD5 CRAM-SHA1" - -##NAME: POP3AUTH_TLS:1 -# -# To also advertise SASL PLAIN if SSL is enabled, uncomment the -# POP3AUTH_TLS environment variable: -# -# POP3AUTH_TLS="LOGIN PLAIN" - -POP3AUTH_TLS="" - -##NAME: POP3AUTH_TLS_ORIG:0 -# -# For use by webadmin - -POP3AUTH_TLS_ORIG="LOGIN PLAIN" - -##NAME: POP3_PROXY:0 -# -# Enable proxying. See README.proxy - -POP3_PROXY=0 - -##NAME: PORT:1 -# -# Port to listen on for connections. The default is port 110. -# -# Multiple port numbers can be separated by commas. When multiple port -# numbers are used it is possibly to select a specific IP address for a -# given port as "ip.port". For example, "127.0.0.1.900,192.68.0.1.900" -# accepts connections on port 900 on IP addresses 127.0.0.1 and 192.68.0.1 -# The ADDRESS setting is a default for ports that do not have a specified -# IP address. - -PORT=110 - -##NAME: ADDRESS:0 -# -# IP address to listen on. 0 means all IP addresses. - -ADDRESS=0 - -##NAME: TCPDOPTS:0 -# -# Other couriertcpd(1) options. The following defaults should be fine. -# - -TCPDOPTS="-nodnslookup -noidentlookup" - -##NAME: POP3DSTART:0 -# -# POP3DSTART is not referenced anywhere in the standard Courier programs -# or scripts. Rather, this is a convenient flag to be read by your system -# startup script in /etc/rc.d, like this: -# -# . /etc/courier-imap/pop3d -# case x$POP3DSTART in -# x[yY]*) -# /usr/lib/courier-imap/pop3d.rc start -# ;; -# esac -# -# The default setting is going to be NO, until Courier is shipped by default -# with enough platforms so that people get annoyed with having to flip it to -# YES every time. - -POP3DSTART=YES - -##NAME: MAILDIRPATH:0 -# -# MAILDIRPATH - directory name of the maildir directory. -# -MAILDIRPATH=Maildir - -#Hardwire a value for ${MAILDIR} -MAILDIR=.maildir -MAILDIRPATH=.maildir -#Put any program for ${PRERUN} here -PRERUN= diff --git a/syscp/patches/gentoo-config-files/nodns/gentoo/courier/etc_courier-imap_pop3d-ssl b/syscp/patches/gentoo-config-files/nodns/gentoo/courier/etc_courier-imap_pop3d-ssl deleted file mode 100644 index a0267a0..0000000 --- a/syscp/patches/gentoo-config-files/nodns/gentoo/courier/etc_courier-imap_pop3d-ssl +++ /dev/null @@ -1,186 +0,0 @@ -##VERSION: $Id: pop3d-ssl.dist.in,v 1.12 2004/10/21 00:45:35 mrsam Exp $ -# -# pop3d-ssl created from pop3d-ssl.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# Copyright 2000-2004 Double Precision, Inc. See COPYING for -# distribution information. -# -# This configuration file sets various options for the Courier-IMAP server -# when used to handle SSL POP3 connections. -# -# SSL and non-SSL connections are handled by a dedicated instance of the -# couriertcpd daemon. If you are accepting both SSL and non-SSL POP3 -# connections, you will start two instances of couriertcpd, one on the -# POP3 port 110, and another one on the POP3-SSL port 995. -# -# Download OpenSSL from http://www.openssl.org/ -# -##NAME: SSLPORT:0 -# -# Options in the pop3d-ssl configuration file AUGMENT the options in the -# pop3d configuration file. First the pop3d configuration file is read, -# then the pop3d-ssl configuration file, so we do not have to redefine -# anything. -# -# However, some things do have to be redefined. The port number is -# specified by SSLPORT, instead of PORT. The default port is port 995. -# -# Multiple port numbers can be separated by commas. When multiple port -# numbers are used it is possibly to select a specific IP address for a -# given port as "ip.port". For example, "127.0.0.1.900,192.68.0.1.900" -# accepts connections on port 900 on IP addresses 127.0.0.1 and 192.68.0.1 -# The SSLADDRESS setting is a default for ports that do not have -# a specified IP address. - -SSLPORT=995 - -##NAME: SSLADDRESS:0 -# -# Address to listen on, can be set to a single IP address. -# -# SSLADDRESS=127.0.0.1 - -SSLADDRESS=0 - -##NAME: SSLPIDFILE:0 -# -# -# - -SSLPIDFILE=/var/run/pop3d-ssl.pid - -##NAME: POP3DSSLSTART:0 -# -# Whether or not to start POP3 over SSL on spop3 port: - -POP3DSSLSTART=YES - -##NAME: POP3_STARTTLS:0 -# -# Whether or not to implement the POP3 STLS extension: - -POP3_STARTTLS=YES - -##NAME: POP3_TLS_REQUIRED:1 -# -# Set POP3_TLS_REQUIRED to 1 if you REQUIRE STARTTLS for everyone. -# (this option advertises the LOGINDISABLED POP3 capability, until STARTTLS -# is issued). - -POP3_TLS_REQUIRED=0 - -##NAME: COURIERTLS:0 -# -# The following variables configure POP3 over SSL. If OpenSSL is available -# during configuration, the couriertls helper gets compiled, and upon -# installation a dummy TLS_CERTFILE gets generated. courieresmtpd will -# automatically advertise the ESMTP STARTTLS extension if both TLS_CERTFILE -# and COURIERTLS exist. -# -# WARNING: Peer certificate verification has NOT yet been tested. Proceed -# at your own risk. Only the basic SSL/TLS functionality is known to be -# working. Keep this in mind as you play with the following variables. - -COURIERTLS=/usr/sbin/couriertls - -##NAME: TLS_PROTOCOL:0 -# -# TLS_PROTOCOL sets the protocol version. The possible versions are: -# -# SSL2 - SSLv2 -# SSL3 - SSLv3 -# TLS1 - TLS1 - -TLS_PROTOCOL=SSL3 - -##NAME: TLS_STARTTLS_PROTOCOL:0 -# -# TLS_STARTTLS_PROTOCOL is used instead of TLS_PROTOCOL for the POP3 STARTTLS -# extension, as opposed to POP3 over SSL on port 995. -# - -TLS_STARTTLS_PROTOCOL=TLS1 - -##NAME: TLS_CIPHER_LIST:0 -# -# TLS_CIPHER_LIST optionally sets the list of ciphers to be used by the -# OpenSSL library. In most situations you can leave TLS_CIPHER_LIST -# undefined -# -# TLS_CIPHER_LIST="ALL:!ADH:RC4+RSA:+SSLv2:@STRENGTH" - -##NAME: TLS_TIMEOUT:0 -# TLS_TIMEOUT is currently not implemented, and reserved for future use. -# This is supposed to be an inactivity timeout, but its not yet implemented. -# - -##NAME: TLS_DHCERTFILE:0 -# -# TLS_DHCERTFILE - PEM file that stores our Diffie-Hellman cipher pair. -# When OpenSSL is compiled to use Diffie-Hellman ciphers instead of RSA -# you must generate a DH pair that will be used. In most situations the -# DH pair is to be treated as confidential, and the file specified by -# TLS_DHCERTFILE must not be world-readable. -# -# TLS_DHCERTFILE= - -##NAME: TLS_CERTFILE:0 -# -# TLS_CERTFILE - certificate to use. TLS_CERTFILE is required for SSL/TLS -# servers, and is optional for SSL/TLS clients. TLS_CERTFILE is usually -# treated as confidential, and must not be world-readable. -# -TLS_CERTFILE=/etc/ssl/server/.crt_and_key - -##NAME: TLS_TRUSTCERTS:0 -# -# TLS_TRUSTCERTS=pathname - load trusted certificates from pathname. -# pathname can be a file or a directory. If a file, the file should -# contain a list of trusted certificates, in PEM format. If a -# directory, the directory should contain the trusted certificates, -# in PEM format, one per file and hashed using OpenSSL's c_rehash -# script. TLS_TRUSTCERTS is used by SSL/TLS clients (by specifying -# the -domain option) and by SSL/TLS servers (TLS_VERIFYPEER is set -# to PEER or REQUIREPEER). -# -# -# TLS_TRUSTCERTS= - -##NAME: TLS_VERIFYPEER:0 -# -# TLS_VERIFYPEER - how to verify client certificates. The possible values of -# this setting are: -# -# NONE - do not verify anything -# -# PEER - verify the client certificate, if one's presented -# -# REQUIREPEER - require a client certificate, fail if one's not presented -# -# -TLS_VERIFYPEER=NONE - -##NAME: TLS_CACHE:0 -# -# A TLS/SSL session cache may slightly improve response for long-running -# POP3 clients. TLS_CACHEFILE will be automatically created, TLS_CACHESIZE -# bytes long, and used as a cache buffer. -# -# This is an experimental feature and should be disabled if it causes -# problems with SSL clients. Disable SSL caching by commenting out the -# following settings: - -TLS_CACHEFILE=/var/lib/courier-imap/couriersslcache -TLS_CACHESIZE=524288 - -##NAME: MAILDIRPATH:0 -# -# MAILDIRPATH - directory name of the maildir directory. -# -MAILDIRPATH=Maildir - -#Hardwire a value for ${MAILDIR} -MAILDIRPATH=.maildir diff --git a/syscp/patches/gentoo-config-files/nodns/gentoo/courier/etc_courier_authlib_authdaemonrc b/syscp/patches/gentoo-config-files/nodns/gentoo/courier/etc_courier_authlib_authdaemonrc deleted file mode 100644 index 867a12d..0000000 --- a/syscp/patches/gentoo-config-files/nodns/gentoo/courier/etc_courier_authlib_authdaemonrc +++ /dev/null @@ -1,93 +0,0 @@ -##VERSION: $Id: authdaemonrc.in,v 1.12 2005/07/05 12:25:08 mrsam Exp $ -# -# Copyright 2000-2005 Double Precision, Inc. See COPYING for -# distribution information. -# -# authdaemonrc created from authdaemonrc.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# This file configures authdaemond, the resident authentication daemon. -# -# Comments in this file are ignored. Although this file is intended to -# be sourced as a shell script, authdaemond parses it manually, so -# the acceptable syntax is a bit limited. Multiline variable contents, -# with the \ continuation character, are not allowed. Everything must -# fit on one line. Do not use any additional whitespace for indentation, -# or anything else. - -##NAME: authmodulelist:2 -# -# The authentication modules that are linked into authdaemond. The -# default list is installed. You may selectively disable modules simply -# by removing them from the following list. The available modules you -# can use are: authuserdb authpam authshadow authmysql authcustom authpipe - -authmodulelist="authmysql" - -##NAME: authmodulelistorig:3 -# -# This setting is used by Courier's webadmin module, and should be left -# alone - -authmodulelistorig="authuserdb authpam authshadow authmysql authcustom authpipe" - -##NAME: daemons:0 -# -# The number of daemon processes that are started. authdaemon is typically -# installed where authentication modules are relatively expensive: such -# as authldap, or authmysql, so it's better to have a number of them running. -# PLEASE NOTE: Some platforms may experience a problem if there's more than -# one daemon. Specifically, SystemV derived platforms that use TLI with -# socket emulation. I'm suspicious of TLI's ability to handle multiple -# processes accepting connections on the same filesystem domain socket. -# -# You may need to increase daemons if as your system load increases. Symptoms -# include sporadic authentication failures. If you start getting -# authentication failures, increase daemons. However, the default of 5 -# SHOULD be sufficient. Bumping up daemon count is only a short-term -# solution. The permanent solution is to add more resources: RAM, faster -# disks, faster CPUs... - -daemons=5 - -##NAME: authdaemonvar:2 -# -# authdaemonvar is here, but is not used directly by authdaemond. It's -# used by various configuration and build scripts, so don't touch it! - -authdaemonvar=/var/lib/courier/authdaemon - -##NAME: DEBUG_LOGIN:0 -# -# Dump additional diagnostics to syslog -# -# DEBUG_LOGIN=0 - turn off debugging -# DEBUG_LOGIN=1 - turn on debugging -# DEBUG_LOGIN=2 - turn on debugging + log passwords too -# -# ** YES ** - DEBUG_LOGIN=2 places passwords into syslog. -# -# Note that most information is sent to syslog at level 'debug', so -# you may need to modify your /etc/syslog.conf to be able to see it. - -DEBUG_LOGIN=0 - -##NAME: DEFAULTOPTIONS:0 -# -# A comma-separated list of option=value pairs. Each option is applied -# to an account if the account does not have its own specific value for -# that option. So for example, you can set -# DEFAULTOPTIONS="disablewebmail=1,disableimap=1" -# and then enable webmail and/or imap on individual accounts by setting -# disablewebmail=0 and/or disableimap=0 on the account. - -DEFAULTOPTIONS="" - -##NAME: LOGGEROPTS:0 -# -# courierlogger(1) options, e.g. to set syslog facility -# - -LOGGEROPTS="" diff --git a/syscp/patches/gentoo-config-files/nodns/gentoo/courier/etc_courier_authlib_authmysqlrc b/syscp/patches/gentoo-config-files/nodns/gentoo/courier/etc_courier_authlib_authmysqlrc deleted file mode 100644 index fec6508..0000000 --- a/syscp/patches/gentoo-config-files/nodns/gentoo/courier/etc_courier_authlib_authmysqlrc +++ /dev/null @@ -1,12 +0,0 @@ -MYSQL_SERVER -MYSQL_USERNAME -MYSQL_PASSWORD -MYSQL_PORT 0 -MYSQL_DATABASE -MYSQL_USER_TABLE mail_users -MYSQL_CRYPT_PWFIELD password_enc -MYSQL_UID_FIELD -MYSQL_GID_FIELD -MYSQL_LOGIN_FIELD username -MYSQL_HOME_FIELD "" -MYSQL_MAILDIR_FIELD maildir diff --git a/syscp/patches/gentoo-config-files/nodns/gentoo/cron/etc_cron.d_syscp b/syscp/patches/gentoo-config-files/nodns/gentoo/cron/etc_cron.d_syscp deleted file mode 100644 index 4afe408..0000000 --- a/syscp/patches/gentoo-config-files/nodns/gentoo/cron/etc_cron.d_syscp +++ /dev/null @@ -1,10 +0,0 @@ -# -# Set PATH, otherwise restart-scripts won't find start-stop-daemon -# -PATH=/sbin:/bin:/usr/sbin:/usr/bin -# -# Regular cron jobs for the syscp package -# -# Please check that all following paths are correct -# -*/5 * * * * root /usr/lib/php4/bin/php -q -c /etc/php/syscp-cronjob/php.ini /var/www/syscp/scripts/cronscript.php diff --git a/syscp/patches/gentoo-config-files/nodns/gentoo/cron/etc_php_syscp-cronjob_php.ini b/syscp/patches/gentoo-config-files/nodns/gentoo/cron/etc_php_syscp-cronjob_php.ini deleted file mode 100644 index 74c8316..0000000 --- a/syscp/patches/gentoo-config-files/nodns/gentoo/cron/etc_php_syscp-cronjob_php.ini +++ /dev/null @@ -1,61 +0,0 @@ -short_open_tag = On -asp_tags = Off -precision = 14 -output_buffering = Off -allow_call_time_pass_reference = Off -safe_mode = Off -safe_mode_gid = Off -safe_mode_include_dir = "/usr/share/php/:/usr/share/php4/:/usr/share/php5/" -safe_mode_allowed_env_vars = PHP_ -safe_mode_protected_env_vars = LD_LIBRARY_PATH -open_basedir = -disable_functions = -disable_classes = -expose_php = Off -max_execution_time = 180 -max_input_time = 120 -memory_limit = 32M -post_max_size = 32M -error_reporting = E_ALL & ~E_NOTICE -display_errors = On -display_startup_errors = Off -log_errors = Off -log_errors_max_len = 1024 -ignore_repeated_errors = Off -ignore_repeated_source = Off -report_memleaks = On -track_errors = Off -html_errors = Off -variables_order = "GPCS" -register_globals = Off -register_argc_argv = Off -gpc_order = "GPC" -magic_quotes_gpc = Off -magic_quotes_runtime = Off -magic_quotes_sybase = Off -include_path = ".:/usr/share/php/:/usr/share/php4/:/usr/share/php5/" -enable_dl = Off -file_uploads = On -upload_tmp_dir = "/tmp/" -upload_max_filesize = 32M -allow_url_fopen = Off -session.save_handler = files -session.save_path = "/tmp/" -session.use_cookies = 1 -session.name = PHPSESSID -session.auto_start = 0 -session.cookie_lifetime = 0 -session.cookie_path = / -session.cookie_domain = -session.serialize_handler = php -session.gc_probability = 1 -session.gc_divisor = 1000 -session.gc_maxlifetime = 1440 -session.bug_compat_42 = 0 -session.bug_compat_warn = 1 -session.referer_check = -session.entropy_length = 16 -session.entropy_file = /dev/urandom -session.cache_limiter = nocache -session.cache_expire = 180 -session.use_trans_sid = 0 diff --git a/syscp/patches/gentoo-config-files/nodns/gentoo/cron/etc_php_syscp-vhost_php.ini b/syscp/patches/gentoo-config-files/nodns/gentoo/cron/etc_php_syscp-vhost_php.ini deleted file mode 100644 index 048c26c..0000000 --- a/syscp/patches/gentoo-config-files/nodns/gentoo/cron/etc_php_syscp-vhost_php.ini +++ /dev/null @@ -1,61 +0,0 @@ -short_open_tag = On -asp_tags = Off -precision = 14 -output_buffering = 4096 -allow_call_time_pass_reference = Off -safe_mode = Off -safe_mode_gid = Off -safe_mode_include_dir = "/usr/share/php/:/usr/share/php4/:/usr/share/php5/" -safe_mode_allowed_env_vars = PHP_ -safe_mode_protected_env_vars = LD_LIBRARY_PATH -open_basedir = "/var/www/syscp/:/var/www/syscp-suphp/syscp/:/var/www/syscpwebs/:/usr/share/php/:/usr/share/php4/:/usr/share/php5/" -disable_functions = exec,passthru,shell_exec,system,proc_close,proc_get_status,proc_nice,proc_open,proc_terminate -disable_classes = -expose_php = Off -max_execution_time = 30 -max_input_time = 60 -memory_limit = 16M -post_max_size = 12M -error_reporting = E_ALL & ~E_NOTICE -display_errors = Off -display_startup_errors = Off -log_errors = On -log_errors_max_len = 1024 -ignore_repeated_errors = Off -ignore_repeated_source = Off -report_memleaks = On -track_errors = Off -html_errors = Off -variables_order = "GPCS" -register_globals = Off -register_argc_argv = Off -gpc_order = "GPC" -magic_quotes_gpc = Off -magic_quotes_runtime = Off -magic_quotes_sybase = Off -include_path = ".:/usr/share/php/:/usr/share/php4/:/usr/share/php5/" -enable_dl = Off -file_uploads = On -upload_tmp_dir = "/var/www/syscp-suphp/syscp/" -upload_max_filesize = 32M -allow_url_fopen = Off -session.save_handler = files -session.save_path = "/var/www/syscp-suphp/syscp/" -session.use_cookies = 1 -session.name = PHPSESSID -session.auto_start = 0 -session.cookie_lifetime = 0 -session.cookie_path = / -session.cookie_domain = -session.serialize_handler = php -session.gc_probability = 1 -session.gc_divisor = 1000 -session.gc_maxlifetime = 1440 -session.bug_compat_42 = 0 -session.bug_compat_warn = 1 -session.referer_check = -session.entropy_length = 16 -session.entropy_file = /dev/urandom -session.cache_limiter = nocache -session.cache_expire = 180 -session.use_trans_sid = 0 diff --git a/syscp/patches/gentoo-config-files/nodns/gentoo/postfix/etc_postfix_main.cf b/syscp/patches/gentoo-config-files/nodns/gentoo/postfix/etc_postfix_main.cf deleted file mode 100644 index 9013dd6..0000000 --- a/syscp/patches/gentoo-config-files/nodns/gentoo/postfix/etc_postfix_main.cf +++ /dev/null @@ -1,65 +0,0 @@ -# Postfix directories settings -command_directory = /usr/sbin -daemon_directory = /usr/lib/postfix -queue_directory = /var/spool/postfix -sample_directory = /etc/postfix -manpage_directory = /usr/share/man -readme_directory = /usr/share/doc/postfix-2.1.5-r2/readme -html_directory = no - -# Postfix programs paths settings -mailq_path = /usr/bin/mailq -newaliases_path = /usr/bin/newaliases -sendmail_path = /usr/sbin/sendmail - -# General Postfix configuration -myhostname = -mydestination = $myhostname, $mydomain, localhost.$myhostname, localhost.$mydomain, localhost -mynetworks = 127.0.0.0/8 -inet_interfaces = all -mail_owner = postfix -setgid_group = postdrop -smtpd_banner = $myhostname ESMTP Mailserver -smtpd_helo_required = yes -append_dot_mydomain = no -biff = no - -# Postfix Debugger configuration -debug_peer_level = 2 -debugger_command = - PATH=/bin:/usr/bin:/usr/local/bin; export PATH; (echo cont; - echo where) | gdb $daemon_directory/$process_name $process_id 2>&1 - >$config_directory/$process_name.$process_id.log & sleep 5 - -# Postfix performance settings -default_destination_concurrency_limit = 20 -local_destination_concurrency_limit = 2 - -# Virtual delivery settings -virtual_transport = virtual -virtual_mailbox_base = -virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf -virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf -virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf -virtual_uid_maps = static: -virtual_gid_maps = static: - -# Local delivery settings -local_transport = local -alias_database = hash:/etc/mail/aliases -alias_maps = $alias_database - -# SASL settings -smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination -smtpd_sasl_auth_enable = yes -smtpd_sasl_local_domain = $myhostname -smtpd_sasl_security_options = noanonymous -broken_sasl_auth_clients = yes - -# TLS settings -#smtpd_use_tls = yes -#smtpd_tls_cert_file = /etc/ssl/server/.crt -#smtpd_tls_key_file = /etc/ssl/server/.key -#smtpd_tls_auth_only = no -#smtpd_tls_session_cache_timeout = 3600s -#tls_random_source = dev:/dev/urandom diff --git a/syscp/patches/gentoo-config-files/nodns/gentoo/postfix/etc_postfix_mysql-virtual_alias_maps.cf b/syscp/patches/gentoo-config-files/nodns/gentoo/postfix/etc_postfix_mysql-virtual_alias_maps.cf deleted file mode 100644 index c921e6f..0000000 --- a/syscp/patches/gentoo-config-files/nodns/gentoo/postfix/etc_postfix_mysql-virtual_alias_maps.cf +++ /dev/null @@ -1,8 +0,0 @@ -user = -password = -dbname = -table = mail_virtual -select_field = destination -where_field = email -additional_conditions = and destination <> '' and destination <> ' ' -hosts = diff --git a/syscp/patches/gentoo-config-files/nodns/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf b/syscp/patches/gentoo-config-files/nodns/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf deleted file mode 100644 index 4484bee..0000000 --- a/syscp/patches/gentoo-config-files/nodns/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf +++ /dev/null @@ -1,8 +0,0 @@ -user = -password = -dbname = -table = panel_domains -select_field = domain -where_field = domain -additional_conditions = and isemaildomain = '1' -hosts = diff --git a/syscp/patches/gentoo-config-files/nodns/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf b/syscp/patches/gentoo-config-files/nodns/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf deleted file mode 100644 index 7e0f79a..0000000 --- a/syscp/patches/gentoo-config-files/nodns/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf +++ /dev/null @@ -1,7 +0,0 @@ -user = -password = -dbname = -table = mail_users -select_field = maildir -where_field = email -hosts = diff --git a/syscp/patches/gentoo-config-files/nodns/gentoo/postfix/etc_sasl2_smtpd.conf b/syscp/patches/gentoo-config-files/nodns/gentoo/postfix/etc_sasl2_smtpd.conf deleted file mode 100644 index 2089cbb..0000000 --- a/syscp/patches/gentoo-config-files/nodns/gentoo/postfix/etc_sasl2_smtpd.conf +++ /dev/null @@ -1,12 +0,0 @@ -pwcheck_method: auxprop -auxprop_plugin: sql -allowanonymouslogin: no -allowplaintext: yes -mech_list: PLAIN LOGIN -password_format: crypt -sql_engine: mysql -sql_hostnames: -sql_user: -sql_passwd: -sql_database: -sql_select: SELECT password_enc FROM mail_users where username='%u@%r' diff --git a/syscp/patches/gentoo-config-files/nodns/gentoo/proftpd/etc_proftpd_proftpd.conf b/syscp/patches/gentoo-config-files/nodns/gentoo/proftpd/etc_proftpd_proftpd.conf deleted file mode 100644 index 5e56215..0000000 --- a/syscp/patches/gentoo-config-files/nodns/gentoo/proftpd/etc_proftpd_proftpd.conf +++ /dev/null @@ -1,89 +0,0 @@ -# Server settings -ServerName " FTP Server" -ServerType standalone -ServerIdent off -DefaultServer on -Port 21 -MaxInstances 50 - -# General settings -DeferWelcome on -MultilineRFC2228 on -ShowSymlinks on -AllowOverwrite on -AllowStoreRestart on -AllowRetrieveRestart on -UseReverseDNS off -IdentLookups off -ListOptions "-al" -DisplayFirstChdir .message - -# Modules settings -#DelayEngine off - -# Timeout settings -TimeoutLogin 120 -TimeoutNoTransfer 600 -TimeoutStalled 600 -TimeoutIdle 600 - -# Security settings -RootLogin off -RequireValidShell off -User syscpftpd -Group syscpftpd -Umask 133 022 -DefaultRoot ~ -DenyFilter \*.*/ - -# Per-Directory settings - -Umask 133 022 -AllowOverwrite on - - -# SQL settings -SQLAuthTypes Crypt -SQLAuthenticate users* groups* -SQLConnectInfo @ -SQLUserInfo ftp_users username password uid gid homedir shell -SQLGroupInfo ftp_groups groupname gid members -SQLUserWhereClause "login_enabled = 'y'" - -SQLLog PASS login -SQLNamedQuery login UPDATE "last_login=now(), login_count=login_count+1 WHERE username='%u'" ftp_users - -SQLLog RETR download -SQLNamedQuery download UPDATE "down_count=down_count+1, down_bytes=down_bytes+%b WHERE username='%u'" ftp_users - -SQLLog STOR upload -SQLNamedQuery upload UPDATE "up_count=up_count+1, up_bytes=up_bytes+%b WHERE username='%u'" ftp_users - -# TLS settings -# -#TLSEngine on -#TLSLog /var/log/proftpd-tls.log -#TLSProtocol SSLv23 -#TLSTimeoutHandshake 120 -# Really important for WinClients -#TLSOptions NoCertRequest -#TLSRSACertificateFile /etc/ssl/server/.crt -#TLSRSACertificateKeyFile /etc/ssl/server/.key -# Authenticate client that want to use FTP over TLS? -#TLSVerifyClient off -# Uncomment the following line to force tls login -#TLSRequired off -# - -# LOG settings -# Logging Formats -LogFormat default "%h %1 %u %t \"%r\" %s %b" -LogFormat auth "%v [%P] %h %t \"%r\" %s" -LogFormat write "%h %l %u %t \"%r\" %s %b" -# Activate Logging -# all logins -ExtendedLog /var/log/proftpd-auth.log AUTH auth -# file/dir access -ExtendedLog /var/log/proftpd-access.log WRITE,READ write -# everything (be careful, generates_ very_ big logfiles) -#ExtendedLog /var/log/proftpd-all.log ALL default diff --git a/syscp/patches/gentoo-config-files/nodns/syscp-1.2.13-gentoo-admin_configfiles.php-nodns b/syscp/patches/gentoo-config-files/nodns/syscp-1.2.13-gentoo-admin_configfiles.php-nodns deleted file mode 100644 index 1541fa8..0000000 --- a/syscp/patches/gentoo-config-files/nodns/syscp-1.2.13-gentoo-admin_configfiles.php-nodns +++ /dev/null @@ -1,266 +0,0 @@ - - * @copyright (C) 2003-2004 Florian Lippert - * @package Panel - * @version $Id: admin_configfiles.php,v 1.9 2005/06/15 13:53:58 flo Exp $ - * Modified to reflect the Gentoo environment by Luca Longinotti - */ - - define('AREA', 'admin'); - - /** - * Include our init.php, which manages Sessions, Language etc. - */ - require("./lib/init.php"); - - - $configfiles = Array - ( - 'gentoo' => Array - ( - 'label' => 'Gentoo', - 'daemons' => Array - ( - 'apache' => Array - ( - 'label' => 'Apache2 Webserver (HTTP)', - 'commands' => Array - ( - 'touch '.$settings['system']['apacheconf_directory'].'vhosts.d/99_syscp-vhosts.conf', - 'chown root:0 '.$settings['system']['apacheconf_directory'].'vhosts.d/99_syscp-vhosts.conf', - 'chmod 0600 '.$settings['system']['apacheconf_directory'].'vhosts.d/99_syscp-vhosts.conf', - 'echo "Include '.$settings['system']['apacheconf_directory'].'vhosts.d/99_syscp-vhosts.conf" >> /etc/apache2/httpd.conf', - 'mkdir -p '.$settings['system']['documentroot_prefix'], - 'mkdir -p '.$settings['system']['logfiles_directory'] - ), - 'restart' => Array - ( - 'rc-update add apache2 default', - '/etc/init.d/apache2 restart' - ) - ), - 'courier' => Array - ( - 'label' => 'Courier-IMAP (POP3/IMAP)', - 'files' => Array - ( - 'etc_courier_authlib_authdaemonrc' => '/etc/courier/authlib/authdaemonrc', - 'etc_courier_authlib_authmysqlrc' => '/etc/courier/authlib/authmysqlrc', - 'etc_courier-imap_pop3d' => '/etc/courier-imap/pop3d', - 'etc_courier-imap_imapd' => '/etc/courier-imap/imapd', - 'etc_courier-imap_pop3d-ssl' => '/etc/courier-imap/pop3d-ssl', - 'etc_courier-imap_imapd-ssl' => '/etc/courier-imap/imapd-ssl' - ), - 'commands' => Array - ( - 'rm /etc/courier/authlib/authdaemonrc', - 'rm /etc/courier/authlib/authmysqlrc', - 'rm /etc/courier-imap/pop3d', - 'rm /etc/courier-imap/imapd', - 'rm /etc/courier-imap/pop3d-ssl', - 'rm /etc/courier-imap/imapd-ssl', - 'touch /etc/courier/authlib/authdaemonrc', - 'touch /etc/courier/authlib/authmysqlrc', - 'touch /etc/courier-imap/pop3d', - 'touch /etc/courier-imap/imapd', - 'touch /etc/courier-imap/pop3d-ssl', - 'touch /etc/courier-imap/imapd-ssl', - 'chown root:0 /etc/courier/authlib/authdaemonrc', - 'chown root:0 /etc/courier/authlib/authmysqlrc', - 'chown root:0 /etc/courier-imap/pop3d', - 'chown root:0 /etc/courier-imap/imapd', - 'chown root:0 /etc/courier-imap/pop3d-ssl', - 'chown root:0 /etc/courier-imap/imapd-ssl', - 'chmod 0600 /etc/courier/authlib/authdaemonrc', - 'chmod 0600 /etc/courier/authlib/authmysqlrc', - 'chmod 0600 /etc/courier-imap/pop3d', - 'chmod 0600 /etc/courier-imap/imapd', - 'chmod 0600 /etc/courier-imap/pop3d-ssl', - 'chmod 0600 /etc/courier-imap/imapd-ssl' - ), - 'restart' => Array - ( - 'rc-update add courier-authlib default', - 'rc-update add courier-pop3d default', - 'rc-update add courier-imapd default', - '/etc/init.d/courier-authlib restart', - '/etc/init.d/courier-pop3d restart', - '/etc/init.d/courier-imapd restart' - ) - ), - 'postfix' => Array - ( - 'label' => 'Postfix (MTA)', - 'files' => Array - ( - 'etc_postfix_main.cf' => '/etc/postfix/main.cf', - 'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf', - 'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf', - 'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf', - 'etc_sasl2_smtpd.conf' => '/etc/sasl2/smtpd.conf' - ), - 'commands' => Array - ( - 'mkdir -p '.$settings['system']['vmail_homedir'], - 'chown -R vmail:vmail '.$settings['system']['vmail_homedir'], - 'chmod 0750 '.$settings['system']['vmail_homedir'], - 'rm /etc/postfix/main.cf', - 'touch /etc/postfix/main.cf', - 'touch /etc/postfix/master.cf', - 'touch /etc/postfix/mysql-virtual_alias_maps.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'touch /etc/sasl2/smtpd.conf', - 'chown root:0 /etc/postfix/main.cf', - 'chown root:0 /etc/postfix/master.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_alias_maps.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'chown root:0 /etc/sasl2/smtpd.conf', - 'chmod 0600 /etc/postfix/main.cf', - 'chmod 0600 /etc/postfix/master.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_alias_maps.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'chmod 0600 /etc/sasl2/smtpd.conf' - ), - 'restart' => Array - ( - 'rc-update add postfix default', - '/etc/init.d/postfix restart' - ) - ), - 'proftpd' => Array - ( - 'label' => 'ProFTPd (FTP)', - 'files' => Array - ( - 'etc_proftpd_proftpd.conf' => '/etc/proftpd/proftpd.conf' - ), - 'commands' => Array - ( - 'touch /etc/proftpd/proftpd.conf', - 'chown root:0 /etc/proftpd/proftpd.conf', - 'chmod 0600 /etc/proftpd/proftpd.conf' - ), - 'restart' => Array - ( - 'rc-update add proftpd default', - '/etc/init.d/proftpd restart' - ) - ), - 'cron' => Array - ( - 'label' => 'Crond (cronscript)', - 'files' => Array - ( - 'etc_php_syscp-cronjob_php.ini' => '/etc/php/syscp-cronjob/php.ini', - 'etc_cron.d_syscp' => '/etc/cron.d/syscp' - ), - 'commands' => Array - ( - 'touch /etc/cron.d/syscp', - 'chown root:0 /etc/cron.d/syscp', - 'chmod 0640 /etc/cron.d/syscp', - 'mkdir -p /etc/php/syscp-cronjob', - 'touch /etc/php/syscp-cronjob/php.ini', - 'chown -R root:0 /etc/php/syscp-cronjob', - 'chmod 0750 /etc/php/syscp-cronjob', - 'chmod 0640 /etc/php/syscp-cronjob/php.ini' - ), - 'restart' => Array - ( - 'rc-update add vixie-cron default', - '/etc/init.d/vixie-cron restart' - ) - ) - ) - ) - ); - - /*echo '
';
-	print_r($configfiles);
-	echo '
';*/ - - if( ($page == 'configfiles' || $page == 'overview') && $userinfo['change_serversettings'] == '1') - { - if(isset($_GET['distribution']) && $_GET['distribution']!='' && isset($configfiles[$_GET['distribution']]) && is_array($configfiles[$_GET['distribution']]) && - isset($_GET['daemon']) && $_GET['daemon']!='' && isset($configfiles[$_GET['distribution']]['daemons'][$_GET['daemon']]) && is_array($configfiles[$_GET['distribution']]['daemons'][$_GET['daemon']])) - { - $distribution = addslashes($_GET['distribution']); - $daemon = addslashes($_GET['daemon']); - - if(isset($configfiles[$distribution]['daemons'][$daemon]['commands']) && is_array($configfiles[$distribution]['daemons'][$daemon]['commands'])) - { - $commands = implode("\n", $configfiles[$distribution]['daemons'][$daemon]['commands']); - } - else - { - $commands = ''; - } - - $replace_arr = Array - ( - '' => $sql['user'], - '' => 'MYSQL_PASSWORD', - '' => $sql['db'], - '' => $sql['host'], - '' => $settings['system']['hostname'], - '' => $settings['system']['ipaddress'], - '' => $settings['system']['vmail_homedir'], - '' => $settings['system']['vmail_uid'], - '' => $settings['system']['vmail_gid'] - ); - $files = ''; - if(isset($configfiles[$distribution]['daemons'][$daemon]['files']) && is_array($configfiles[$distribution]['daemons'][$daemon]['files'])) - { - while(list($filename, $realname) = each($configfiles[$distribution]['daemons'][$daemon]['files'])) - { - $file_content = implode('', file('./templates/misc/configfiles/'.$distribution.'/'.$daemon.'/'.$filename)); - $file_content = strtr($file_content, $replace_arr); - $file_content = htmlspecialchars($file_content); - $numbrows = count(explode("\n", $file_content)); - eval("\$files.=\"".getTemplate("configfiles/configfiles_file")."\";"); - } - } - - if(isset($configfiles[$distribution]['daemons'][$daemon]['restart']) && is_array($configfiles[$distribution]['daemons'][$daemon]['restart'])) - { - $restart = implode("\n", $configfiles[$distribution]['daemons'][$daemon]['restart']); - } - else - { - $restart = ''; - } - - eval("echo \"".getTemplate("configfiles/configfiles")."\";"); - } - else - { - $distributions = ''; - while (list($distribution_name, $distribution_details) = each($configfiles)) - { - $daemons = ''; - while(list($daemon_name, $daemon_details) = each($distribution_details['daemons'])) - { - eval("\$daemons.=\"".getTemplate("configfiles/choose_daemon")."\";"); - } - eval("\$distributions.=\"".getTemplate("configfiles/choose_distribution")."\";"); - } - eval("echo \"".getTemplate("configfiles/choose")."\";"); - } - } - -?> diff --git a/syscp/patches/gentoo-config-files/nodns/syscp-1.2.13-gentoo-config-nodns-r2.tar.bz2 b/syscp/patches/gentoo-config-files/nodns/syscp-1.2.13-gentoo-config-nodns-r2.tar.bz2 deleted file mode 100644 index 92af781..0000000 Binary files a/syscp/patches/gentoo-config-files/nodns/syscp-1.2.13-gentoo-config-nodns-r2.tar.bz2 and /dev/null differ diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/ball.gif b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/ball.gif deleted file mode 100644 index 2a681e4..0000000 Binary files a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/ball.gif and /dev/null differ diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/cambialingua.gif b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/cambialingua.gif deleted file mode 100644 index a9baccf..0000000 Binary files a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/cambialingua.gif and /dev/null differ diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/errore.gif b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/errore.gif deleted file mode 100644 index 694a789..0000000 Binary files a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/errore.gif and /dev/null differ diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/finesezione.gif b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/finesezione.gif deleted file mode 100644 index 5e26ce7..0000000 Binary files a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/finesezione.gif and /dev/null differ diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/footer.gif b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/footer.gif deleted file mode 100644 index ab1a51a..0000000 Binary files a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/footer.gif and /dev/null differ diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/header.gif b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/header.gif deleted file mode 100644 index 7737ca0..0000000 Binary files a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/header.gif and /dev/null differ diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/header_r.gif b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/header_r.gif deleted file mode 100644 index 16a8ee2..0000000 Binary files a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/header_r.gif and /dev/null differ diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/login.gif b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/login.gif deleted file mode 100644 index 07c8014..0000000 Binary files a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/login.gif and /dev/null differ diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/logininterno.gif b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/logininterno.gif deleted file mode 100644 index 4a368c3..0000000 Binary files a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/logininterno.gif and /dev/null differ diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/ombra.gif b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/ombra.gif deleted file mode 100644 index 7805f7f..0000000 Binary files a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/ombra.gif and /dev/null differ diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/order_asc.gif b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/order_asc.gif deleted file mode 100644 index 470e978..0000000 Binary files a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/order_asc.gif and /dev/null differ diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/order_desc.gif b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/order_desc.gif deleted file mode 100644 index a2d17da..0000000 Binary files a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/order_desc.gif and /dev/null differ diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/sezione.gif b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/sezione.gif deleted file mode 100644 index bd67ead..0000000 Binary files a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/sezione.gif and /dev/null differ diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/sottosezione.gif b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/sottosezione.gif deleted file mode 100644 index 1396bc3..0000000 Binary files a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/sottosezione.gif and /dev/null differ diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/titolo.gif b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/titolo.gif deleted file mode 100644 index c686057..0000000 Binary files a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/titolo.gif and /dev/null differ diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/valid-xhtml10 b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/valid-xhtml10 deleted file mode 100644 index 2275ee6..0000000 Binary files a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/valid-xhtml10 and /dev/null differ diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/vcss b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/vcss deleted file mode 100644 index 020c75a..0000000 Binary files a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/vcss and /dev/null differ diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/admins/admins.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/admins/admins.tpl deleted file mode 100644 index d411bff..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/admins/admins.tpl +++ /dev/null @@ -1,29 +0,0 @@ -$header - - - - - - - - - - - - - - - - $admins - - - - - - - - -
 {$lng['admin']['admins']}
ID  {$lng['customer']['name']}  {$lng['admin']['customers']}
{$lng['admin']['domains']}		Space
Traffic		MySQL
FTP		eMails
Subdomains		Accounts
Forwarders		Active   
{$paging}
{$lng['admin']['admin_add']}
-
-
-$footer diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/admins/admins_add.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/admins/admins_add.tpl deleted file mode 100644 index 112e6b1..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/admins/admins_add.tpl +++ /dev/null @@ -1,89 +0,0 @@ -$header -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 {$lng['admin']['admin_add']}
{$lng['login']['username']}: *
{$lng['customer']['name']}: *
{$lng['customer']['email']}: *
{$lng['login']['language']}:
{$lng['admin']['change_serversettings']}$change_serversettings
{$lng['admin']['customers']}: *
{$lng['admin']['customers_see_all']}$customers_see_all
{$lng['admin']['domains']}: *
{$lng['admin']['domains_see_all']}$domains_see_all
{$lng['customer']['diskspace']}: *
{$lng['customer']['traffic']}: *
{$lng['customer']['subdomains']}: *
{$lng['customer']['emails']}: *
{$lng['customer']['accounts']}: *
{$lng['customer']['forwarders']}: *
{$lng['customer']['ftps']}: *
{$lng['customer']['mysqls']}: *
{$lng['login']['password']}: *
-
-
-
-$footer \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/admins/admins_admin.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/admins/admins_admin.tpl deleted file mode 100644 index dd42ebf..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/admins/admins_admin.tpl +++ /dev/null @@ -1,11 +0,0 @@ - - {$row['loginname']} - {$row['name']} - {$row['customers_used']}/{$row['customers']}
{$row['domains_used']}/{$row['domains']} - {$row['diskspace_used']}/{$row['diskspace']} (MB)
{$row['traffic_used']}/{$row['traffic']} (GB) - {$row['mysqls_used']}/{$row['mysqls']}
{$row['ftps_used']}/{$row['ftps']} - {$row['emails_used']}/{$row['emails']}
{$row['subdomains_used']}/{$row['subdomains']} - {$row['email_accounts_used']}/{$row['email_accounts']}
{$row['email_forwarders_used']}/{$row['email_forwarders']} - {$row['deactivated']} - {$lng['panel']['delete']}
{$lng['panel']['edit']} - \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/admins/admins_edit.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/admins/admins_edit.tpl deleted file mode 100644 index 245f6c9..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/admins/admins_edit.tpl +++ /dev/null @@ -1,94 +0,0 @@ -$header -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 {$lng['admin']['admin_edit']}
{$lng['login']['username']}:{$result['loginname']}
{$lng['customer']['name']}: *
{$lng['customer']['email']}: *
{$lng['login']['language']}:
{$lng['admin']['change_serversettings']}$change_serversettings
{$lng['admin']['customers']}: *
{$lng['admin']['customers_see_all']}$customers_see_all
{$lng['admin']['domains']}: *
{$lng['admin']['domains_see_all']}$domains_see_all
{$lng['customer']['diskspace']}: *
{$lng['customer']['traffic']}: *
{$lng['customer']['subdomains']}: *
{$lng['customer']['emails']}: *
{$lng['customer']['accounts']}: *
{$lng['customer']['forwarders']}: *
{$lng['customer']['ftps']}: *
{$lng['customer']['mysqls']}: *
{$lng['admin']['deactivated_user']}?$deactivated
{$lng['login']['password']} ({$lng['panel']['emptyfornochanges']}):
-
-
-
-$footer \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/configfiles/choose.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/configfiles/choose.tpl deleted file mode 100644 index 1bb6450..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/configfiles/choose.tpl +++ /dev/null @@ -1,10 +0,0 @@ -$header - - - - - $distributions -
 {$lng['admin']['configfiles']['serverconfiguration']}
-
-
-$footer \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/configfiles/choose_daemon.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/configfiles/choose_daemon.tpl deleted file mode 100644 index bc0d257..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/configfiles/choose_daemon.tpl +++ /dev/null @@ -1,2 +0,0 @@ -   » {$daemon_details['label']} -
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/configfiles/choose_distribution.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/configfiles/choose_distribution.tpl deleted file mode 100644 index cfb64d6..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/configfiles/choose_distribution.tpl +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - -
» {$distribution_details['label']}
$daemons
- - \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/configfiles/configfiles.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/configfiles/configfiles.tpl deleted file mode 100644 index 27360f7..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/configfiles/configfiles.tpl +++ /dev/null @@ -1,24 +0,0 @@ -$header - - - - - - - - - - - - - - - - - - - -
 {$configfiles[$distribution]['daemons'][$daemon]['label']}
{$lng['admin']['configfiles']['commands']}

{$lng['admin']['configfiles']['files']}
{$files}
{$lng['admin']['configfiles']['restart']}

-
-
-$footer \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/configfiles/configfiles_file.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/configfiles/configfiles_file.tpl deleted file mode 100644 index 1d57e10..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/configfiles/configfiles_file.tpl +++ /dev/null @@ -1 +0,0 @@ -

$realname:

\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/customers/customers.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/customers/customers.tpl deleted file mode 100644 index 2851d7f..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/customers/customers.tpl +++ /dev/null @@ -1,39 +0,0 @@ -$header - - - - - - - - - - - - - - - - - - - - - - - - $customers - - - - - - - - - - -
 {$lng['admin']['customers']}
{$lng['admin']['customer_add']}
ID  {$lng['admin']['admin']}  {$lng['customer']['name']}DomainsSpace TrafficMySQL
FTP		eMails
Subdomains		Accounts
Forwarders		Active   
{$paging}
{$lng['admin']['customer_add']}
-
-
-$footer diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/customers/customers_add.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/customers/customers_add.tpl deleted file mode 100644 index 977ae7e..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/customers/customers_add.tpl +++ /dev/null @@ -1,109 +0,0 @@ -$header -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 {$lng['admin']['customer_add']}
{$lng['login']['username']}:
{$lng['customer']['name']}: *
{$lng['customer']['firstname']}: *
{$lng['customer']['company']}:
{$lng['customer']['street']}:
{$lng['customer']['zipcode']}:
{$lng['customer']['city']}:
{$lng['customer']['phone']}:
{$lng['customer']['fax']}:
{$lng['customer']['email']}: *
{$lng['customer']['customernumber']}:
{$lng['login']['language']}:
{$lng['customer']['diskspace']}: *
{$lng['customer']['traffic']}: *
{$lng['customer']['subdomains']}: *
{$lng['customer']['emails']}: *
{$lng['customer']['accounts']}: *
{$lng['customer']['forwarders']}: *
{$lng['customer']['ftps']}: *
{$lng['customer']['mysqls']}: *
{$lng['admin']['stdsubdomain_add']}?$createstdsubdomain
{$lng['login']['password']}:
{$lng['admin']['sendpassword']}?$sendpassword
-
-
-
-$footer \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/customers/customers_customer.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/customers/customers_customer.tpl deleted file mode 100644 index 9233b0e..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/customers/customers_customer.tpl +++ /dev/null @@ -1,18 +0,0 @@ - - {$row['loginname']} - - {$row['adminname']} - - {$row['name']}
{$row['firstname']} - {$row['domains']} - - style="color:red" style="color:green">{$row['diskspace_used']}/{$row['diskspace']} (MB) -
- style="color:red" style="color:green">{$row['traffic_used']}/{$row['traffic']} (GB) - - {$row['mysqls_used']}/{$row['mysqls']}
{$row['ftps_used']}/{$row['ftps']} - {$row['emails_used']}/{$row['emails']}
{$row['subdomains_used']}/{$row['subdomains']} - {$row['email_accounts_used']}/{$row['email_accounts']}
{$row['email_forwarders_used']}/{$row['email_forwarders']} -
{$row['deactivated']}
- {$lng['panel']['delete']}
{$lng['panel']['edit']} - diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/customers/customers_edit.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/customers/customers_edit.tpl deleted file mode 100644 index 297b966..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/customers/customers_edit.tpl +++ /dev/null @@ -1,114 +0,0 @@ -$header -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 {$lng['admin']['customer_edit']}
{$lng['login']['username']}:{$result['loginname']}
{$lng['customer']['documentroot']}:{$result['documentroot']}
{$lng['customer']['name']}: *
{$lng['customer']['firstname']}: *
{$lng['customer']['company']}:
{$lng['customer']['street']}:
{$lng['customer']['zipcode']}:
{$lng['customer']['city']}:
{$lng['customer']['phone']}:
{$lng['customer']['fax']}:
{$lng['customer']['email']}: *
{$lng['customer']['customernumber']}:
{$lng['login']['language']}:
{$lng['customer']['diskspace']}: *
{$lng['customer']['traffic']}: *
{$lng['customer']['subdomains']}: *
{$lng['customer']['emails']}: *
{$lng['customer']['accounts']}: *
{$lng['customer']['forwarders']}: *
{$lng['customer']['ftps']}: *
{$lng['customer']['mysqls']}: *
{$lng['admin']['stdsubdomain_add']}?
({$result['loginname']}.{$settings['system']['hostname']})		$createstdsubdomain
{$lng['admin']['deactivated_user']}?$deactivated
{$lng['login']['password']} ({$lng['panel']['emptyfornochanges']}):
-
-
-
-$footer \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/domains/domains.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/domains/domains.tpl deleted file mode 100644 index d2ac311..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/domains/domains.tpl +++ /dev/null @@ -1,32 +0,0 @@ -$header - - - - - - - - - - - - - - - - - $domains - - - - - - - - - - -
 {$lng['admin']['domains']}
{$lng['admin']['domain_add']}
ID  Domain  {$lng['admin']['ipsandports']['ip']}  {$lng['admin']['customer']}   
{$paging}
{$lng['admin']['domain_add']}
-
-
-$footer diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/domains/domains_add.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/domains/domains_add.tpl deleted file mode 100644 index ee29269..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/domains/domains_add.tpl +++ /dev/null @@ -1,77 +0,0 @@ -$header -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 {$lng['admin']['domain_add']}
{$lng['admin']['customer']}:
Domain:
{$lng['domains']['aliasdomain']}:
DocumentRoot:
({$lng['panel']['emptyfordefault']})
IP/Port:
Nameserver:$isbinddomain
Zonefile:
({$lng['panel']['emptyfordefault']})
Emaildomain:$isemaildomain
{$lng['admin']['subdomainforemail']}:$subcanemaildomain
{$lng['admin']['domain_edit']}:$caneditdomain
OpenBasedir:$openbasedir
Safemode:$safemode
Speciallogfile:$speciallogfile
{$lng['admin']['ownvhostsettings']}:
-
-
-
-$footer diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/domains/domains_domain.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/domains/domains_domain.tpl deleted file mode 100644 index 156d25b..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/domains/domains_domain.tpl +++ /dev/null @@ -1,8 +0,0 @@ - - {$row['id']} - {$row['domain']} - {$row['ipandport']} - {$row['name']} {$row['firstname']} ({$row['loginname']}) - {$lng['panel']['delete']}  - {$lng['panel']['edit']} - diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/domains/domains_edit.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/domains/domains_edit.tpl deleted file mode 100644 index 894d188..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/domains/domains_edit.tpl +++ /dev/null @@ -1,80 +0,0 @@ -$header -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 {$lng['admin']['domain_edit']}
{$lng['admin']['customer']}:{$result['name']} {$result['firstname']} ({$result['loginname']})
Domain:{$result['domain']}
{$lng['domains']['aliasdomain']}:
DocumentRoot:
({$lng['panel']['emptyfordefault']})
IP/Port:
Nameserver:$isbinddomain
Zonefile:
({$lng['panel']['emptyfordefault']})
Emaildomain:$isemaildomain
{$lng['admin']['subdomainforemail']}:$subcanemaildomain
{$lng['admin']['domain_edit']}:$caneditdomain
OpenBasedir:$openbasedir
Safemode:$safemode
Speciallogfile:$speciallogfile
{$lng['admin']['ownvhostsettings']}:
-
-
-
-$footer diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/index/change_language.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/index/change_language.tpl deleted file mode 100644 index c2c45d9..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/index/change_language.tpl +++ /dev/null @@ -1,23 +0,0 @@ -$header -
- - - - - - - - - - - - - - - - -
 {$lng['menue']['main']['changelanguage']}
{$lng['login']['language']}
-
-
-
-$footer \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/index/change_password.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/index/change_password.tpl deleted file mode 100644 index c4a2aa2..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/index/change_password.tpl +++ /dev/null @@ -1,31 +0,0 @@ -$header -
- - - - - - - - - - - - - - - - - - - - - - - - -
 {$lng['menue']['main']['changepassword']}
{$lng['changepassword']['old_password']}
{$lng['changepassword']['new_password']}
{$lng['changepassword']['new_password_confirm']}
-
-
-
-$footer \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/index/index.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/index/index.tpl deleted file mode 100644 index d0c0937..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/index/index.tpl +++ /dev/null @@ -1,91 +0,0 @@ -$header - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 {$lng['admin']['ressourcedetails']}
{$lng['admin']['customers']}:{$overview['number_customers']} ({$userinfo['customers']})
{$lng['customer']['domains']}:{$overview['number_domains']} ({$userinfo['domains']})
{$lng['customer']['diskspace']}:{$overview['diskspace_used']} ({$userinfo['diskspace_used']}/{$userinfo['diskspace']})
{$lng['customer']['traffic']}:{$overview['traffic_used']} ({$userinfo['traffic_used']}/{$userinfo['traffic']})
{$lng['customer']['mysqls']}:{$overview['mysqls_used']} ({$userinfo['mysqls_used']}/{$userinfo['mysqls']})
{$lng['customer']['emails']}:{$overview['emails_used']} ({$userinfo['emails_used']}/{$userinfo['emails']})
{$lng['customer']['accounts']}:{$overview['email_accounts_used']} ({$userinfo['email_accounts_used']}/{$userinfo['email_accounts']})
{$lng['customer']['forwarders']}:{$overview['email_forwarders_used']} ({$userinfo['email_forwarders_used']}/{$userinfo['email_forwarders']})
{$lng['customer']['ftps']}:{$overview['ftps_used']} ({$userinfo['ftps_used']}/{$userinfo['ftps']})
{$lng['customer']['subdomains']}:{$overview['subdomains_used']} ({$userinfo['subdomains_used']}/{$userinfo['subdomains']})
 {$lng['admin']['systemdetails']}
Serversoftware:{$_SERVER['SERVER_SOFTWARE']}
PHP-Version:$phpversion
PHP-Memory-Limit:$phpmemorylimit
MySQL Server Version:$mysqlserverversion
MySQL Client Version:$mysqlclientversion
Webserver Interface:$webserverinterface
 {$lng['admin']['syscpdetails']}
{$lng['admin']['cronlastrun']}:$cronlastrun
{$lng['admin']['installedversion']}:$version
{$lng['admin']['latestversion']}:$lookfornewversion_lable
-
-
-$footer diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/ipsandports/ipsandports.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/ipsandports/ipsandports.tpl deleted file mode 100644 index 8237d55..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/ipsandports/ipsandports.tpl +++ /dev/null @@ -1,30 +0,0 @@ -$header - - - - - - - - - - - - - $ipsandports - - - -
 {$lng['admin']['ipsandports']['ipsandports']}
-
- - - - {$lng['admin']['ipsandports']['default']}: - - -
-
ID{$lng['admin']['ipsandports']['ipandport']} 
{$lng['admin']['ipsandports']['add']}
-
-
-$footer diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/ipsandports/ipsandports_add.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/ipsandports/ipsandports_add.tpl deleted file mode 100644 index 47595f9..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/ipsandports/ipsandports_add.tpl +++ /dev/null @@ -1,25 +0,0 @@ -$header -
- - - - - - - - - - - - - - - - - - -
 {$lng['admin']['ipsandports']['add']}
{$lng['admin']['ipsandports']['ip']}:
{$lng['admin']['ipsandports']['port']}:
-
-
-
-$footer diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/ipsandports/ipsandports_edit.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/ipsandports/ipsandports_edit.tpl deleted file mode 100644 index 0fe5ab8..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/ipsandports/ipsandports_edit.tpl +++ /dev/null @@ -1,26 +0,0 @@ -$header -
- - - - - - - - - - - - - - - - - - - -
 {$lng['admin']['ipsandports']['edit']}
{$lng['admin']['ipsandports']['ip']}:
{$lng['admin']['ipsandports']['port']}:
-
-
-
-$footer diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/ipsandports/ipsandports_ipandport.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/ipsandports/ipsandports_ipandport.tpl deleted file mode 100644 index c61f8bc..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/ipsandports/ipsandports_ipandport.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - {$row['id']} - {$row['ip']}:{$row['port']} - {$lng['panel']['delete']} - {$lng['panel']['edit']} - diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/settings/settings.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/settings/settings.tpl deleted file mode 100644 index 343d8f4..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/settings/settings.tpl +++ /dev/null @@ -1,121 +0,0 @@ -$header -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 {$lng['admin']['serversettings']} {$lng['panel']['edit']}
{$lng['serversettings']['session_timeout']['title']}:
{$lng['serversettings']['session_timeout']['description']}
{$lng['serversettings']['maxloginattempts']['title']}:
{$lng['serversettings']['maxloginattempts']['description']}
{$lng['serversettings']['deactivatetime']['title']}:
{$lng['serversettings']['deactivatetime']['description']}
{$lng['serversettings']['accountprefix']['title']}:
{$lng['serversettings']['accountprefix']['description']}
{$lng['serversettings']['mysqlprefix']['title']}:
{$lng['serversettings']['mysqlprefix']['description']} ({$settings['customer']['accountprefix']}X{$settings['customer']['mysqlprefix']}Y)
{$lng['serversettings']['ftpprefix']['title']}:
{$lng['serversettings']['ftpprefix']['description']} ({$settings['customer']['accountprefix']}X{$settings['customer']['ftpprefix']}Y)
{$lng['serversettings']['documentroot_prefix']['title']}:
{$lng['serversettings']['documentroot_prefix']['description']}
{$lng['serversettings']['logfiles_directory']['title']}:
{$lng['serversettings']['logfiles_directory']['description']}
{$lng['serversettings']['ipaddress']['title']}:
{$lng['serversettings']['ipaddress']['description']}
{$lng['serversettings']['hostname']['title']}:
{$lng['serversettings']['hostname']['description']}
{$lng['serversettings']['apacheconf_directory']['title']}:
{$lng['serversettings']['apacheconf_directory']['description']}
{$lng['serversettings']['apacheconf_filename']['title']}:
{$lng['serversettings']['apacheconf_filename']['description']}
{$lng['serversettings']['apachereload_command']['title']}:
{$lng['serversettings']['apachereload_command']['description']}
{$lng['serversettings']['bindconf_directory']['title']}:
{$lng['serversettings']['bindconf_directory']['description']}
{$lng['serversettings']['bindreload_command']['title']}:
{$lng['serversettings']['bindreload_command']['description']}
{$lng['serversettings']['binddefaultzone']['title']}:
{$lng['serversettings']['binddefaultzone']['description']}
{$lng['serversettings']['vmail_uid']['title']}:
{$lng['serversettings']['vmail_uid']['description']}
{$lng['serversettings']['vmail_gid']['title']}:
{$lng['serversettings']['vmail_gid']['description']}
{$lng['serversettings']['vmail_homedir']['title']}:
{$lng['serversettings']['vmail_homedir']['description']}
{$lng['serversettings']['adminmail']['title']}:
{$lng['serversettings']['adminmail']['description']}
{$lng['serversettings']['paging']['title']}:
{$lng['serversettings']['paging']['description']}
{$lng['login']['language']}:
{$lng['serversettings']['language']['description']}
{$lng['serversettings']['pathedit']['title']}:
{$lng['serversettings']['pathedit']['description']}
{$lng['serversettings']['phpmyadmin_url']['title']}:
{$lng['serversettings']['phpmyadmin_url']['description']}
{$lng['serversettings']['webmail_url']['title']}:
{$lng['serversettings']['webmail_url']['description']}
{$lng['serversettings']['webftp_url']['title']}:
{$lng['serversettings']['webftp_url']['description']}
-
-
-
-$footer diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/templates/templates.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/templates/templates.tpl deleted file mode 100644 index 8b202c7..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/templates/templates.tpl +++ /dev/null @@ -1,20 +0,0 @@ -$header - - - - - - - - - - $templates - - - - - -
 {$lng['admin']['templates']['templates']}
{$lng['login']['language']}{$lng['admin']['templates']['action']} 
{$lng['admin']['templates']['template_add']}
-
-
-$footer \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/templates/templates_add_1.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/templates/templates_add_1.tpl deleted file mode 100644 index ff6c74d..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/templates/templates_add_1.tpl +++ /dev/null @@ -1,21 +0,0 @@ -$header -
- - - - - - - - - - - - - - -
 {$lng['admin']['templates']['template_add']}
{$lng['login']['language']}:
-
-
-
-$footer \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/templates/templates_add_2.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/templates/templates_add_2.tpl deleted file mode 100644 index c23e688..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/templates/templates_add_2.tpl +++ /dev/null @@ -1,66 +0,0 @@ -$header -
- - - - - - - - - - - - - - - - - - - - - - - - - - -
 {$lng['admin']['templates']['template_add']}
{$lng['login']['language']}:$language
{$lng['admin']['templates']['action']}:
{$lng['admin']['templates']['subject']}: *
{$lng['admin']['templates']['mailbody']}: *
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  {$lng['admin']['templates']['template_replace_vars']}
{$lng['admin']['templates']['createcustomer']}
{FIRSTNAME}:{$lng['admin']['templates']['FIRSTNAME']}
{NAME}:{$lng['admin']['templates']['NAME']}
{USERNAME}:{$lng['admin']['templates']['USERNAME']}
{PASSWORD}:{$lng['admin']['templates']['PASSWORD']}
{$lng['admin']['templates']['pop_success']}
{EMAIL}:{$lng['admin']['templates']['EMAIL']}
-
-
-
-$footer \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/templates/templates_edit.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/templates/templates_edit.tpl deleted file mode 100644 index 34f3778..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/templates/templates_edit.tpl +++ /dev/null @@ -1,68 +0,0 @@ -$header -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 {$lng['admin']['templates']['template_edit']}
{$lng['login']['language']}:{$result['language']}
{$lng['admin']['templates']['action']}:$template
{$lng['admin']['templates']['subject']}: *
{$lng['admin']['templates']['mailbody']}: *
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  {$lng['admin']['templates']['template_replace_vars']}
{$lng['admin']['templates']['createcustomer']}
{FIRSTNAME}:{$lng['admin']['templates']['FIRSTNAME']}
{NAME}:{$lng['admin']['templates']['NAME']}
{USERNAME}:{$lng['admin']['templates']['USERNAME']}
{PASSWORD}:{$lng['admin']['templates']['PASSWORD']}
{$lng['admin']['templates']['pop_success']}
{EMAIL}:{$lng['admin']['templates']['EMAIL']}
-
-
-
-$footer \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/templates/templates_template.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/templates/templates_template.tpl deleted file mode 100644 index a5e0c2b..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/templates/templates_template.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - {$language} - {$template} - {$lng['panel']['delete']} - {$lng['panel']['edit']} - \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/domains/domainlist.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/domains/domainlist.tpl deleted file mode 100644 index e31e042..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/domains/domainlist.tpl +++ /dev/null @@ -1,30 +0,0 @@ -$header - - - - - - - - - - - - - - - $domains - - - - - - - - - - -
 {$lng['domains']['domainsettings']}
{$lng['domains']['domainname']}{$lng['panel']['path']} 
{$lng['domains']['subdomain_add']}
{$paging}
{$lng['domains']['subdomain_add']}
-
-
-$footer diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/domains/domains.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/domains/domains.tpl deleted file mode 100644 index fed081b..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/domains/domains.tpl +++ /dev/null @@ -1,12 +0,0 @@ -$header - - - - - - - -
 {$lng['menue']['domains']['domains']}
{$lng['domains']['description']}
-
-
-$footer \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/domains/domains_add.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/domains/domains_add.tpl deleted file mode 100644 index a75f21e..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/domains/domains_add.tpl +++ /dev/null @@ -1,29 +0,0 @@ -$header -
- - - - - - - - - - - - - - - - - - - - - - -
 {$lng['domains']['subdomain_add']}
{$lng['domains']['domainname']}: .
{$lng['domains']['aliasdomain']}:
{$lng['panel']['path']}:{$pathSelect}
-
-
-
-$footer \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/domains/domains_delimiter.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/domains/domains_delimiter.tpl deleted file mode 100644 index dd3e5ba..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/domains/domains_delimiter.tpl +++ /dev/null @@ -1,3 +0,0 @@ - -     {$row['domain']} - \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/domains/domains_domain.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/domains/domains_domain.tpl deleted file mode 100644 index 8df2e43..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/domains/domains_domain.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - {$row['domain']} - {$row['documentroot']}{$lng['domains']['aliasdomain']} {$row['aliasdomain']} - {$lng['panel']['edit']} - {$lng['panel']['delete']} - \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/domains/domains_edit.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/domains/domains_edit.tpl deleted file mode 100644 index 4c31697..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/domains/domains_edit.tpl +++ /dev/null @@ -1,44 +0,0 @@ -$header -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 {$lng['domains']['subdomain_edit']}
{$lng['domains']['domainname']}:{$result['domain']}
{$lng['domains']['aliasdomain']}:
{$lng['panel']['path']}:{$pathSelect}
{$lng['domains']['wildcarddomain']}$iswildcarddomain
Emaildomain:$isemaildomain
-
-
-
-$footer \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/account_add.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/account_add.tpl deleted file mode 100644 index 56e366c..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/account_add.tpl +++ /dev/null @@ -1,26 +0,0 @@ -$header -
- - - - - - - - - - - - - - - - - - - -
 {$lng['emails']['account_add']}
{$lng['emails']['emailaddress']}:{$result['email_full']}
{$lng['login']['password']}:
-
-
-
-$footer \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/account_changepw.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/account_changepw.tpl deleted file mode 100644 index b2f3b10..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/account_changepw.tpl +++ /dev/null @@ -1,26 +0,0 @@ -$header -
- - - - - - - - - - - - - - - - - - - -
 {$lng['menue']['main']['changepassword']}
{$lng['emails']['emailaddress']}:{$result['email_full']}
{$lng['login']['password']}:
-
-
-
-$footer \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/email.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/email.tpl deleted file mode 100644 index f49a7a0..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/email.tpl +++ /dev/null @@ -1,12 +0,0 @@ -$header - - - - - - - -
 {$lng['menue']['email']['email']}
{$lng['emails']['description']}
-
-
-$footer \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/emails.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/emails.tpl deleted file mode 100644 index 69dd6e2..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/emails.tpl +++ /dev/null @@ -1,27 +0,0 @@ -$header - - - - - - - - - - - - - - - - - $accounts - - - - - -
 {$lng['menue']['email']['emails']}
{$lng['emails']['emailaddress']}{$lng['emails']['forwarders']}{$lng['emails']['account']}{$lng['emails']['catchall']} 
{$lng['emails']['emails_add']}
{$lng['emails']['emails_add']}
-
-
-$footer \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/emails_add.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/emails_add.tpl deleted file mode 100644 index 4c8636e..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/emails_add.tpl +++ /dev/null @@ -1,25 +0,0 @@ -$header -
- - - - - - - - - - - - - - - - - - -
 {$lng['emails']['emails_add']}
{$lng['emails']['emailaddress']}: @
{$lng['emails']['iscatchall']}$iscatchall
-
-
-
-$footer \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/emails_domain.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/emails_domain.tpl deleted file mode 100644 index 3c01c0b..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/emails_domain.tpl +++ /dev/null @@ -1,3 +0,0 @@ - -     {$domainname} - \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/emails_edit.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/emails_edit.tpl deleted file mode 100644 index e5c5853..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/emails_edit.tpl +++ /dev/null @@ -1,40 +0,0 @@ -$header - - - - - - - - - - - - - - - - - - - - -
 {$lng['emails']['emails_edit']}
{$lng['emails']['emailaddress']}:{$result['email_full']}
{$lng['emails']['account']}: - - {$lng['panel']['yes']} [{$lng['menue']['main']['changepassword']}] [{$lng['emails']['account_delete']}] - - - {$lng['panel']['no']} [{$lng['emails']['account_add']}] - -
{$lng['emails']['catchall']}: - - {$lng['panel']['yes']} - - - {$lng['panel']['no']} - - [{$lng['panel']['toggle']}] -
{$lng['emails']['forwarders']} ({$forwarders_count}):$forwarders{$lng['emails']['forwarder_add']}
-
-
-$footer \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/emails_edit_forwarder.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/emails_edit_forwarder.tpl deleted file mode 100644 index 3800fd6..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/emails_edit_forwarder.tpl +++ /dev/null @@ -1,2 +0,0 @@ -$destination [{$lng['panel']['delete']}] -
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/emails_email.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/emails_email.tpl deleted file mode 100644 index 4c74758..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/emails_email.tpl +++ /dev/null @@ -1,8 +0,0 @@ - - {$row['email_full']} - {$row['destination']} - {$lng['panel']['yes']}{$lng['panel']['no']} - {$lng['panel']['yes']}{$lng['panel']['no']} - {$lng['panel']['edit']} - {$lng['panel']['delete']} - \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/forwarder_add.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/forwarder_add.tpl deleted file mode 100644 index 7410d14..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/forwarder_add.tpl +++ /dev/null @@ -1,26 +0,0 @@ -$header -
- - - - - - - - - - - - - - - - - - - -
 {$lng['emails']['forwarder_add']}
{$lng['emails']['from']}:{$result['email_full']}
{$lng['emails']['to']}:
-
-
-
-$footer \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/extras.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/extras.tpl deleted file mode 100644 index 0fa7bf4..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/extras.tpl +++ /dev/null @@ -1,12 +0,0 @@ -$header - - - - - - - -
 {$lng['menue']['extras']['extras']}
{$lng['extras']['description']}
-
-
-$footer \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htaccess.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htaccess.tpl deleted file mode 100644 index 03e776f..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htaccess.tpl +++ /dev/null @@ -1,21 +0,0 @@ -$header - - - - - - - - - - - - - $htaccess - - - -
 {$lng['menue']['extras']['pathoptions']}
{$lng['panel']['path']}{$lng['extras']['view_directory']}{$lng['extras']['error404path']}{$lng['extras']['error403path']}{$lng['extras']['error500path']} 
{$lng['extras']['pathoptions_add']}
-
-
-$footer \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htaccess_add.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htaccess_add.tpl deleted file mode 100644 index 93f3ca3..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htaccess_add.tpl +++ /dev/null @@ -1,37 +0,0 @@ -$header -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 {$lng['extras']['pathoptions_add']}
{$lng['panel']['path']}:{$pathSelect}
{$lng['extras']['directory_browsing']}:$options_indexes
{$lng['extras']['errordocument404path']}:
{$lng['panel']['emptyfordefault']}
{$lng['extras']['errordocument403path']}:
{$lng['panel']['emptyfordefault']}
{$lng['extras']['errordocument500path']}:
{$lng['panel']['emptyfordefault']}
-
-
-
-$footer \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htaccess_edit.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htaccess_edit.tpl deleted file mode 100644 index 5f0e3b7..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htaccess_edit.tpl +++ /dev/null @@ -1,38 +0,0 @@ -$header -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 {$lng['extras']['pathoptions_edit']}
{$lng['panel']['path']}:{$result['path']}
{$lng['extras']['directory_browsing']}:$options_indexes
{$lng['extras']['errordocument404path']}:
{$lng['panel']['emptyfordefault']}
{$lng['extras']['errordocument403path']}:
{$lng['panel']['emptyfordefault']}
{$lng['extras']['errordocument500path']}:
{$lng['panel']['emptyfordefault']}
-
-
-
-$footer \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htaccess_htaccess.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htaccess_htaccess.tpl deleted file mode 100644 index 3577809..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htaccess_htaccess.tpl +++ /dev/null @@ -1,9 +0,0 @@ - - {$row['path']} - {$row['options_indexes']} - {$row['error404path']} - {$row['error403path']} - {$row['error500path']} - {$lng['panel']['edit']} - {$lng['panel']['delete']} - \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htpasswds.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htpasswds.tpl deleted file mode 100644 index 0899db9..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htpasswds.tpl +++ /dev/null @@ -1,18 +0,0 @@ -$header - - - - - - - - - - $htpasswds - - - -
 {$lng['menue']['extras']['directoryprotection']}
{$lng['login']['username']}{$lng['panel']['path']} 
{$lng['extras']['directoryprotection_add']}
-
-
-$footer \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htpasswds_add.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htpasswds_add.tpl deleted file mode 100644 index bab5063..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htpasswds_add.tpl +++ /dev/null @@ -1,29 +0,0 @@ -$header -
- - - - - - - - - - - - - - - - - - - - - - -
 {$lng['extras']['directoryprotection_add']}
{$lng['panel']['path']}:{$pathSelect}
{$lng['login']['username']}:
{$lng['login']['password']}:
-
-
-
-$footer \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htpasswds_edit.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htpasswds_edit.tpl deleted file mode 100644 index 39bbbb9..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htpasswds_edit.tpl +++ /dev/null @@ -1,30 +0,0 @@ -$header -
- - - - - - - - - - - - - - - - - - - - - - - -
 {$lng['menue']['main']['changepassword']}
{$lng['panel']['path']}:{$result['path']}
{$lng['login']['username']}:{$result['username']}
{$lng['login']['password']}:
-
-
-
-$footer \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htpasswds_htpasswd.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htpasswds_htpasswd.tpl deleted file mode 100644 index fb9b004..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htpasswds_htpasswd.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - {$row['username']} - {$row['path']} - {$lng['menue']['main']['changepassword']} - {$lng['panel']['delete']} - \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/ftp/accounts.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/ftp/accounts.tpl deleted file mode 100644 index 3502729..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/ftp/accounts.tpl +++ /dev/null @@ -1,30 +0,0 @@ -$header - - - - - - - - - - - - - - - $accounts - - - - - - - - - - -
 {$lng['menue']['ftp']['accounts']}
{$lng['login']['username']}{$lng['panel']['path']} 
{$lng['ftp']['account_add']}
{$paging}
{$lng['ftp']['account_add']}
-
-
-$footer diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/ftp/accounts_account.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/ftp/accounts_account.tpl deleted file mode 100644 index 5c637cd..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/ftp/accounts_account.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - {$row['username']} - {$row['documentroot']} - {$lng['menue']['main']['changepassword']} - {$lng['panel']['delete']} - \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/ftp/accounts_add.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/ftp/accounts_add.tpl deleted file mode 100644 index 24d6cf8..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/ftp/accounts_add.tpl +++ /dev/null @@ -1,25 +0,0 @@ -$header -
- - - - - - - - - - - - - - - - - - -
 {$lng['ftp']['account_add']}
{$lng['panel']['path']}:{$pathSelect}
{$lng['login']['password']}:
-
-
-
-$footer diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/ftp/accounts_edit.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/ftp/accounts_edit.tpl deleted file mode 100644 index ffc75de..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/ftp/accounts_edit.tpl +++ /dev/null @@ -1,26 +0,0 @@ -$header -
- - - - - - - - - - - - - - - - - - - -
 {$lng['menue']['main']['changepassword']}
{$lng['login']['username']}:{$result['username']}
{$lng['login']['password']}:
-
-
-
-$footer \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/ftp/ftp.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/ftp/ftp.tpl deleted file mode 100644 index 4ea0215..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/ftp/ftp.tpl +++ /dev/null @@ -1,12 +0,0 @@ -$header - - - - - - - -
 {$lng['menue']['ftp']['ftp']}
{$lng['ftp']['description']}
-
-
-$footer \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/index/change_language.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/index/change_language.tpl deleted file mode 100644 index c2c45d9..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/index/change_language.tpl +++ /dev/null @@ -1,23 +0,0 @@ -$header -
- - - - - - - - - - - - - - - - -
 {$lng['menue']['main']['changelanguage']}
{$lng['login']['language']}
-
-
-
-$footer \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/index/change_password.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/index/change_password.tpl deleted file mode 100644 index 7aeebde..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/index/change_password.tpl +++ /dev/null @@ -1,34 +0,0 @@ -$header -
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
 {$lng['menue']['main']['changepassword']}
{$lng['changepassword']['old_password']}:
{$lng['changepassword']['new_password']}:
{$lng['changepassword']['new_password_confirm']}:
{$lng['changepassword']['also_change_ftp']}
-
-
-
-$footer \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/index/index.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/index/index.tpl deleted file mode 100644 index 22bb133..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/index/index.tpl +++ /dev/null @@ -1,76 +0,0 @@ -$header - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 {$lng['index']['customerdetails']}
{$lng['customer']['name']}:{$userinfo['firstname']} {$userinfo['name']}
{$lng['customer']['company']}:{$userinfo['company']}
{$lng['customer']['street']}:{$userinfo['street']}
{$lng['customer']['zipcode']}/{$lng['customer']['city']}:{$userinfo['zipcode']} {$userinfo['city']}
{$lng['customer']['email']}:{$userinfo['email']}
{$lng['customer']['customernumber']}:{$userinfo['customernumber']}
 {$lng['index']['accountdetails']}
{$lng['login']['username']}:{$userinfo['loginname']}
{$lng['customer']['domains']}:$domains
{$lng['customer']['subdomains']}:{$userinfo['subdomains_used']} ({$userinfo['subdomains']})
{$lng['customer']['diskspace']}:{$userinfo['diskspace_used']} ({$userinfo['diskspace']})
{$lng['customer']['traffic']} ($month):{$userinfo['traffic_used']} ({$userinfo['traffic']})
{$lng['customer']['emails']}:{$userinfo['emails_used']} ({$userinfo['emails']})
{$lng['customer']['accounts']}:{$userinfo['email_accounts_used']} ({$userinfo['email_accounts']})
{$lng['customer']['forwarders']}:{$userinfo['email_forwarders_used']} ({$userinfo['email_forwarders']})
{$lng['customer']['mysqls']}:{$userinfo['mysqls_used']} ({$userinfo['mysqls']})
{$lng['customer']['ftps']}:{$userinfo['ftps_used']} ({$userinfo['ftps']})
-
-
-$footer \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/mysql/mysql.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/mysql/mysql.tpl deleted file mode 100644 index 29bcfeb..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/mysql/mysql.tpl +++ /dev/null @@ -1,12 +0,0 @@ -$header - - - - - - - -
 {$lng['menue']['mysql']['mysql']}
{$lng['mysql']['description']}
-
-
-$footer \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/mysql/mysqls.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/mysql/mysqls.tpl deleted file mode 100644 index ffa7c27..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/mysql/mysqls.tpl +++ /dev/null @@ -1,25 +0,0 @@ -$header - - - - - - - - - - - - - - - $mysqls - - - - - -
 {$lng['menue']['mysql']['databases']}
{$lng['mysql']['databasename']}{$lng['mysql']['databasedescription']} 
{$lng['mysql']['database_create']}
{$lng['mysql']['database_create']}
-
-
-$footer \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/mysql/mysqls_add.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/mysql/mysqls_add.tpl deleted file mode 100644 index c046a8f..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/mysql/mysqls_add.tpl +++ /dev/null @@ -1,25 +0,0 @@ -$header -
- - - - - - - - - - - - - - - - - - -
 {$lng['mysql']['database_create']}
{$lng['mysql']['databasedescription']}:
{$lng['login']['password']}:
-
-
-
-$footer \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/mysql/mysqls_database.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/mysql/mysqls_database.tpl deleted file mode 100644 index a0d13f3..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/mysql/mysqls_database.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - {$row['databasename']} - {$row['description']} - {$lng['panel']['edit']} - {$lng['panel']['delete']} - \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/mysql/mysqls_edit.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/mysql/mysqls_edit.tpl deleted file mode 100644 index 5f100de..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/mysql/mysqls_edit.tpl +++ /dev/null @@ -1,30 +0,0 @@ -$header -
- - - - - - - - - - - - - - - - - - - - - - - -
 {$lng['menue']['main']['changepassword']}
{$lng['mysql']['databasename']}:{$result['databasename']}
{$lng['mysql']['databasedescription']}:
{$lng['changepassword']['new_password_ifnotempty']}:
-
-
-
-$footer \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/footer.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/footer.tpl deleted file mode 100644 index 0c539c0..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/footer.tpl +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - -
-
SysCP $version © 2003-2006 by the SysCP Team -
Templates by Luca Piona & Luca Longinotti -
  -
Valid XHTML 1.0 Transitional  Valid CSS! -
  -
- - diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/header.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/header.tpl deleted file mode 100644 index 4d70ce6..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/header.tpl +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - SysCP - - - - - - - - -
 
- - - - - - - -- -+ -+ -+ -+ -+ - - - -diff -Nru syscp-gentoo-comp/templates/customer/mysql/mysqls_add.tpl syscp-mysql-ftp-imp/templates/customer/mysql/mysqls_add.tpl ---- syscp-gentoo-comp/templates/customer/mysql/mysqls_add.tpl 2006-03-26 00:54:10.000000000 +0100 -+++ syscp-mysql-ftp-imp/templates/customer/mysql/mysqls_add.tpl 2006-03-26 00:54:43.000000000 +0100 -@@ -8,12 +8,16 @@ - - - -- -- -+ -+ -+ -+ -+ -+ - - -- -- -+ -+ - - - -diff -Nru syscp-gentoo-comp/templates/customer/mysql/mysqls_add_user.tpl syscp-mysql-ftp-imp/templates/customer/mysql/mysqls_add_user.tpl ---- syscp-gentoo-comp/templates/customer/mysql/mysqls_add_user.tpl 1970-01-01 01:00:00.000000000 +0100 -+++ syscp-mysql-ftp-imp/templates/customer/mysql/mysqls_add_user.tpl 2006-03-26 00:54:43.000000000 +0100 -@@ -0,0 +1,25 @@ -+$header -+ -+ -+ -+ -+
$navigation
  -
-
diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/login/login.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/login/login.tpl deleted file mode 100644 index 97ac4d8..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/login/login.tpl +++ /dev/null @@ -1,33 +0,0 @@ -$header -
-
-
-
- - - - - - - - - - - - - - - - - - - - -
 SysCP - Login
{$lng['login']['username']}:
{$lng['login']['password']}:
{$lng['login']['language']}:
-
-
-
-
-
-
-$footer diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/maincss.css b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/maincss.css deleted file mode 100644 index 6b71d74..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/maincss.css +++ /dev/null @@ -1,244 +0,0 @@ -body { - color : #000000; - font-family : Verdana, Arial, Helvetica, sans-serif; - font-size : 12px; -} - -.header { - background-image : url( '../images/header_r.gif' ); - background-repeat : repeat-x; -} - -.footer { - text-align : center; - border-color : #EBECF5; - border-style : solid; - border-width : 1px; - border-right : none; - border-left : none; - background-image : url( '../images/footer.gif' ); - background-repeat : repeat-y; -} - -.linea_ombra { - background-image : url( '../images/ombra.gif' ); - background-repeat : repeat-y; - background-position : top left; -} - -.sezione { - height : 25px; - background-image : url( '../images/sezione.gif' ); -} - -.sottosezione { - height : 25px; - background-image : url( '../images/sottosezione.gif' ); -} - -.finesezione { - height : 25px; - background-image : url( '../images/finesezione.gif' ); -} - -a,a:visited,a:active { - color : #000000; - text-decoration : underline; -} - -a:hover { - color : #F89826; - text-decoration : none; -} - -select,textarea { - color : black; - text-decoration : none; - font-family : Verdana, Arial, Helvetica, sans-serif; - font-size : 12px; - font-weight : bold; - border : 1px solid #B7B7B7; - background-color : #C6DEFF; -} - -select.tendina_nobordo { - color : black; - text-decoration : none; - font-family : Verdana, Arial, Helvetica, sans-serif; - font-size : 12px; - font-weight : bold; - border : 0px solid #B7B7B7; - background-color : #C6DEFF; -} - -textarea.textarea_nobordo { - color : black; - text-decoration : none; - font-family : Verdana, Arial, Helvetica, sans-serif; - font-size : 12px; - font-weight : bold; - border : 0px solid #B7B7B7; - background-color : #C6DEFF; -} - -textarea.textarea_bordo { - color : black; - text-decoration : none; - font-family : Verdana, Arial, Helvetica, sans-serif; - font-size : 12px; - font-weight : bold; - border : 1px solid #B7B7B7; - background-color : #C6DEFF; -} - -input { - color : black; - text-decoration : none; - font-family : Verdana, Arial, Helvetica, sans-serif; - font-size : 12px; - font-weight : bold; - border : 0px solid #B7B7B7; - background-color : #C6DEFF; -} - -input.bottone { - color : black; - text-decoration : none; - font-family : Verdana, Arial, Helvetica, sans-serif; - font-size : 12px; - font-weight : bold; - border : 1px solid #000000; - background-color : #C6DEFF; -} - -.install_tabella { - width : 90%; -} - -.install_tabella_60 { - width : 60%; -} - -.install_tabella_40 { - width : 40%; -} - -.install_titolo { - width : 90%; - background-color : #ABC9E8; - border-color : #000000; - border-style : solid; - border-width : 1px; - text-align : left; -} - -.titolo { - background-color : #ABC9E8; - border-color : #B7B7B7; - border-style : solid; - border-width : 1px; - border-top : none; - text-align : left; -} - -.install_nomecampo { - width : 84%; - background-color : #EBECF5; - border-color : #B7B7B7; - border-style : solid; - border-width : 1px; - text-align : left; -} - -.install_confermacampo { - width : 84%; - background-color : #EBECF5; - border-color : #B7B7B7; - border-style : solid; - border-width : 1px; - text-align : right; -} - -.nomecampo { - background-color : #EBECF5; - border-color : #B7B7B7; - border-style : solid; - border-width : 1px; - text-align : left; - border-top : none; - border-left : none; -} - -.nomecampo_nobordobasso { - background-color : #EBECF5; - border-color : #B7B7B7; - border-style : solid; - border-width : 1px; - text-align : left; - border-top : none; - border-bottom : none; -} - -.nomecampo_acenter { - background-color : #EBECF5; - border-color : #B7B7B7; - border-style : solid; - border-width : 1px; - text-align : center; - border-top : none; -} - -.nomecampo_acenter_nobordo { - height : 30px; - background-color : #EBECF5; - border-color : #B7B7B7; - border-style : solid; - border-width : 1px; - text-align : center; - border-top : none; - border-right : none; -} - -.nomecampo_bordosx { - background-color : #EBECF5; - border-color : #B7B7B7; - border-style : solid; - border-width : 1px; - text-align : left; - border-top : none; -} - -.install_campodisplay { - width : 6%; - background-color : #C6DEFF; - border-color : #B7B7B7; - border-style : solid; - border-width : 1px; -} - -.campodisplay { - background-color : #C6DEFF; - border-color : #B7B7B7; - border-style : solid; - border-width : 1px; - border-top : none; - border-left : none; -} - -.campodisplay_bordosx { - background-color : #C6DEFF; - border-color : #B7B7B7; - border-style : solid; - border-width : 1px; - border-top : none; -} - -.campodisplay_nobordobasso { - background-color : #C6DEFF; - border-color : #B7B7B7; - border-style : solid; - border-width : 1px; - border-top : none; - border-left : none; - border-bottom : none; -} diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/misc/error.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/misc/error.tpl deleted file mode 100644 index 60f95f3..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/misc/error.tpl +++ /dev/null @@ -1,13 +0,0 @@ -$header - - - - - - - - -
  {$lng['error']['error']}
$error
-
-
-$footer \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/misc/question_yesno.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/misc/question_yesno.tpl deleted file mode 100644 index a0f3511..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/misc/question_yesno.tpl +++ /dev/null @@ -1,18 +0,0 @@ -$header -
- - - $hiddenparams - - - - - - - - -
  {$lng['question']['question']}
$text 
-
-
-
-$footer \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/misc/standardcustomer/index.html b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/misc/standardcustomer/index.html deleted file mode 100644 index 82e2710..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/misc/standardcustomer/index.html +++ /dev/null @@ -1,11 +0,0 @@ - - - Gentoo-SysCP Defaultpage - - -

-
This domain was created using Gentoo-SysCP. -
There is no content on this domain yet. -

- - \ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/navigation_element.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/navigation_element.tpl deleted file mode 100644 index 26e1904..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/navigation_element.tpl +++ /dev/null @@ -1,12 +0,0 @@ -
- - - - - - - - - - -
   $completeLink_ElementTitle

$navigation_links
 
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/navigation_link.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/navigation_link.tpl deleted file mode 100644 index fded1da..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/navigation_link.tpl +++ /dev/null @@ -1,2 +0,0 @@ -   {$completeLink} -
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/syscp-1.2.13-gentoo-syscp-design-r3.tar.bz2 b/syscp/patches/gentoo-syscp-design/syscp-1.2.13-gentoo-syscp-design-r3.tar.bz2 deleted file mode 100644 index 0994344..0000000 Binary files a/syscp/patches/gentoo-syscp-design/syscp-1.2.13-gentoo-syscp-design-r3.tar.bz2 and /dev/null differ diff --git a/syscp/patches/italian-lang/italian.lng.php b/syscp/patches/italian-lang/italian.lng.php deleted file mode 100644 index 1021e11..0000000 --- a/syscp/patches/italian-lang/italian.lng.php +++ /dev/null @@ -1,407 +0,0 @@ - & Luca Longinotti - * @copyright (C) 2005 Luca Piona & Luca Longinotti - * @package Language - * @version $Id: $ - */ - - -/** - * Global - */ -$lng['panel']['edit'] = 'Modifica'; -$lng['panel']['delete'] = 'Cancella'; -$lng['panel']['create'] = 'Crea'; -$lng['panel']['save'] = 'Salva'; -$lng['panel']['yes'] = 'Si'; -$lng['panel']['no'] = 'No'; -$lng['panel']['emptyfornochanges'] = 'lasciare vuoto se non si vuole cambiare'; -$lng['panel']['emptyfordefault'] = 'lasciare vuoto per l\'impostazione di default'; -$lng['panel']['path'] = 'Percorso'; -$lng['panel']['toggle'] = 'Cambia'; -$lng['panel']['next'] = 'Prossimo'; -$lng['panel']['dirsmissing'] = 'Impossibile trovare o leggere la directory!'; - -/** - * Login - */ -$lng['login']['username'] = 'Nome Utente'; -$lng['login']['password'] = 'Password'; -$lng['login']['language'] = 'Lingua'; -$lng['login']['login'] = 'Login'; -$lng['login']['logout'] = 'Logout'; -$lng['login']['profile_lng'] = 'Scegli la lingua'; - -/** - * Customer - */ -$lng['customer']['documentroot'] = 'Cartella Principale'; -$lng['customer']['name'] = 'Cognome'; -$lng['customer']['firstname'] = 'Nome'; -$lng['customer']['company'] = 'Ditta'; -$lng['customer']['street'] = 'Via'; -$lng['customer']['zipcode'] = 'CAP'; -$lng['customer']['city'] = 'Città'; -$lng['customer']['phone'] = 'Telefono'; -$lng['customer']['fax'] = 'Fax'; -$lng['customer']['email'] = 'Email'; -$lng['customer']['customernumber'] = 'ID Cliente'; -$lng['customer']['diskspace'] = 'Spazio Web (MB)'; -$lng['customer']['traffic'] = 'Traffico (GB)'; -$lng['customer']['mysqls'] = 'Database MySQL'; -$lng['customer']['emails'] = 'Indirizzi Email'; -$lng['customer']['accounts'] = 'Account Email'; -$lng['customer']['forwarders'] = 'Reindirizzamenti Email'; -$lng['customer']['ftps'] = 'Account FTP'; -$lng['customer']['subdomains'] = 'Sottodomini'; -$lng['customer']['domains'] = 'Domini'; -$lng['customer']['unlimited'] = 'illimitati'; - -/** - * Customermenue - */ -$lng['menue']['main']['main'] = 'Principale'; -$lng['menue']['main']['changepassword'] = 'Cambia la password'; -$lng['menue']['main']['changelanguage'] = 'Cambia la lingua'; -$lng['menue']['email']['email'] = 'Email'; -$lng['menue']['email']['emails'] = 'Indirizzi'; -$lng['menue']['email']['webmail'] = 'WebMail'; -$lng['menue']['mysql']['mysql'] = 'MySQL'; -$lng['menue']['mysql']['databases'] = 'Database'; -$lng['menue']['mysql']['phpmyadmin'] = 'phpMyAdmin'; -$lng['menue']['domains']['domains'] = 'Domini'; -$lng['menue']['domains']['settings'] = 'Opzioni'; -$lng['menue']['ftp']['ftp'] = 'FTP'; -$lng['menue']['ftp']['accounts'] = 'Account'; -$lng['menue']['ftp']['webftp'] = 'WebFTP'; -$lng['menue']['extras']['extras'] = 'Extra'; -$lng['menue']['extras']['directoryprotection'] = 'Cartelle Protette'; -$lng['menue']['extras']['pathoptions'] = 'Opzioni Cartelle'; - -/** - * Index - */ -$lng['index']['customerdetails'] = 'Dettagli Cliente'; -$lng['index']['accountdetails'] = 'Dettagli Account'; - -/** - * Change Password - */ -$lng['changepassword']['old_password'] = 'Vecchia password'; -$lng['changepassword']['new_password'] = 'Nuova password'; -$lng['changepassword']['new_password_confirm'] = 'Nuova password (verifica)'; -$lng['changepassword']['new_password_ifnotempty'] = 'Nuova password (vuota = non cambia)'; -$lng['changepassword']['also_change_ftp'] = ' cambia la password dell\'account FTP principale?'; - -/** - * Domains - */ -$lng['domains']['description'] = 'Qui puoi creare (sotto)domini e cambiare il loro percorso.
Il sistema, dopo ogni cambiamento, necessita di un po\' di tempo per applicare le nuove impostazioni.'; -$lng['domains']['domainsettings'] = 'Opzioni del dominio'; -$lng['domains']['domainname'] = 'Nome del dominio'; -$lng['domains']['subdomain_add'] = 'Crea sottodominio'; -$lng['domains']['subdomain_edit'] = 'Modifica il (sotto)dominio'; -$lng['domains']['wildcarddomain'] = 'Crea una wildcarddomain?'; -$lng['domains']['aliasdomain'] = 'Alias per questo dominio'; -$lng['domains']['noaliasdomain'] = 'Nessun alias per il dominio'; - -/** - * eMails - */ -$lng['emails']['description'] = 'Qui puoi creare e cambiare i tuoi indirizzi Email.
Un account è come la bucalettere davanti a casa tua. Se qualcuno ti manda un\'Email, essa sarà recapitata all\'interno del tuo account.

Per scaricare le tue Email usa le seguenti impostazioni nel tuo programma di posta elettronica: (I dati scritti in corsivo vanno cambiati con i tuoi!)
Hostname: Nome del dominio
Username: Nome dell\'account / Indirizzo Email
Password: La password scelta'; -$lng['emails']['emailaddress'] = 'Indirizzo Email'; -$lng['emails']['emails_add'] = 'Crea indirizzo Email'; -$lng['emails']['emails_edit'] = 'Modifica indirizzo Email'; -$lng['emails']['catchall'] = 'Catch-all'; -$lng['emails']['iscatchall'] = 'Definisci come indirizzo catch-all?'; -$lng['emails']['account'] = 'Account'; -$lng['emails']['account_add'] = 'Crea account'; -$lng['emails']['account_delete'] = 'Cancella account'; -$lng['emails']['from'] = 'Da'; -$lng['emails']['to'] = 'Per'; -$lng['emails']['forwarders'] = 'Reindirizzamenti'; -$lng['emails']['forwarder_add'] = 'Crea reindirizzamento'; - -/** - * FTP - */ -$lng['ftp']['description'] = 'Qui puoi creare e modificare i tuoi account FTP.
I cambiamenti sono effettuati in tempo reale e gli account si possono usare immediatamente.'; -$lng['ftp']['account_add'] = 'Crea account'; - -/** - * MySQL - */ -$lng['mysql']['description'] = 'Qui puoi creare e modificare i tuoi database MySQL.
I cambiamenti sono effettuati in tempo reale e i databases si possono usare immediatamente.
Nel menù di sinistra trovi il tool phpMyAdmin con il quale potrai comodamente amministrare i tuoi databases attraverso il tuo web-browser.

Per utilizzare i database nei vostri script PHP, utilizzate le seguenti impostazioni: (I dati scritti in corsivo vanno cambiati con i tuoi!)
Hostname: localhost
Username: L\'username scelto
Password: La password scelta per quell\'username
Database: Nome del database'; -$lng['mysql']['databasename'] = 'Nome database'; -$lng['mysql']['databasedescription'] = 'Descrizione database'; -$lng['mysql']['database_create'] = 'Crea database'; - -/** - * Extras - */ -$lng['extras']['description'] = 'Qui puoi aggiungere alcune opzioni extra, per esempio impostare delle cartelle protette.
Il sistema, dopo ogni cambiamento, necessita di un po\' di tempo per applicare le nuove impostazioni.'; -$lng['extras']['directoryprotection_add'] = 'Aggiungi protezione cartella'; -$lng['extras']['view_directory'] = 'Mostra protezione cartella'; -$lng['extras']['pathoptions_add'] = 'Aggiungi opzioni cartella'; -$lng['extras']['directory_browsing'] = 'Visualizza file e cartelle'; -$lng['extras']['pathoptions_edit'] = 'Modifica opzioni cartella'; -$lng['extras']['error404path'] = '404'; -$lng['extras']['error403path'] = '403'; -$lng['extras']['error500path'] = '500'; -$lng['extras']['error401path'] = '401'; -$lng['extras']['errordocument404path'] = 'URL to ErrorDocument 404'; -$lng['extras']['errordocument403path'] = 'URL to ErrorDocument 403'; -$lng['extras']['errordocument500path'] = 'URL to ErrorDocument 500'; -$lng['extras']['errordocument401path'] = 'URL to ErrorDocument 401'; - -/** - * Errors - */ -$lng['error']['error'] = 'Errore'; -$lng['error']['directorymustexist'] = 'La cartella %s deve esistere. Per favore creala tramite il tuo client FTP.'; -$lng['error']['filemustexist'] = 'Il file %s deve esistere.'; -$lng['error']['allresourcesused'] = 'Hai già usato tutte le tue risorse.'; -$lng['error']['domains_cantdeletemaindomain'] = 'Non puoi cancellare un dominio usato come dominio Email.'; -$lng['error']['domains_canteditdomain'] = 'Non puoi modificare questo dominio. La funzione è stata disabilitata dall\'admin.'; -$lng['error']['domains_cantdeletedomainwithemail'] = 'Non puoi cancellare un dominio usato come dominio Email. Cancella prima tutti gli indirizzi Email che lo utilizzano.'; -$lng['error']['firstdeleteallsubdomains'] = 'Prima di creare un dominio wildcard, cancella tutti i sottodomini presenti per quel dominio.'; -$lng['error']['youhavealreadyacatchallforthisdomain'] = 'Hai già definito un catchall per questo dominio.'; -$lng['error']['ftp_cantdeletemainaccount'] = 'Non puoi cancellare il tuo account FTP principale.'; -$lng['error']['login'] = 'Il nome utente o la password da te immessi sono incorretti. Per favore riprova!'; -$lng['error']['login_blocked'] = 'Questo account è stato sospeso per i troppi tentativi di login falliti.
Riprovi tra '.$settings['login']['deactivatetime'].' secondi.'; -$lng['error']['notallreqfieldsorerrors'] = 'Alcuni campi sono stati lasciati vuoti o sono stati riempiti incorrettamente.'; -$lng['error']['oldpasswordnotcorrect'] = 'La vecchia password non è corretta.'; -$lng['error']['youcantallocatemorethanyouhave'] = 'Non puoi assegnare più risorse di quante ne possieda tu stesso.'; -$lng['error']['youcantdeletechangemainadmin'] = 'Non puoi cancellare o modificare l\'admin principale per ragioni di sicurezza.'; -$lng['error']['mustbeurl'] = 'Non hai inserito un\'indirizzo valido o completo (per es. http://qualchedominio.com/errore404.htm).'; -$lng['error']['invalidpath'] = 'Non hai scelto un\'indirizzo valido.'; -$lng['error']['stringisempty'] ='Manca il dato nel campo.'; -$lng['error']['stringiswrong'] ='Dato incorretto.'; -$lng['error']['myloginname'] = '\''.$lng['login']['username'].'\''; -$lng['error']['mypassword'] = '\''.$lng['login']['password'].'\''; -$lng['error']['oldpassword'] = '\''.$lng['changepassword']['old_password'].'\''; -$lng['error']['newpassword'] = '\''.$lng['changepassword']['new_password'].'\''; -$lng['error']['newpasswordconfirm']= '\''.$lng['changepassword']['new_password_confirm'].'\''; -$lng['error']['newpasswordconfirmerror']='La nuova password non corrisponde a quella vecchia.'; -$lng['error']['myname'] = '\''.$lng['customer']['name'].'\''; -$lng['error']['myfirstname'] = '\''.$lng['customer']['firstname'].'\''; -$lng['error']['emailadd'] = '\''.$lng['customer']['email'].'\''; -$lng['error']['mydomain'] = '\'Dominio\''; -$lng['error']['mydocumentroot'] = '\'Documentroot\''; -$lng['error']['loginnameexists']= 'Il login %s esiste già.'; -$lng['error']['emailiswrong']= 'L\'indirizzo Email %s contiene caratteri invalidi o è incompleto.'; -$lng['error']['loginnameiswrong']= 'Il login %s contiene caratteri invalidi.'; -$lng['error']['userpathcombinationdupe']='La combinazione tra nome utente e percorso esiste già.'; -$lng['error']['patherror']='Errore! Il percorso non può essere vuoto.'; -$lng['error']['errordocpathdupe']='Le opzioni per la cartella %s esistono già.'; -$lng['error']['adduserfirst']='Per favore crea prima un utente ...'; -$lng['error']['domainalreadyexists']= 'Il dominio %s è già assegnato ad un cliente.'; -$lng['error']['nolanguageselect']='Nessuna lingua selezionata.'; -$lng['error']['nosubjectcreate']='Devi definire un titolo per questo template Email.'; -$lng['error']['nomailbodycreate']='Devi definiro un testo per questo template Email.'; -$lng['error']['templatenotfound']='Il template non è stato trovato.'; -$lng['error']['alltemplatesdefined']='Non puoi definire altri template, tutte le lingue sono già definite.'; -$lng['error']['wwwnotallowed']='www non è ammesso come sottodominio.'; -$lng['error']['subdomainiswrong']='Il sottodominio %s contiene caratteri invalidi.'; -$lng['error']['domaincantbeempty']='Il nome dominio non può essere vuoto.'; -$lng['error']['domainexistalready']='Il dominio %s esiste già.'; -$lng['error']['domainisaliasorothercustomer']='Il dominio alias selezionato è a sua volta un dominio alias o appartiene ad un altro cliente.'; -$lng['error']['emailexistalready']='L\'indirizzo Email %s esiste già.'; -$lng['error']['maindomainnonexist']='Il dominio principale %s non esiste.'; -$lng['error']['destinationnonexist']='Per favore crea il tuo reindirizzamento nel campo \'Destinazione\'.'; -$lng['error']['destinationalreadyexistasmail']='Il reindirizzamento a %s esiste già come indirizzo Email attivo.'; -$lng['error']['destinationalreadyexist']='Hai già definito un reindirizzamento per %s .'; -$lng['error']['destinationiswrong']= 'Il reindirizzamento %s contiene caratteri invalidi o è incompleto.'; -$lng['error']['domainname']=$lng['domains']['domainname']; - -/** - * Questions - */ -$lng['question']['question'] = 'Domanda di sicurezza'; -$lng['question']['admin_customer_reallydelete'] = 'Sei sicuro di voler cancellare il cliente %s? Quest\'azione non potrà essere annullata!'; -$lng['question']['admin_domain_reallydelete'] = 'Sei sicuro di voler cancellare il dominio %s?'; -$lng['question']['admin_domain_reallydisablesecuritysetting'] = 'Sei sicuro di voler disattivare queste opzioni di sicurezza (OpenBasedir e/o SafeMode)?'; -$lng['question']['admin_admin_reallydelete'] = 'Sei sicuro di voler cancellare l\'admin %s? Tutti i clienti e i domini saranno affidati all\'amministratore principale.'; -$lng['question']['admin_template_reallydelete'] = 'Sei sicuro di voler cancellare il template \'%s\'?'; -$lng['question']['domains_reallydelete'] = 'Sei sicuro di voler cancellare il dominio %s?'; -$lng['question']['email_reallydelete'] = 'Sei sicuro di voler cancellare l\'indirizzo Email %s?'; -$lng['question']['email_reallydelete_account'] = 'Sei sicuro di voler cancellare l\'account Email di %s?'; -$lng['question']['email_reallydelete_forwarder'] = 'Sei sicuro di voler cancellare il reindirizzamento a %s?'; -$lng['question']['extras_reallydelete'] = 'Sei sicuro di voler cancellare la protezione per la cartella %s?'; -$lng['question']['extras_reallydelete_pathoptions'] = 'Sei sicuro di voler cancellare le opzioni cartella per %s?'; -$lng['question']['ftp_reallydelete'] = 'Sei sicuro di voler cancellare l\'account FTP %s?'; -$lng['question']['mysql_reallydelete'] = 'Sei sicuro di voler cancellare il database %s? Quest\'azione non potrà essere annullata!'; -$lng['question']['admin_configs_reallyrebuild'] = 'Sei sicuro di voler rigenerare i file di configurazione per Apache e Bind?'; - -/** - * Mails - */ -$lng['mails']['pop_success']['mailbody'] = 'Salve,\n\nil tuo indirizzo Email {EMAIL}\nè stato configurato con successo.\n\nQuesta è un\'Email creata automaticamente,\n per favore non rispondere!\n\nCordiali saluti, SysCP-Team.'; -$lng['mails']['pop_success']['subject'] = 'Indirizzo Email configurato con successo'; -$lng['mails']['createcustomer']['mailbody'] = 'Salve {FIRSTNAME} {NAME},\n\nqueste sono le informazioni per il tuo account:\n\nNome Utente: {USERNAME}\nPassword: {PASSWORD}\n\nGrazie,\nSysCP-Team.'; -$lng['mails']['createcustomer']['subject'] = 'Informazioni account'; - -/** - * Admin - */ -$lng['admin']['overview'] = 'Visione d\'insieme'; -$lng['admin']['ressourcedetails'] = 'Risorse utilizzate'; -$lng['admin']['systemdetails'] = 'Dettagli sistema'; -$lng['admin']['syscpdetails'] = 'Dettagli SysCP'; -$lng['admin']['installedversion'] = 'Versione installata'; -$lng['admin']['latestversion'] = 'Ultima versione disponibile'; -$lng['admin']['lookfornewversion']['clickhere'] = 'Cerca sul web'; -$lng['admin']['lookfornewversion']['error'] = 'Errore durante la lettura'; -$lng['admin']['resources'] = 'Risorse'; -$lng['admin']['customer'] = 'Cliente'; -$lng['admin']['customers'] = 'Clienti'; -$lng['admin']['customer_add'] = 'Crea cliente'; -$lng['admin']['customer_edit'] = 'Modifica cliente'; -$lng['admin']['domains'] = 'Domini'; -$lng['admin']['domain_add'] = 'Crea dominio'; -$lng['admin']['domain_edit'] = 'Modifica dominio'; -$lng['admin']['subdomainforemail'] = 'Sottodominio utilizzabile come dominio Email'; -$lng['admin']['admin'] = 'Admin'; -$lng['admin']['admins'] = 'Admin'; -$lng['admin']['admin_add'] = 'Crea admin'; -$lng['admin']['admin_edit'] = 'Modifica admin'; -$lng['admin']['customers_see_all'] = 'Può vedere tutti i clienti?'; -$lng['admin']['domains_see_all'] = 'Può vedere tutti i domini?'; -$lng['admin']['change_serversettings'] = 'Può cambiare le impostazioni del server?'; -$lng['admin']['server'] = 'Server'; -$lng['admin']['serversettings'] = 'Opzioni'; -$lng['admin']['rebuildconf'] = 'Rigenera file di configurazione'; -$lng['admin']['stdsubdomain'] = 'Sottodominio standard'; -$lng['admin']['stdsubdomain_add'] = 'Crea sottodominio standard'; -$lng['admin']['deactivated'] = 'Disattiva'; -$lng['admin']['deactivated_user'] = 'Disattiva utente'; -$lng['admin']['sendpassword'] = 'Invia password'; -$lng['admin']['ownvhostsettings'] = 'Impostazioni vHost speciali'; -$lng['admin']['configfiles']['serverconfiguration'] = 'Configurazione servizi'; -$lng['admin']['configfiles']['files'] = 'File di configurazione: Per favore cambia questi file o creali
se non esistono, con il seguente contenuto.
NOTA: La password di MySQL non è stata rimpiazzata per ragioni di sicurezza.
Per favore rimpiazza "MYSQL_PASSWORD" con la password MySQL dell\'utente syscp. Se hai dimenticato la password per MySQL
la trovi in "lib/userdata.inc.php".'; -$lng['admin']['configfiles']['commands'] = 'Comandi: Per favore esegui i seguenti comandi in una shell.'; -$lng['admin']['configfiles']['restart'] = 'Ricarica: Per favore esegui i seguenti comandi (in ordine) in una shell per ricaricare la configurazione.'; -$lng['admin']['templates']['templates'] = 'Template'; -$lng['admin']['templates']['template_add'] = 'Aggiungi template'; -$lng['admin']['templates']['template_edit'] = 'Modifica template'; -$lng['admin']['templates']['action'] = 'Azione'; -$lng['admin']['templates']['email'] = 'Email'; -$lng['admin']['templates']['subject'] = 'Soggetto:'; -$lng['admin']['templates']['mailbody'] = 'Testo dell\'Email'; -$lng['admin']['templates']['createcustomer'] = 'Email di benvenuto per i nuovi clienti'; -$lng['admin']['templates']['pop_success'] = 'Benevenuto per ogni nuovo account Email'; -$lng['admin']['templates']['template_replace_vars'] = 'Variabili da cambiare nel template:'; -$lng['admin']['templates']['FIRSTNAME'] = 'Rimpiazzato con il nome del cliente.'; -$lng['admin']['templates']['NAME'] = 'Rimpiazzato con il cognome del cliente.'; -$lng['admin']['templates']['USERNAME'] = 'Rimpiazzato con il nome utente dell\'account.'; -$lng['admin']['templates']['PASSWORD'] = 'Rimpiazzato con la password dell\'account.'; -$lng['admin']['templates']['EMAIL'] = 'Rimapiazzato con l\'indirizzo dell\'account.'; - -/** - * Serversettings - */ -$lng['serversettings']['session_timeout']['title'] = 'Timeout della sessione'; -$lng['serversettings']['session_timeout']['description'] = 'Quanto tempo un utente deve rimanere inattivo prima che la sessione diventi invalida (secondi)?'; -$lng['serversettings']['accountprefix']['title'] = 'Prefisso Cliente'; -$lng['serversettings']['accountprefix']['description'] = 'Che prefisso dovrebbero avere gli account dei clienti?'; -$lng['serversettings']['mysqlprefix']['title'] = 'Prefisso SQL'; -$lng['serversettings']['mysqlprefix']['description'] = 'Che prefisso dovrebbero avere i database SQL?'; -$lng['serversettings']['ftpprefix']['title'] = 'Prefisso FTP'; -$lng['serversettings']['ftpprefix']['description'] = 'Che prefisso dovrebbero avere gli account FTP?'; -$lng['serversettings']['documentroot_prefix']['title'] = 'Cartella dati web'; -$lng['serversettings']['documentroot_prefix']['description'] = 'Dove devono essere immagazzinati tutti i dati web?'; -$lng['serversettings']['logfiles_directory']['title'] = 'Cartella logfiles'; -$lng['serversettings']['logfiles_directory']['description'] = 'Dove devono essere immagazzinati tutti i log?'; -$lng['serversettings']['ipaddress']['title'] = 'Indirizzo IP'; -$lng['serversettings']['ipaddress']['description'] = 'Qual\'è l\'indirizzo IP di questo server?'; -$lng['serversettings']['hostname']['title'] = 'Hostname'; -$lng['serversettings']['hostname']['description'] = 'QUal\'è l\'hostname di questo server?'; -$lng['serversettings']['apacheconf_directory']['title'] = 'Cartella configurazione Apache'; -$lng['serversettings']['apacheconf_directory']['description'] = 'Dove sono i file di configurazione per Apache?'; -$lng['serversettings']['apachereload_command']['title'] = 'Comando riavvio Apache'; -$lng['serversettings']['apachereload_command']['description'] = 'Qual\'è il comando per riavviare Apache?'; -$lng['serversettings']['bindconf_directory']['title'] = 'Cartella configurazione Bind'; -$lng['serversettings']['bindconf_directory']['description'] = 'Dove sono i file di configurazione per Bind?'; -$lng['serversettings']['bindreload_command']['title'] = 'Comando riavvio Bind'; -$lng['serversettings']['bindreload_command']['description'] = 'Qual\'è il comando per riavviare Bind?'; -$lng['serversettings']['binddefaultzone']['title'] = 'Zona di default Bind'; -$lng['serversettings']['binddefaultzone']['description'] = 'Qual\'è il nome della zona di default Bind?'; -$lng['serversettings']['vmail_uid']['title'] = 'UID Email'; -$lng['serversettings']['vmail_uid']['description'] = 'Che UserID dovrebbe avere l\'utente che gestisce le Email?'; -$lng['serversettings']['vmail_gid']['title'] = 'GID Email'; -$lng['serversettings']['vmail_gid']['description'] = 'Che GroupID dovrebbe avere l\'utente che gestisce le Email?'; -$lng['serversettings']['vmail_homedir']['title'] = 'Cartella Email'; -$lng['serversettings']['vmail_homedir']['description'] = 'Dove devono essere immagazzinate tutte le Email?'; -$lng['serversettings']['adminmail']['title'] = 'Mittente'; -$lng['serversettings']['adminmail']['description'] = 'Qual\'è l\'indirizzo del mittente delle Email provenienti dal pannello?'; -$lng['serversettings']['phpmyadmin_url']['title'] = 'URL phpMyAdmin'; -$lng['serversettings']['phpmyadmin_url']['description'] = 'Qual\'è l\'URL di phpMyAdmin? (deve cominciare per http://)'; -$lng['serversettings']['webmail_url']['title'] = 'URL WebMail'; -$lng['serversettings']['webmail_url']['description'] = 'Qual\'è l\'URL della WebMail? (deve cominciare per http://)'; -$lng['serversettings']['webftp_url']['title'] = 'URL WebFTP'; -$lng['serversettings']['webftp_url']['description'] = 'Qual\'è l\'URL del WebFTP? (deve cominciare per http://)'; -$lng['serversettings']['language']['description'] = 'Qual\'è la lingua standard del tuo server?'; -$lng['serversettings']['maxloginattempts']['title'] = 'Numero massimo tentativi login'; -$lng['serversettings']['maxloginattempts']['description'] = 'Numero massimo di tentativi di login prima che l\'account sia disattivato.'; -$lng['serversettings']['deactivatetime']['title'] = 'Durata disattivamento'; -$lng['serversettings']['deactivatetime']['description'] = 'Tempo (sec.) di disattivazione dell\'account dopo troppi tentativi di login.'; -$lng['serversettings']['pathedit']['title'] = 'Modalità di scelta percorsi/cartelle'; -$lng['serversettings']['pathedit']['description'] = 'Un percorso/cartella andrà scelto attraverso un menu a tendina o inserendolo a mano?'; - -/** - * New strings - */ -$lng['admin']['cronlastrun'] = 'Ultimo Cronjob'; -$lng['serversettings']['apacheconf_filename']['title'] = 'Nome file configurazione Apache'; -$lng['serversettings']['apacheconf_filename']['description'] = 'Come dovrebbe chiamarsi il file di configurazione di Apache?'; -$lng['serversettings']['paging']['title'] = 'Elementi da visualizzare per pagina'; -$lng['serversettings']['paging']['description'] = 'Quanti elementi dovrebbero essere visualizzati su una pagina? (0 = disattiva impaginazione)'; -$lng['error']['ipstillhasdomains']= 'La combinazione IP/Porta che vuoi eliminare ha ancora dei domini assegnati, per favore riassegna questi domini ad altre combinazioni IP/Porta prima di eliminare questa.'; -$lng['error']['cantdeletedefaultip'] = 'Non puoi eliminare la combinazione IP/Porta default dei rivenditori, per favore imposta un\'altra combinazione IP/Porta come default dei rivenditori prima di eliminare questa.'; -$lng['error']['cantdeletesystemip'] = 'Non puoi eliminare l\'ultima IP di sistema, crea un\'altra combinazione IP/Porta per l\'IP di sistema o cambia l\'IP di sistema.'; -$lng['error']['myipaddress'] = '\'IP\''; -$lng['error']['myport'] = '\'Porta\''; -$lng['error']['myipdefault'] = 'Devi selezionare una combinazione IP/Porta che diventerà default.'; -$lng['error']['myipnotdouble'] = 'Questa combinazione IP/Porta esiste già.'; -$lng['question']['admin_ip_reallydelete'] = 'Vuoi veramente eliminare l\'indirizzo IP %s?'; -$lng['admin']['ipsandports']['ipsandports'] = 'IP e Porte'; -$lng['admin']['ipsandports']['add'] = 'Aggiungi IP/Porta'; -$lng['admin']['ipsandports']['edit'] = 'Modifica IP/Porta'; -$lng['admin']['ipsandports']['ipandport'] = 'IP/Porta'; -$lng['admin']['ipsandports']['ip'] = 'IP'; -$lng['admin']['ipsandports']['port'] = 'Porta'; -$lng['admin']['ipsandports']['default'] = 'IP/Porta default dei rivenditori'; -$lng['error']['cantchangesystemip'] = 'Non puoi cambiare l\'ultima IP di sistema, crea un\'altra combinazione IP/Porta per l\'IP di sistema o cambia l\'IP di sistema.'; -$lng['question']['admin_domain_reallydocrootoutofcustomerroot'] = 'Sei sicuro di volere la cartella base dei dati web di questo dominio al di fuori della cartella base del cliente?'; -$lng['menue']['mysql']['users'] = 'Utenti'; -$lng['mysql']['databaseuser'] = 'Utente database'; -$lng['mysql']['databasesuffix'] = 'Suffisso database'; -$lng['mysql']['password_confirm'] = 'Password (conferma)'; -$lng['mysql']['database_create_user'] = 'Crea utente'; -$lng['mysql']['database_change'] = 'Cambia impostazioni database'; -$lng['mysql']['database_change_user'] = 'Cambia impostazioni utente'; -$lng['error']['passwordnomatch'] = 'Le password inserite non corrispondono.'; -$lng['error']['missingdbuser'] = 'Devi selezionare un utente per il database!'; -$lng['error']['nodbuseryet'] = 'Devi prima creare un utente database!'; -$lng['error']['dbuserstillhasdb'] = 'Non puoi eliminare questo utente database, ha ancora dei database assegnati!
Per favore prima riassegna od elimina tutti i database assegnati a questo utente.'; -$lng['question']['mysql_reallydelete_user'] = 'Vuoi veramente eliminare l\'utente %s? Quest\'azione non potrà essere annullata!'; -$lng['ftp']['ftpsuffix'] = 'Suffisso account'; -$lng['extras']['view_execcgi'] = 'Permetti esecuzione CGI'; -$lng['extras']['directory_execcgi'] = 'Esegui script CGI'; -$lng['extras']['php4'] = 'PHP4'; -$lng['extras']['php5'] = 'PHP5'; -$lng['extras']['view_phpversionselect'] = 'Versione PHP'; -$lng['extras']['directory_phpversionselect'] = 'Versione PHP abilitata'; -?> \ No newline at end of file diff --git a/syscp/patches/mysql-ftp-patch/syscp-1.2.13-mysql-ftp-patch-r3.tar.bz2 b/syscp/patches/mysql-ftp-patch/syscp-1.2.13-mysql-ftp-patch-r3.tar.bz2 deleted file mode 100644 index 7f76972..0000000 Binary files a/syscp/patches/mysql-ftp-patch/syscp-1.2.13-mysql-ftp-patch-r3.tar.bz2 and /dev/null differ diff --git a/syscp/patches/mysql-ftp-patch/syscp-1.2.13-mysqli-ftpi.patch b/syscp/patches/mysql-ftp-patch/syscp-1.2.13-mysqli-ftpi.patch deleted file mode 100644 index eeaf12e..0000000 --- a/syscp/patches/mysql-ftp-patch/syscp-1.2.13-mysqli-ftpi.patch +++ /dev/null @@ -1,712 +0,0 @@ -diff -Nru syscp-gentoo-comp/admin_customers.php syscp-mysql-ftp-imp/admin_customers.php ---- syscp-gentoo-comp/admin_customers.php 2006-03-26 00:52:39.000000000 +0100 -+++ syscp-mysql-ftp-imp/admin_customers.php 2006-03-26 00:54:43.000000000 +0100 -@@ -158,20 +158,24 @@ - if(isset($_POST['send']) && $_POST['send']=='send') - { - $databases=$db->query("SELECT * FROM ".TABLE_PANEL_DATABASES." WHERE customerid='$id'"); -+ $databasesusers=$db->query("SELECT * FROM ".TABLE_PANEL_DATABASES_USERS." WHERE customerid='$id'"); - $db_root=new db($sql['host'],$sql['root_user'],$sql['root_password'],''); - unset($db_root->password); - while($row_database=$db->fetch_array($databases)) - { -- $db_root->query( 'REVOKE ALL PRIVILEGES ON * . * FROM `' . $row_database['databasename'] . '`@' . $settings['system']['mysql_access_host'] . ';' ); -- $db_root->query( 'REVOKE ALL PRIVILEGES ON `' . str_replace ( '_' , '\_' , $row_database['databasename'] ) . '` . * FROM `' . $row_database['databasename'] . '`@' . $settings['system']['mysql_access_host'] . ';' ); -- $db_root->query( 'DELETE FROM `mysql`.`user` WHERE `User` = "' . $row_database['databasename'] . '" AND `Host` = "' . $settings['system']['mysql_access_host'] . '"' ); - $db_root->query( 'DROP DATABASE IF EXISTS `' . $row_database['databasename'] . '`' ); - } -+ while($row_databaseuser=$db->fetch_array($databasesusers)) -+ { -+ $db_root->query( 'REVOKE ALL PRIVILEGES ON * . * FROM `' . $row_databaseuser['databaseuser'] . '`@' . $settings['system']['mysql_access_host'] . ';' ); -+ $db_root->query( 'DELETE FROM `mysql`.`user` WHERE `User` = "' . $row_databaseuser['databaseuser'] . '" AND `Host` = "' . $settings['system']['mysql_access_host'] . '"' ); -+ } - $db_root->query('FLUSH PRIVILEGES;'); - $db_root->close(); - - $db->query("DELETE FROM `".TABLE_PANEL_CUSTOMERS."` WHERE `customerid`='$id'"); - $db->query("DELETE FROM `".TABLE_PANEL_DATABASES."` WHERE `customerid`='$id'"); -+ $db->query("DELETE FROM `".TABLE_PANEL_DATABASES_USERS."` WHERE `customerid`='$id'"); - $db->query("DELETE FROM `".TABLE_PANEL_DOMAINS."` WHERE `customerid`='$id'"); - $domains_deleted = $db->affected_rows(); - $db->query("DELETE FROM `".TABLE_PANEL_HTPASSWDS."` WHERE `customerid`='$id'"); -diff -Nru syscp-gentoo-comp/admin_settings.php syscp-mysql-ftp-imp/admin_settings.php ---- syscp-gentoo-comp/admin_settings.php 2006-03-26 00:52:22.000000000 +0100 -+++ syscp-mysql-ftp-imp/admin_settings.php 2006-03-26 00:54:43.000000000 +0100 -@@ -111,10 +111,10 @@ - $update_users = '"' . $sql['user'] . '", "' . $sql['root_user'] . '"' ; - - // Update all customer databases -- $databases = $db->query('SELECT `databasename` FROM `' . TABLE_PANEL_DATABASES . '`;'); -+ $databases = $db->query('SELECT `databaseuser` FROM `' . TABLE_PANEL_DATABASES_USERS . '`;'); - while ( $database = $db->fetch_array ( $databases ) ) - { -- $update_users .= ', "' . $database['databasename'] .'"' ; -+ $update_users .= ', "' . $database['databaseuser'] .'"' ; - } - - // Do the update -diff -Nru syscp-gentoo-comp/customer_ftp.php syscp-mysql-ftp-imp/customer_ftp.php ---- syscp-gentoo-comp/customer_ftp.php 2006-03-26 00:52:22.000000000 +0100 -+++ syscp-mysql-ftp-imp/customer_ftp.php 2006-03-26 00:54:43.000000000 +0100 -@@ -162,10 +162,17 @@ - { - standard_error('patherror'); - } -- - else - { -- $username=$userinfo['loginname'].$settings['customer']['ftpprefix'].(intval($userinfo['ftp_lastaccountnumber'])+1); -+ $usernamesuffix=addslashes($_POST['usernamesuffix']); -+ if($usernamesuffix=='') -+ { -+ $username=$userinfo['loginname'].$settings['customer']['ftpprefix'].(intval($userinfo['ftp_lastaccountnumber'])+1); -+ } -+ else -+ { -+ $username=$userinfo['loginname'].$settings['customer']['ftpprefix'].(intval($userinfo['ftp_lastaccountnumber'])+1).'_'.$usernamesuffix; -+ } - $db->query("INSERT INTO `".TABLE_FTP_USERS."` (`customerid`, `username`, `password`, `homedir`, `login_enabled`, `uid`, `gid`) VALUES ('".$userinfo['customerid']."', '$username', ENCRYPT('$password'), '$path', 'y', '".$userinfo['guid']."', '".$userinfo['guid']."')"); - $db->query("UPDATE `".TABLE_FTP_GROUPS."` SET `members`=CONCAT_WS(',',`members`,'".$username."') WHERE `customerid`='".$userinfo['customerid']."' AND `gid`='".$userinfo['guid']."'"); - // $db->query("INSERT INTO `".TABLE_FTP_GROUPS."` (`customerid`, `groupname`, `gid`, `members`) VALUES ('".$userinfo['customerid']."', '$username', '$uid', '$username')"); -diff -Nru syscp-gentoo-comp/customer_mysql.php syscp-mysql-ftp-imp/customer_mysql.php ---- syscp-gentoo-comp/customer_mysql.php 2006-03-26 00:52:22.000000000 +0100 -+++ syscp-mysql-ftp-imp/customer_mysql.php 2006-03-26 00:54:43.000000000 +0100 -@@ -11,8 +11,9 @@ - * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * -- * @author Florian Lippert -+ * @author Florian Lippert , Luca Longinotti - * @copyright (C) 2003-2004 Florian Lippert -+ * @copyright (C) 2006 Luca Longinotti - * @package Panel - * @version $Id: customer_mysql.php 213 2005-08-11 21:28:10Z flo $ - */ -@@ -42,7 +43,7 @@ - { - if($action=='') - { -- $result=$db->query( "SELECT `id`, `databasename`, `description` FROM `" . TABLE_PANEL_DATABASES . "` WHERE `customerid`='" . $userinfo['customerid'] . "' ORDER BY `databasename` ASC" ); -+ $result=$db->query( 'SELECT `id`, `databaseuser`, `databasename`, `description` FROM `' . TABLE_PANEL_DATABASES . '` WHERE `customerid`="' . $userinfo['customerid'] . '" ORDER BY `databasename` ASC' ); - $mysqls=''; - while($row=$db->fetch_array($result)) - { -@@ -50,13 +51,177 @@ - } - $mysqls_count = $db->num_rows($result); - -+ $result2=$db->query( 'SELECT `id`, `databaseuser` FROM `' . TABLE_PANEL_DATABASES_USERS . '` WHERE `customerid`="' . $userinfo['customerid'] . '" ORDER BY `databaseuser` ASC' ); -+ $mysqlsusers=''; -+ while($row=$db->fetch_array($result2)) -+ { -+ eval("\$mysqlsusers.=\"".getTemplate("mysql/mysqls_database_user")."\";"); -+ } -+ $mysqls_count_users = $db->num_rows($result2); -+ - eval("echo \"".getTemplate("mysql/mysqls")."\";"); - } - -+ elseif($action=='adduser') -+ { -+ if($userinfo['mysqls_used_users'] < $userinfo['mysqls'] || $userinfo['mysqls'] == '-1') -+ { -+ if(isset($_POST['send']) && $_POST['send']=='send') -+ { -+ $password=addslashes($_POST['password']); -+ $passwordconfirm=addslashes($_POST['passwordconfirm']); -+ if($password=='' || $passwordconfirm=='') -+ { -+ standard_error(array('stringisempty','mypassword')); -+ } -+ elseif($password != $passwordconfirm) -+ { -+ standard_error('passwordnomatch'); -+ } -+ else -+ { -+ $username=$userinfo['loginname'].$settings['customer']['mysqlprefix'].(intval($userinfo['mysql_lastusernumber'])+1); -+ -+ // Begin root-session -+ $db_root=new db($sql['host'],$sql['root_user'],$sql['root_password'],''); -+ unset($db_root->password); -+ -+ $db_root->query( 'GRANT USAGE ON *.* TO `' . $username . '`@' . $settings['system']['mysql_access_host'] ); -+ $db_root->query( 'SET PASSWORD FOR `' . $username . '`@' . $settings['system']['mysql_access_host'] . ' = PASSWORD(\'' . $password . '\')' ); -+ $db_root->query( 'FLUSH PRIVILEGES' ); -+ -+ $db_root->close(); -+ // End root-session -+ -+ $result=$db->query( 'INSERT INTO `' . TABLE_PANEL_DATABASES_USERS . '` (`customerid`, `databaseuser`) VALUES ("' . $userinfo['customerid'] . '", "' . $username . '")' ); -+ $result=$db->query( 'UPDATE `' . TABLE_PANEL_CUSTOMERS . '` SET `mysqls_used_users`=`mysqls_used_users`+1, `mysql_lastusernumber`=`mysql_lastusernumber`+1 WHERE `customerid`="' . $userinfo['customerid'] . '"' ); -+ -+ redirectTo ( $filename , Array ( 'page' => $page , 's' => $s ) ) ; -+ } -+ } -+ else -+ { -+ eval("echo \"".getTemplate("mysql/mysqls_add_user")."\";"); -+ } -+ } -+ } -+ -+ elseif($action=='add') -+ { -+ if($userinfo['mysqls_used'] < $userinfo['mysqls'] || $userinfo['mysqls'] == '-1') -+ { -+ if(isset($_POST['send']) && $_POST['send']=='send') -+ { -+ $databaseuser=addslashes($_POST['databaseuser']); -+ if($databaseuser=='') -+ { -+ standard_error('missingdbuser'); -+ } -+ else -+ { -+ $databasesuffix=addslashes($_POST['databasesuffix']); -+ if($databasesuffix=='') -+ { -+ $databasename=$userinfo['loginname'].$settings['customer']['mysqlprefix'].(intval($userinfo['mysql_lastaccountnumber'])+1); -+ } -+ else -+ { -+ $databasename=$userinfo['loginname'].$settings['customer']['mysqlprefix'].(intval($userinfo['mysql_lastaccountnumber'])+1).'_'.$databasesuffix; -+ } -+ -+ // Begin root-session -+ $db_root=new db($sql['host'],$sql['root_user'],$sql['root_password'],''); -+ unset($db_root->password); -+ -+ $db_root->query( 'CREATE DATABASE `' . $databasename . '`' ); -+ $db_root->query( 'GRANT ALL PRIVILEGES ON `' . str_replace ( '_' , '\_' , $databasename ) . '`.* TO `' . $databaseuser . '`@' . $settings['system']['mysql_access_host'] . ';' ); -+ $db_root->query( 'FLUSH PRIVILEGES' ); -+ -+ $db_root->close(); -+ // End root-session -+ -+ $databasedescription=addslashes($_POST['description']); -+ $result=$db->query( 'INSERT INTO `' . TABLE_PANEL_DATABASES . '` (`customerid`, `databaseuser`, `databasename`, `description`) VALUES ("' . $userinfo['customerid'] . '", "' . $databaseuser . '", "' . $databasename . '", "' . $databasedescription . '")' ); -+ $result=$db->query( 'UPDATE `' . TABLE_PANEL_CUSTOMERS . '` SET `mysqls_used`=`mysqls_used`+1, `mysql_lastaccountnumber`=`mysql_lastaccountnumber`+1 WHERE `customerid`="' . $userinfo['customerid'] . '"' ); -+ -+ redirectTo ( $filename , Array ( 'page' => $page , 's' => $s ) ) ; -+ } -+ } -+ else -+ { -+ $result=$db->query_first( 'SELECT `id`, `databaseuser` FROM `' . TABLE_PANEL_DATABASES_USERS . '` WHERE `customerid`="' . $userinfo['customerid'] . '" ORDER BY `databaseuser` ASC' ); -+ if(isset($result['databaseuser']) && $result['databaseuser'] != '') -+ { -+ $result2=$db->query( 'SELECT `id`, `databaseuser` FROM `' . TABLE_PANEL_DATABASES_USERS . '` WHERE `customerid`="' . $userinfo['customerid'] . '" ORDER BY `databaseuser` ASC' ); -+ $databaseuser=''; -+ while($row=$db->fetch_array($result2)) -+ { -+ $databaseuser.=makeoption($row['databaseuser'],$row['databaseuser']); -+ } -+ -+ eval("echo \"".getTemplate("mysql/mysqls_add")."\";"); -+ } -+ else -+ { -+ standard_error('nodbuseryet'); -+ } -+ -+ } -+ } -+ } -+ -+ elseif($action=='deleteuser' && $id!=0) -+ { -+ $result=$db->query_first( 'SELECT `id`, `databaseuser` FROM `' . TABLE_PANEL_DATABASES_USERS . '` WHERE `customerid`="' . $userinfo['customerid'] . '" AND `id`="' . $id . '"' ); -+ if(isset($result['databaseuser']) && $result['databaseuser'] != '') -+ { -+ if(isset($_POST['send']) && $_POST['send']=='send') -+ { -+ $result2=$db->query_first( 'SELECT `id`, `databasename` FROM `' . TABLE_PANEL_DATABASES . '` WHERE `customerid`="' . $userinfo['customerid'] . '" AND `databaseuser`="' . $result['databaseuser'] . '"' ); -+ if(isset($result2['databasename']) && $result2['databasename'] != '') -+ { -+ standard_error('dbuserstillhasdb'); -+ } -+ else -+ { -+ // Begin root-session -+ $db_root=new db($sql['host'],$sql['root_user'],$sql['root_password'],''); -+ unset($db_root->password); -+ -+ $db_root->query( 'REVOKE ALL PRIVILEGES ON * . * FROM `' . $result['databaseuser'] . '`@' . $settings['system']['mysql_access_host'] . ';' ); -+ $db_root->query( 'DELETE FROM `mysql`.`user` WHERE `User` = "' . $result['databaseuser'] . '" AND `Host` = "' . $settings['system']['mysql_access_host'] . '"' ); -+ $db_root->query( 'FLUSH PRIVILEGES' ); -+ -+ $db_root->close(); -+ // End root-session -+ -+ $result=$db->query( 'DELETE FROM `' . TABLE_PANEL_DATABASES_USERS . '` WHERE `customerid`="' . $userinfo['customerid'] . '" AND `databaseuser`="' . $result['databaseuser'] . '"' ); -+ -+ if($userinfo['mysqls_used_users']=='1') -+ { -+ $resetusrnumber=" , `mysql_lastusernumber`='0' "; -+ } -+ else -+ { -+ $resetusrnumber=''; -+ } -+ -+ $result=$db->query( 'UPDATE `' . TABLE_PANEL_CUSTOMERS . '` SET `mysqls_used_users`=`mysqls_used_users`-1 ' . $resetusrnumber . 'WHERE `customerid`="' . $userinfo['customerid'] .'"' ); -+ -+ redirectTo ( $filename , Array ( 'page' => $page , 's' => $s ) ) ; -+ } -+ } -+ else -+ { -+ ask_yesno('mysql_reallydelete_user', $filename, "id=$id;page=$page;action=$action", $result['databaseuser']); -+ } -+ } -+ } -+ - elseif($action=='delete' && $id!=0) - { -- $result=$db->query_first( 'SELECT `id`, `databasename` FROM `' . TABLE_PANEL_DATABASES . '` WHERE `customerid`="' . $userinfo['customerid'] . '" AND `id`="' . $id . '"' ); -- if(isset($result['databasename']) && $result['databasename'] != '') -+ $result=$db->query_first( 'SELECT `id`, `databasename`, `databaseuser` FROM `' . TABLE_PANEL_DATABASES . '` WHERE `customerid`="' . $userinfo['customerid'] . '" AND `id`="' . $id . '"' ); -+ if(isset($result['databasename']) && $result['databasename'] != '' && isset($result['databaseuser']) && $result['databaseuser'] != '') - { - if(isset($_POST['send']) && $_POST['send']=='send') - { -@@ -64,16 +229,14 @@ - $db_root=new db($sql['host'],$sql['root_user'],$sql['root_password'],''); - unset($db_root->password); - -- $db_root->query( 'REVOKE ALL PRIVILEGES ON * . * FROM `' . $result['databasename'] . '`@' . $settings['system']['mysql_access_host'] . ';' ); -- $db_root->query( 'REVOKE ALL PRIVILEGES ON `' . str_replace ( '_' , '\_' , $result['databasename'] ) . '` . * FROM `' . $result['databasename'] . '`@' . $settings['system']['mysql_access_host'] . ';' ); -- $db_root->query( 'DELETE FROM `mysql`.`user` WHERE `User` = "' . $result['databasename'] . '" AND `Host` = "' . $settings['system']['mysql_access_host'] . '"' ); -+ $db_root->query( 'REVOKE ALL PRIVILEGES ON `' . str_replace ( '_' , '\_' , $result['databasename'] ) . '` . * FROM `' . $result['databaseuser'] . '`@' . $settings['system']['mysql_access_host'] . ';' ); - $db_root->query( 'DROP DATABASE IF EXISTS `' . $result['databasename'] . '`' ); - $db_root->query( 'FLUSH PRIVILEGES' ); - - $db_root->close(); - // End root-session -- -- $db->query( 'DELETE FROM `' . TABLE_PANEL_DATABASES . '` WHERE `customerid`="' . $userinfo['customerid'] . '" AND `id`="' . $id . '"' ); -+ -+ $result=$db->query( 'DELETE FROM `' . TABLE_PANEL_DATABASES . '` WHERE `customerid`="' . $userinfo['customerid'] . '" AND `databasename`="' . $result['databasename'] . '"' ); - - if($userinfo['mysqls_used']=='1') - { -@@ -88,89 +251,97 @@ - - redirectTo ( $filename , Array ( 'page' => $page , 's' => $s ) ) ; - } -- else -+ else - { - ask_yesno('mysql_reallydelete', $filename, "id=$id;page=$page;action=$action", $result['databasename']); - } - } - } - -- elseif($action=='add') -+ elseif($action=='edituser' && $id!=0) - { -- if($userinfo['mysqls_used'] < $userinfo['mysqls'] || $userinfo['mysqls'] == '-1') -+ $result=$db->query_first( 'SELECT `id`, `databaseuser` FROM `' . TABLE_PANEL_DATABASES_USERS . '` WHERE `customerid`="' . $userinfo['customerid'] . '" AND `id`="' . $id . '"' ); -+ if(isset($result['databaseuser']) && $result['databaseuser'] != '') - { - if(isset($_POST['send']) && $_POST['send']=='send') - { - $password=addslashes($_POST['password']); -- if($password=='') -+ $passwordconfirm=addslashes($_POST['passwordconfirm']); -+ if($password=='' || $passwordconfirm=='') - { - standard_error(array('stringisempty','mypassword')); - } -+ elseif($password != $passwordconfirm) -+ { -+ standard_error('passwordnomatch'); -+ } - else - { -- $username=$userinfo['loginname'].$settings['customer']['mysqlprefix'].(intval($userinfo['mysql_lastaccountnumber'])+1); -- - // Begin root-session - $db_root=new db($sql['host'],$sql['root_user'],$sql['root_password'],''); - unset($db_root->password); - -- $db_root->query( 'CREATE DATABASE `' . $username . '`' ); -- $db_root->query( 'GRANT ALL PRIVILEGES ON `' . str_replace ( '_' , '\_' , $username ) . '`.* TO `' . $username . '`@' . $settings['system']['mysql_access_host'] . ' IDENTIFIED BY \'password\'' ); -- $db_root->query( 'SET PASSWORD FOR `' . $username .'`@' . $settings['system']['mysql_access_host'] . ' = PASSWORD(\'' . $password . '\')' ); -- $db_root->query( 'FLUSH PRIVILEGES' ); -+ $db_root->query('SET PASSWORD FOR `' . $result['databaseuser'] . '`@' . $settings['system']['mysql_access_host'] . ' = PASSWORD(\'' . $password .'\')'); -+ $db_root->query('FLUSH PRIVILEGES'); - - $db_root->close(); - // End root-session -- -- // Statement modifyed for Database description -- PH 2004-11-29 -- $databasedescription=addslashes($_POST['description']); -- $result=$db->query( 'INSERT INTO `' . TABLE_PANEL_DATABASES . '` (`customerid`, `databasename`, `description`) VALUES ("' . $userinfo['customerid'] .'", "' . $username .'", "' . $databasedescription .'")' ); -- $result=$db->query( 'UPDATE `' . TABLE_PANEL_CUSTOMERS . '` SET `mysqls_used`=`mysqls_used`+1, `mysql_lastaccountnumber`=`mysql_lastaccountnumber`+1 WHERE `customerid`="' . $userinfo['customerid'] . '"' ); -- -- redirectTo ( $filename , Array ( 'page' => $page , 's' => $s ) ) ; - } -+ -+ redirectTo ( $filename , Array ( 'page' => $page , 's' => $s ) ) ; - } -- else -+ else - { -- eval("echo \"".getTemplate("mysql/mysqls_add")."\";"); -+ eval("echo \"".getTemplate("mysql/mysqls_edit_user")."\";"); - } - } - } - - elseif($action=='edit' && $id!=0) - { -- $result=$db->query_first( 'SELECT `id`, `databasename`, `description` FROM `' . TABLE_PANEL_DATABASES . '` WHERE `customerid`="' . $userinfo['customerid'] . '" AND `id`="' . $id . '"' ); -- if(isset($result['databasename']) && $result['databasename'] != '') -+ $result=$db->query_first( 'SELECT `id`, `databasename`, `databaseuser`, `description` FROM `' . TABLE_PANEL_DATABASES . '` WHERE `customerid`="' . $userinfo['customerid'] . '" AND `id`="' . $id . '"' ); -+ if(isset($result['databasename']) && $result['databasename'] != '' && isset($result['databaseuser']) && $result['databaseuser'] != '') - { - if(isset($_POST['send']) && $_POST['send']=='send') - { -- // Only change Password if it is set, do nothing if it is empty! -- PH 2004-11-29 -- $password=addslashes($_POST['password']); -- if($password!='') -+ $databaseuser=addslashes($_POST['databaseuser']); -+ if($databaseuser=='') -+ { -+ standard_error('missingdbuser'); -+ } -+ else - { - // Begin root-session - $db_root=new db($sql['host'],$sql['root_user'],$sql['root_password'],''); - unset($db_root->password); - -- $db_root->query('SET PASSWORD FOR `'.$result['databasename'].'`@' . $settings['system']['mysql_access_host'] . ' = PASSWORD(\'' . $password .'\')'); -- $db_root->query('FLUSH PRIVILEGES'); -+ $db_root->query( 'REVOKE ALL PRIVILEGES ON `' . str_replace ( '_' , '\_' , $result['databasename'] ) . '` . * FROM `' . $result['databaseuser'] . '`@' . $settings['system']['mysql_access_host'] . ';' ); -+ $db_root->query( 'GRANT ALL PRIVILEGES ON `' . str_replace ( '_' , '\_' , $result['databasename'] ) . '`.* TO `' . $databaseuser . '`@' . $settings['system']['mysql_access_host'] . ';' ); -+ $db_root->query( 'FLUSH PRIVILEGES' ); - - $db_root->close(); - // End root-session -+ -+ $result=$db->query( 'UPDATE `' . TABLE_PANEL_DATABASES . '` SET `databaseuser`="' . $databaseuser . '" WHERE `customerid`="' . $userinfo['customerid'] . '" AND `id`="' . $id . '"'); - } - -- // Update the Database description -- PH 2004-11-29 - $databasedescription=addslashes($_POST['description']); - $result=$db->query( 'UPDATE `' . TABLE_PANEL_DATABASES . '` SET `description`="' . $databasedescription . '" WHERE `customerid`="' . $userinfo['customerid'] . '" AND `id`="' . $id . '"'); - -- redirectTo ( $filename , Array ( 'page' => $page , 's' => $s ) ) ; -+ redirectTo ( $filename , Array ( 'page' => $page , 's' => $s ) ) ; - } -- else -+ else - { -+ $result2=$db->query( 'SELECT `id`, `databaseuser` FROM `' . TABLE_PANEL_DATABASES_USERS . '` WHERE `customerid`="' . $userinfo['customerid'] . '" ORDER BY `databaseuser` ASC' ); -+ $databaseuser=''; -+ while($row=$db->fetch_array($result2)) -+ { -+ $databaseuser.=makeoption($row['databaseuser'],$row['databaseuser'],$result['databaseuser']); -+ } -+ - eval("echo \"".getTemplate("mysql/mysqls_edit")."\";"); - } - } - } - } -- - ?> -\ No newline at end of file -diff -Nru syscp-gentoo-comp/lib/functions.php syscp-mysql-ftp-imp/lib/functions.php ---- syscp-gentoo-comp/lib/functions.php 2006-03-26 00:52:22.000000000 +0100 -+++ syscp-mysql-ftp-imp/lib/functions.php 2006-03-26 00:54:43.000000000 +0100 -@@ -650,6 +650,12 @@ - 'FROM `'.TABLE_PANEL_DATABASES.'` ' . - 'WHERE `customerid` = "'.$customer['customerid'].'"' - ); -+ -+ $customer_mysqls_users = $db->query_first( -+ 'SELECT COUNT(*) AS `number_mysqls_users` ' . -+ 'FROM `'.TABLE_PANEL_DATABASES_USERS.'` ' . -+ 'WHERE `customerid` = "'.$customer['customerid'].'"' -+ ); - - $customer_emails = $db->query_first( - 'SELECT COUNT(*) AS `number_emails` ' . -@@ -695,6 +701,7 @@ - $db->query( - 'UPDATE `'.TABLE_PANEL_CUSTOMERS.'` ' . - 'SET `mysqls_used` = "'.$customer_mysqls['number_mysqls'].'", ' . -+ ' `mysqls_used_users` = "'.$customer_mysqls_users['number_mysqls_users'].'", ' . - ' `emails_used` = "'.$customer_emails['number_emails'].'", ' . - ' `email_accounts_used` = "'.$customer_email_accounts.'", ' . - ' `email_forwarders_used` = "'.$customer_email_forwarders.'", ' . -diff -Nru syscp-gentoo-comp/lib/tables.inc.php syscp-mysql-ftp-imp/lib/tables.inc.php ---- syscp-gentoo-comp/lib/tables.inc.php 2006-03-26 00:52:22.000000000 +0100 -+++ syscp-mysql-ftp-imp/lib/tables.inc.php 2006-03-26 00:54:43.000000000 +0100 -@@ -24,6 +24,7 @@ - define('TABLE_PANEL_ADMINS','panel_admins'); - define('TABLE_PANEL_CUSTOMERS','panel_customers'); - define('TABLE_PANEL_DATABASES','panel_databases'); -+define('TABLE_PANEL_DATABASES_USERS','panel_databases_users'); - define('TABLE_PANEL_DOMAINS','panel_domains'); - define('TABLE_PANEL_HTACCESS','panel_htaccess'); - define('TABLE_PANEL_HTPASSWDS','panel_htpasswds'); -diff -Nru syscp-gentoo-comp/lng/english.lng.php syscp-mysql-ftp-imp/lng/english.lng.php ---- syscp-gentoo-comp/lng/english.lng.php 2006-03-26 00:52:22.000000000 +0100 -+++ syscp-mysql-ftp-imp/lng/english.lng.php 2006-03-26 01:00:45.000000000 +0100 -@@ -143,8 +143,6 @@ - /** - * MySQL - */ --$lng['mysql']['databasename'] = 'user/database name'; --$lng['mysql']['databasedescription'] = 'database description'; - $lng['mysql']['database_create'] = 'Create database'; - - /** -@@ -363,7 +361,6 @@ - /** - * CHANGED BETWEEN 1.2.12 and 1.2.13 - */ --$lng['mysql']['description'] = 'Here you can create and change your MySQL-Databases.
The changes are made instantly and the database can be used immediately.
At the menu on the left side you find the tool phpMyAdmin with which you can easily administer your database.

To use your databases in your own php-scripts use the following settings: (The data in italics have to be changed into the equivalents you typed in!)
Hostname: localhost
Username: Databasename
Password: the password you\'ve chosen
Database: Databasename'; - - /** - * ADDED BETWEEN 1.2.12 and 1.2.13 -@@ -392,4 +389,28 @@ - // ADDED IN 1.2.13-rc3 - $lng['error']['cantchangesystemip'] = 'You cannot change the last system IP, either create another new IP/Port combination for the system IP or change the system IP.'; - $lng['question']['admin_domain_reallydocrootoutofcustomerroot'] = 'Are you sure, you want the document root for this domain, not being within the customerroot of the customer?'; -+ -+/** -+ * CHANGED FOR MYSQL/FTP IMPROVED PATCH -+ */ -+$lng['mysql']['description'] = 'Here you can create and change your MySQL databases.
The changes are made instantly and the databases can be used immediately.
At the menu on the left side you\'ll find the tool phpMyAdmin with which you can easily administer your databases.

To use your databases in your own PHP scripts use the following settings: (The data in italics have to be changed into the equivalents you typed in!)
Hostname: localhost
Username: the username you\'ve chosen for that database
Password: the password you\'ve chosen for that user
Database: the name of the database'; -+$lng['mysql']['databasename'] = 'Database name'; -+$lng['mysql']['databasedescription'] = 'Database description'; -+ -+/** -+ * ADDED FOR MYSQL/FTP IMPROVED PATCH -+ */ -+$lng['menue']['mysql']['users'] = 'Users'; -+$lng['mysql']['databaseuser'] = 'Database user'; -+$lng['mysql']['databasesuffix'] = 'Database suffix'; -+$lng['mysql']['password_confirm'] = 'Password (confirm)'; -+$lng['mysql']['database_create_user'] = 'Create user'; -+$lng['mysql']['database_change'] = 'Change database settings'; -+$lng['mysql']['database_change_user'] = 'Change user settings'; -+$lng['error']['passwordnomatch'] = 'The passwords you inserted do not match.'; -+$lng['error']['missingdbuser'] = 'You need to select an user for the database.'; -+$lng['error']['nodbuseryet'] = 'You need to create a database user first!'; -+$lng['error']['dbuserstillhasdb'] = 'You cannot delete this database user, databases are still assigned to it!
Please reassign or delete all databases assigned to this user first.'; -+$lng['question']['mysql_reallydelete_user'] = 'Do you really want to delete the user %s? This cannot be undone!'; -+$lng['ftp']['ftpsuffix'] = 'Account suffix'; - ?> -\ No newline at end of file -diff -Nru syscp-gentoo-comp/templates/customer/ftp/accounts_add.tpl syscp-mysql-ftp-imp/templates/customer/ftp/accounts_add.tpl ---- syscp-gentoo-comp/templates/customer/ftp/accounts_add.tpl 2006-03-26 00:54:10.000000000 +0100 -+++ syscp-mysql-ftp-imp/templates/customer/ftp/accounts_add.tpl 2006-03-26 00:54:43.000000000 +0100 -@@ -13,7 +13,11 @@ -
{$lng['login']['password']}:
{$lng['ftp']['ftpsuffix']}:
({$lng['panel']['emptyfordefault']})
 {$lng['mysql']['database_create']}
{$lng['mysql']['databasedescription']}:{$lng['mysql']['databasesuffix']}:
({$lng['panel']['emptyfordefault']})
{$lng['login']['username']}:
{$lng['login']['password']}:{$lng['mysql']['databasedescription']}:
-+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+
 {$lng['mysql']['database_create_user']}
{$lng['login']['password']}:
{$lng['mysql']['password_confirm']}:
-+ -+
-+
-+$footer -\ No newline at end of file -diff -Nru syscp-gentoo-comp/templates/customer/mysql/mysqls_database.tpl syscp-mysql-ftp-imp/templates/customer/mysql/mysqls_database.tpl ---- syscp-gentoo-comp/templates/customer/mysql/mysqls_database.tpl 2006-03-26 00:54:10.000000000 +0100 -+++ syscp-mysql-ftp-imp/templates/customer/mysql/mysqls_database.tpl 2006-03-26 00:54:43.000000000 +0100 -@@ -1,5 +1,6 @@ - - {$row['databasename']} -+ {$row['databaseuser']} - {$row['description']} - {$lng['panel']['edit']} - {$lng['panel']['delete']} -diff -Nru syscp-gentoo-comp/templates/customer/mysql/mysqls_database_user.tpl syscp-mysql-ftp-imp/templates/customer/mysql/mysqls_database_user.tpl ---- syscp-gentoo-comp/templates/customer/mysql/mysqls_database_user.tpl 1970-01-01 01:00:00.000000000 +0100 -+++ syscp-mysql-ftp-imp/templates/customer/mysql/mysqls_database_user.tpl 2006-03-26 00:54:43.000000000 +0100 -@@ -0,0 +1,5 @@ -+ -+ {$row['databaseuser']} -+ {$lng['panel']['edit']} -+ {$lng['panel']['delete']} -+ -\ No newline at end of file -diff -Nru syscp-gentoo-comp/templates/customer/mysql/mysqls_edit.tpl syscp-mysql-ftp-imp/templates/customer/mysql/mysqls_edit.tpl ---- syscp-gentoo-comp/templates/customer/mysql/mysqls_edit.tpl 2006-03-26 00:54:10.000000000 +0100 -+++ syscp-mysql-ftp-imp/templates/customer/mysql/mysqls_edit.tpl 2006-03-26 00:54:43.000000000 +0100 -@@ -6,19 +6,19 @@ - - - -- -+ - - - - - - -- -- -+ -+ - - -- -- -+ -+ - - - -diff -Nru syscp-gentoo-comp/templates/customer/mysql/mysqls_edit_user.tpl syscp-mysql-ftp-imp/templates/customer/mysql/mysqls_edit_user.tpl ---- syscp-gentoo-comp/templates/customer/mysql/mysqls_edit_user.tpl 1970-01-01 01:00:00.000000000 +0100 -+++ syscp-mysql-ftp-imp/templates/customer/mysql/mysqls_edit_user.tpl 2006-03-26 00:54:43.000000000 +0100 -@@ -0,0 +1,30 @@ -+$header -+ -+ -+ -+ -+ -+
 {$lng['menue']['main']['changepassword']} {$lng['mysql']['database_change']}
{$lng['mysql']['databasename']}:{$result['databasename']}
{$lng['mysql']['databasedescription']}:{$lng['login']['username']}:
{$lng['changepassword']['new_password_ifnotempty']}:{$lng['mysql']['databasedescription']}:
-+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+
 {$lng['mysql']['database_change_user']}
{$lng['mysql']['databaseuser']}:{$result['databaseuser']}
{$lng['login']['password']}:
{$lng['mysql']['password_confirm']}:
-+ -+
-+
-+$footer -\ No newline at end of file -diff -Nru syscp-gentoo-comp/templates/customer/mysql/mysqls.tpl syscp-mysql-ftp-imp/templates/customer/mysql/mysqls.tpl ---- syscp-gentoo-comp/templates/customer/mysql/mysqls.tpl 2006-03-26 00:54:10.000000000 +0100 -+++ syscp-mysql-ftp-imp/templates/customer/mysql/mysqls.tpl 2006-03-26 00:54:43.000000000 +0100 -@@ -1,22 +1,45 @@ - $header - - -- -+ - - - -+ - - - - - -- -+ - - - $mysqls - - -- -+ -+ -+ -+
 {$lng['menue']['mysql']['databases']} {$lng['menue']['mysql']['databases']}
{$lng['mysql']['databasename']}{$lng['mysql']['databaseuser']}{$lng['mysql']['databasedescription']} 
{$lng['mysql']['database_create']}{$lng['mysql']['database_create']}
{$lng['mysql']['database_create']}{$lng['mysql']['database_create']}
-+
-+
-+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ $mysqlsusers -+ -+ -+ - - -
 {$lng['menue']['mysql']['users']}
{$lng['mysql']['databaseuser']} 
{$lng['mysql']['database_create_user']}
{$lng['mysql']['database_create_user']}
diff --git a/syscp/patches/options-patch/syscp-1.2.13-moreoptions.patch b/syscp/patches/options-patch/syscp-1.2.13-moreoptions.patch deleted file mode 100644 index d2768f8..0000000 --- a/syscp/patches/options-patch/syscp-1.2.13-moreoptions.patch +++ /dev/null @@ -1,585 +0,0 @@ -diff -Nru syscp-mysql-ftp-imp/admin_customers.php syscp-options/admin_customers.php ---- syscp-mysql-ftp-imp/admin_customers.php 2006-03-26 01:05:47.000000000 +0100 -+++ syscp-options/admin_customers.php 2006-03-26 01:06:22.000000000 +0100 -@@ -424,8 +424,8 @@ - - $db->query( - "INSERT INTO `".TABLE_PANEL_DOMAINS."` " . -- "(`domain`, `customerid`, `adminid`, `parentdomainid`, `documentroot`, `zonefile`, `isemaildomain`, `caneditdomain`, `openbasedir`, `safemode`, `speciallogfile`, `specialsettings`) " . -- "VALUES ('$loginname.{$settings['system']['hostname']}', '$customerid', '{$userinfo['adminid']}', '-1', '$documentroot', '', '1', '1', '1', '1', '0', '')" -+ "(`domain`, `customerid`, `adminid`, `parentdomainid`, `documentroot`, `zonefile`, `isemaildomain`, `caneditdomain`, `ssi_includes`, `php_engine`, `openbasedir`, `safemode`, `php_errordisplay`, `speciallogfile`, `specialsettings`) " . -+ "VALUES ('$loginname.{$settings['system']['hostname']}', '$customerid', '{$userinfo['adminid']}', '-1', '$documentroot', '', '1', '1', '0', '1', '1', '1', '0', '0', '')" - ); - $domainid=$db->insert_id(); - $db->query( -@@ -555,8 +555,8 @@ - { - $db->query( - "INSERT INTO `".TABLE_PANEL_DOMAINS."` " . -- "(`domain`, `customerid`, `adminid`, `documentroot`, `zonefile`, `isemaildomain`, `caneditdomain`, `openbasedir`, `safemode`, `speciallogfile`, `specialsettings`) " . -- "VALUES ('{$result['loginname']}.{$settings['system']['hostname']}', '{$result['customerid']}', '{$userinfo['adminid']}', '{$result['documentroot']}', '', '1', '1', '1', '1', '0', '')" -+ "(`domain`, `customerid`, `adminid`, `documentroot`, `zonefile`, `isemaildomain`, `caneditdomain`, `ssi_includes`, `php_engine`, `openbasedir`, `safemode`, `php_errordisplay`, `speciallogfile`, `specialsettings`) " . -+ "VALUES ('{$result['loginname']}.{$settings['system']['hostname']}', '{$result['customerid']}', '{$userinfo['adminid']}', '{$result['documentroot']}', '', '1', '1', '0', '1', '1', '1', '0', '0', '')" - ); - $domainid=$db->insert_id(); - $db->query( -diff -Nru syscp-mysql-ftp-imp/admin_domains.php syscp-options/admin_domains.php ---- syscp-mysql-ftp-imp/admin_domains.php 2006-03-26 01:05:34.000000000 +0100 -+++ syscp-options/admin_domains.php 2006-03-26 01:12:53.000000000 +0100 -@@ -56,7 +56,7 @@ - - $domains=''; - $result=$db->query( -- "SELECT `d`.`id`, `d`.`domain`, `d`.`customerid`, `d`.`documentroot`, CONCAT(`ip`.`ip`,':',`ip`.`port`) AS `ipandport`, `d`.`zonefile`, `d`.`openbasedir`, `d`.`safemode`, `d`.`isemaildomain`, `d`.`parentdomainid`, `c`.`loginname`, `c`.`name`, `c`.`firstname`, `ad`.`domain` AS `alias` " . -+ "SELECT `d`.`id`, `d`.`domain`, `d`.`customerid`, `d`.`documentroot`, CONCAT(`ip`.`ip`,':',`ip`.`port`) AS `ipandport`, `d`.`zonefile`, `d`.`ssi_includes`, `d`.`php_engine`, `d`.`openbasedir`, `d`.`safemode`, `d`.`php_errordisplay`, `d`.`isemaildomain`, `d`.`parentdomainid`, `c`.`loginname`, `c`.`name`, `c`.`firstname`, `ad`.`domain` AS `alias` " . - "FROM `".TABLE_PANEL_DOMAINS."` `d` " . - "LEFT JOIN `".TABLE_PANEL_CUSTOMERS."` `c` USING(`customerid`) " . - "LEFT JOIN `".TABLE_PANEL_DOMAINS."` `ad` ON `d`.`aliasdomain`=`ad`.`id` " . -@@ -93,7 +93,7 @@ - } - $pagestart = ($pageno - 1) * $settings['panel']['paging']; - $result=$db->query( -- "SELECT `d`.`id`, `d`.`domain`, `d`.`customerid`, `d`.`documentroot`, CONCAT(`ip`.`ip`,':',`ip`.`port`) AS `ipandport`, `d`.`zonefile`, `d`.`openbasedir`, `d`.`safemode`, `d`.`isemaildomain`, `d`.`parentdomainid`, `c`.`loginname`, `c`.`name`, `c`.`firstname`, `ad`.`domain` AS `alias` " . -+ "SELECT `d`.`id`, `d`.`domain`, `d`.`customerid`, `d`.`documentroot`, CONCAT(`ip`.`ip`,':',`ip`.`port`) AS `ipandport`, `d`.`zonefile`, `d`.`ssi_includes`, `d`.`php_engine`, `d`.`openbasedir`, `d`.`safemode`, `d`.`php_errordisplay`, `d`.`isemaildomain`, `d`.`parentdomainid`, `c`.`loginname`, `c`.`name`, `c`.`firstname`, `ad`.`domain` AS `alias` " . - "FROM `".TABLE_PANEL_DOMAINS."` `d` " . - "LEFT JOIN `".TABLE_PANEL_CUSTOMERS."` `c` USING(`customerid`) " . - "LEFT JOIN `".TABLE_PANEL_DOMAINS."` `ad` ON `d`.`aliasdomain`=`ad`.`id` " . -@@ -214,6 +214,9 @@ - $aliasdomain = intval($_POST['alias']); - $customer = $db->query_first("SELECT `documentroot` FROM `".TABLE_PANEL_CUSTOMERS."` WHERE `customerid`='$customerid'"); - $documentroot = $customer['documentroot']; -+ $ssi_includes = intval($_POST['ssi_includes']); -+ $php_engine = intval($_POST['php_engine']); -+ $php_errordisplay = intval($_POST['php_errordisplay']); - if($userinfo['change_serversettings'] == '1') - { - $isbinddomain = $_POST['isbinddomain']; -@@ -260,6 +263,14 @@ - $aliasdomain_check = $db->query_first('SELECT `id` FROM `'.TABLE_PANEL_DOMAINS.'` `d`,`'.TABLE_PANEL_CUSTOMERS.'` `c` WHERE `d`.`customerid`=\''.$customerid.'\' AND `d`.`aliasdomain` IS NULL AND `d`.`id`<>`c`.`standardsubdomain` AND `c`.`customerid`=\''.$customerid.'\' AND `d`.`id`=\''.$aliasdomain.'\''); - } - -+ if($ssi_includes != '1') -+ { -+ $ssi_includes = '0'; -+ } -+ if($php_engine != '1') -+ { -+ $php_engine = '0'; -+ } - if($openbasedir != '1') - { - $openbasedir = '0'; -@@ -268,6 +279,10 @@ - { - $safemode = '0'; - } -+ if($php_errordisplay != '1') -+ { -+ $php_errordisplay = '0'; -+ } - if($speciallogfile != '1') - { - $speciallogfile = '0'; -@@ -321,7 +336,7 @@ - && (!isset($_POST['reallydoit']) - || $_POST['reallydoit'] != 'reallydoit') ) - { -- ask_yesno('admin_domain_reallydisablesecuritysetting', $filename, "page=$page;action=$action;domain=$domain;documentroot=$documentroot;customerid=$customerid;alias=$aliasdomain;isbinddomain=$isbinddomain;isemaildomain=$isemaildomain;subcanemaildomain=$subcanemaildomain;caneditdomain=$caneditdomain;zonefile=$zonefile;speciallogfile=$speciallogfile;openbasedir=$openbasedir;ipandport=$ipandport;safemode=$safemode;specialsettings=".urlencode($specialsettings).";reallydoit=reallydoit"); -+ ask_yesno('admin_domain_reallydisablesecuritysetting', $filename, "page=$page;action=$action;domain=$domain;documentroot=$documentroot;customerid=$customerid;alias=$aliasdomain;isbinddomain=$isbinddomain;isemaildomain=$isemaildomain;subcanemaildomain=$subcanemaildomain;caneditdomain=$caneditdomain;zonefile=$zonefile;speciallogfile=$speciallogfile;ssi_includes=$ssi_includes;php_engine=$php_engine;openbasedir=$openbasedir;ipandport=$ipandport;safemode=$safemode;php_errordisplay=$php_errordisplay;specialsettings=".urlencode($specialsettings).";reallydoit=reallydoit"); - exit; - } - $pattern = sprintf('^%s', $customer['documentroot']); -@@ -329,7 +344,7 @@ - && ( !isset($_POST['reallydocroot'] ) - || $_POST['reallydocroot'] != 'reallydocroot') ) - { -- $params = "page=$page;action=$action;domain=$domain;documentroot=$documentroot;customerid=$customerid;alias=$aliasdomain;isbinddomain=$isbinddomain;isemaildomain=$isemaildomain;subcanemaildomain=$subcanemaildomain;caneditdomain=$caneditdomain;zonefile=$zonefile;speciallogfile=$speciallogfile;openbasedir=$openbasedir;ipandport=$ipandport;safemode=$safemode;specialsettings=".urlencode($specialsettings).';reallydocroot=reallydocroot'; -+ $params = "page=$page;action=$action;domain=$domain;documentroot=$documentroot;customerid=$customerid;alias=$aliasdomain;isbinddomain=$isbinddomain;isemaildomain=$isemaildomain;subcanemaildomain=$subcanemaildomain;caneditdomain=$caneditdomain;zonefile=$zonefile;speciallogfile=$speciallogfile;ssi_includes=$ssi_includes;php_engine=$php_engine;openbasedir=$openbasedir;ipandport=$ipandport;safemode=$safemode;php_errordisplay=$php_errordisplay;specialsettings=".urlencode($specialsettings).';reallydocroot=reallydocroot'; - if ( isset($_POST['reallydoit']) ) - { - $params .= ';reallydoit=reallydoit'; -@@ -345,7 +360,7 @@ - } - - $specialsettings = addslashes($specialsettings); -- $db->query("INSERT INTO `".TABLE_PANEL_DOMAINS."` (`domain`, `customerid`, `adminid`, `documentroot`, `ipandport`, `aliasdomain`, `zonefile`, `isbinddomain`, `isemaildomain`, `subcanemaildomain`, `caneditdomain`, `openbasedir`, `safemode`, `speciallogfile`, `specialsettings`) VALUES ('$domain', '$customerid', '{$userinfo['adminid']}', '$documentroot', '$ipandport', ".(($aliasdomain!=0) ? '\''.$aliasdomain.'\'' : 'NULL').", '$zonefile', '$isbinddomain', '$isemaildomain', '$subcanemaildomain', '$caneditdomain', '$openbasedir', '$safemode', '$speciallogfile', '$specialsettings')"); -+ $db->query("INSERT INTO `".TABLE_PANEL_DOMAINS."` (`domain`, `customerid`, `adminid`, `documentroot`, `ipandport`, `aliasdomain`, `zonefile`, `isbinddomain`, `isemaildomain`, `subcanemaildomain`, `caneditdomain`, `ssi_includes`, `php_engine`, `openbasedir`, `safemode`, `php_errordisplay`, `speciallogfile`, `specialsettings`) VALUES ('$domain', '$customerid', '{$userinfo['adminid']}', '$documentroot', '$ipandport', ".(($aliasdomain!=0) ? '\''.$aliasdomain.'\'' : 'NULL').", '$zonefile', '$isbinddomain', '$isemaildomain', '$subcanemaildomain', '$caneditdomain', '$ssi_includes', '$php_engine', '$openbasedir', '$safemode', '$php_errordisplay', '$speciallogfile', '$specialsettings')"); - $domainid=$db->insert_id(); - $db->query("UPDATE `".TABLE_PANEL_ADMINS."` SET `domains_used` = `domains_used` + 1 WHERE `adminid` = '{$userinfo['adminid']}'"); - -@@ -394,8 +409,11 @@ - $isemaildomain=makeyesno('isemaildomain', '1', '0', '1'); - $subcanemaildomain=makeyesno('subcanemaildomain', '1', '0', '1'); - $caneditdomain=makeyesno('caneditdomain', '1', '0', '1'); -+ $ssi_includes=makeyesno('ssi_includes', '1', '0', '0'); -+ $php_engine=makeyesno('php_engine', '1', '0', '1'); - $openbasedir=makeyesno('openbasedir', '1', '0', '1'); - $safemode=makeyesno('safemode', '1', '0', '1'); -+ $php_errordisplay=makeyesno('php_errordisplay', '1', '0', '0'); - $speciallogfile=makeyesno('speciallogfile', '1', '0', '0'); - eval("echo \"".getTemplate("domains/domains_add")."\";"); - } -@@ -405,7 +423,7 @@ - elseif($action=='edit' && $id!=0) - { - $result=$db->query_first( -- "SELECT `d`.`id`, `d`.`domain`, `d`.`customerid`, `d`.`documentroot`, `d`.`ipandport`, `d`.`aliasdomain`, `d`.`isbinddomain`, `d`.`isemaildomain`, `d`.`subcanemaildomain`, `d`.`caneditdomain`, `d`.`zonefile`, `d`.`openbasedir`, `d`.`safemode`, `d`.`speciallogfile`, `d`.`specialsettings`, `c`.`loginname`, `c`.`name`, `c`.`firstname` " . -+ "SELECT `d`.`id`, `d`.`domain`, `d`.`customerid`, `d`.`documentroot`, `d`.`ipandport`, `d`.`aliasdomain`, `d`.`isbinddomain`, `d`.`isemaildomain`, `d`.`subcanemaildomain`, `d`.`caneditdomain`, `d`.`zonefile`, `d`.`ssi_includes`, `d`.`php_engine`, `d`.`openbasedir`, `d`.`safemode`, `d`.`php_errordisplay`, `d`.`speciallogfile`, `d`.`specialsettings`, `c`.`loginname`, `c`.`name`, `c`.`firstname` " . - "FROM `".TABLE_PANEL_DOMAINS."` `d` " . - "LEFT JOIN `".TABLE_PANEL_CUSTOMERS."` `c` USING(`customerid`) " . - "WHERE `d`.`parentdomainid`='0' AND `d`.`id`='$id'".( $userinfo['customers_see_all'] ? '' : " AND `d`.`adminid` = '{$userinfo['adminid']}' ") -@@ -422,6 +440,9 @@ - $isemaildomain = intval($_POST['isemaildomain']); - $subcanemaildomain = intval($_POST['subcanemaildomain']); - $caneditdomain = intval($_POST['caneditdomain']); -+ $ssi_includes = intval($_POST['ssi_includes']); -+ $php_engine = intval($_POST['php_engine']); -+ $php_errordisplay = intval($_POST['php_errordisplay']); - if($userinfo['change_serversettings'] == '1') - { - $isbinddomain = $_POST['isbinddomain']; -@@ -452,6 +473,14 @@ - $documentroot = makeCorrectDir($documentroot); - } - -+ if($ssi_includes != '1') -+ { -+ $ssi_includes = '0'; -+ } -+ if($php_engine != '1') -+ { -+ $php_engine = '0'; -+ } - if($openbasedir != '1') - { - $openbasedir = '0'; -@@ -460,6 +489,10 @@ - { - $safemode = '0'; - } -+ if($php_errordisplay != '1') -+ { -+ $php_errordisplay = '0'; -+ } - if($isbinddomain != '1') - { - $isbinddomain = '0'; -@@ -489,7 +522,7 @@ - - if(($openbasedir == '0' || $safemode == '0') && (!isset($_POST['reallydoit']) || $_POST['reallydoit'] != 'reallydoit') && $userinfo['change_serversettings'] == '1') - { -- ask_yesno('admin_domain_reallydisablesecuritysetting', $filename, "id=$id;page=$page;action=$action;documentroot=$documentroot;alias=$aliasdomain;isbinddomain=$isbinddomain;isemaildomain=$isemaildomain;subcanemaildomain=$subcanemaildomain;caneditdomain=$caneditdomain;zonefile=$zonefile;openbasedir=$openbasedir;ipandport=$ipandport;safemode=$safemode;specialsettings=".urlencode($specialsettings).";reallydoit=reallydoit"); -+ ask_yesno('admin_domain_reallydisablesecuritysetting', $filename, "id=$id;page=$page;action=$action;documentroot=$documentroot;alias=$aliasdomain;isbinddomain=$isbinddomain;isemaildomain=$isemaildomain;subcanemaildomain=$subcanemaildomain;caneditdomain=$caneditdomain;zonefile=$zonefile;ssi_includes=$ssi_includes;php_engine=$php_engine;openbasedir=$openbasedir;ipandport=$ipandport;safemode=$safemode;php_errordisplay=$php_errordisplay;specialsettings=".urlencode($specialsettings).";reallydoit=reallydoit"); - exit; - } - $pattern = sprintf('^%s', $customer['documentroot']); -@@ -497,7 +530,7 @@ - && ( !isset($_POST['reallydocroot'] ) - || $_POST['reallydocroot'] != 'reallydocroot') ) - { -- $params = "id=$id;page=$page;action=$action;documentroot=$documentroot;alias=$aliasdomain;isbinddomain=$isbinddomain;isemaildomain=$isemaildomain;subcanemaildomain=$subcanemaildomain;caneditdomain=$caneditdomain;zonefile=$zonefile;openbasedir=$openbasedir;ipandport=$ipandport;safemode=$safemode;specialsettings=".urlencode($specialsettings).';reallydocroot=reallydocroot'; -+ $params = "id=$id;page=$page;action=$action;documentroot=$documentroot;alias=$aliasdomain;isbinddomain=$isbinddomain;isemaildomain=$isemaildomain;subcanemaildomain=$subcanemaildomain;caneditdomain=$caneditdomain;zonefile=$zonefile;ssi_includes=$ssi_includes;php_engine=$php_engine;openbasedir=$openbasedir;ipandport=$ipandport;safemode=$safemode;php_errordisplay=$php_errordisplay;specialsettings=".urlencode($specialsettings).';reallydocroot=reallydocroot'; - if ( isset($_POST['reallydoit']) ) - { - $params .= ';reallydoit=reallydoit'; -@@ -513,7 +546,7 @@ - $specialsettings = urldecode($specialsettings); - } - -- if($documentroot != $result['documentroot'] || $ipandport != $result['ipandport'] || $openbasedir != $result['openbasedir'] || $safemode != $result['safemode'] || $specialsettings != $result['specialsettings']) -+ if($documentroot != $result['documentroot'] || $ipandport != $result['ipandport'] || $ssi_includes != $result['ssi_includes'] || $php_engine != $result['php_engine'] || $openbasedir != $result['openbasedir'] || $safemode != $result['safemode'] || $php_errordisplay != $result['php_errordisplay'] || $specialsettings != $result['specialsettings']) - { - inserttask('1'); - } -@@ -528,8 +561,8 @@ - } - - $specialsettings = addslashes($specialsettings); -- $result=$db->query("UPDATE `".TABLE_PANEL_DOMAINS."` SET `documentroot`='$documentroot', `ipandport`='$ipandport', `aliasdomain`=".(($aliasdomain!=0 && $alias_check==0) ? '\''.$aliasdomain.'\'' : 'NULL').", `isbinddomain`='$isbinddomain', `isemaildomain`='$isemaildomain', `subcanemaildomain`='$subcanemaildomain', `caneditdomain`='$caneditdomain', `zonefile`='$zonefile', `openbasedir`='$openbasedir', `safemode`='$safemode', `specialsettings`='$specialsettings' WHERE `id`='$id'"); -- $result=$db->query("UPDATE `".TABLE_PANEL_DOMAINS."` SET `ipandport`='$ipandport', `openbasedir`='$openbasedir', `safemode`='$safemode', `specialsettings`='$specialsettings' WHERE `parentdomainid`='$id'"); -+ $result=$db->query("UPDATE `".TABLE_PANEL_DOMAINS."` SET `documentroot`='$documentroot', `ipandport`='$ipandport', `aliasdomain`=".(($aliasdomain!=0 && $alias_check==0) ? '\''.$aliasdomain.'\'' : 'NULL').", `isbinddomain`='$isbinddomain', `isemaildomain`='$isemaildomain', `subcanemaildomain`='$subcanemaildomain', `caneditdomain`='$caneditdomain', `zonefile`='$zonefile', `ssi_includes`='$ssi_includes', `php_engine`='$php_engine', `openbasedir`='$openbasedir', `safemode`='$safemode', `php_errordisplay`='$php_errordisplay', `specialsettings`='$specialsettings' WHERE `id`='$id'"); -+ $result=$db->query("UPDATE `".TABLE_PANEL_DOMAINS."` SET `ipandport`='$ipandport', `ssi_includes`='$ssi_includes', `php_engine`='$php_engine', `openbasedir`='$openbasedir', `safemode`='$safemode', `php_errordisplay`='$php_errordisplay', `specialsettings`='$specialsettings' WHERE `parentdomainid`='$id'"); - - redirectTo ( $filename , Array ( 'page' => $page , 's' => $s ) ) ; - } -@@ -553,8 +586,11 @@ - $isemaildomain=makeyesno('isemaildomain', '1', '0', $result['isemaildomain']); - $subcanemaildomain=makeyesno('subcanemaildomain', '1', '0', $result['subcanemaildomain']); - $caneditdomain=makeyesno('caneditdomain', '1', '0', $result['caneditdomain']); -+ $ssi_includes=makeyesno('ssi_includes', '1', '0', $result['ssi_includes']); -+ $php_engine=makeyesno('php_engine', '1', '0', $result['php_engine']); - $openbasedir=makeyesno('openbasedir', '1', '0', $result['openbasedir']); - $safemode=makeyesno('safemode', '1', '0', $result['safemode']); -+ $php_errordisplay=makeyesno('php_errordisplay', '1', '0', $result['php_errordisplay']); - $speciallogfile=($result['speciallogfile'] == 1 ? $lng['panel']['yes'] : $lng['panel']['no']); - eval("echo \"".getTemplate("domains/domains_edit")."\";"); - } -@@ -562,4 +598,4 @@ - } - } - --?> -+?> -\ No newline at end of file -diff -Nru syscp-mysql-ftp-imp/customer_domains.php syscp-options/customer_domains.php ---- syscp-mysql-ftp-imp/customer_domains.php 2006-03-26 01:05:34.000000000 +0100 -+++ syscp-options/customer_domains.php 2006-03-26 01:06:22.000000000 +0100 -@@ -224,7 +224,7 @@ - { - $subdomain = $idna_convert->encode(preg_replace(Array('/\:(\d)+$/','/^https?\:\/\//'),'',addslashes($_POST['subdomain']))); - $domain=$idna_convert->encode(addslashes($_POST['domain'])); -- $domain_check=$db->query_first("SELECT `id`, `customerid`, `domain`, `documentroot`, `isemaildomain`, `openbasedir`, `safemode`, `speciallogfile`, `specialsettings` FROM `".TABLE_PANEL_DOMAINS."` WHERE `domain`='$domain' AND `customerid`='".$userinfo['customerid']."' AND `parentdomainid`='0' AND `iswildcarddomain`='0' AND `caneditdomain`='1' "); -+ $domain_check=$db->query_first("SELECT `id`, `customerid`, `domain`, `documentroot`, `isemaildomain`, `ssi_includes`, `php_engine`, `openbasedir`, `safemode`, `php_errordisplay`, `speciallogfile`, `specialsettings` FROM `".TABLE_PANEL_DOMAINS."` WHERE `domain`='$domain' AND `customerid`='".$userinfo['customerid']."' AND `parentdomainid`='0' AND `iswildcarddomain`='0' AND `caneditdomain`='1' "); - $completedomain=$subdomain.'.'.$domain; - $completedomain_check=$db->query_first("SELECT `id`, `customerid`, `domain`, `documentroot`, `isemaildomain` FROM `".TABLE_PANEL_DOMAINS."` WHERE `domain`='$completedomain' AND `customerid`='".$userinfo['customerid']."' AND `caneditdomain` = '1'"); - $aliasdomain = intval($_POST['alias']); -@@ -283,7 +283,7 @@ - - else - { -- $result=$db->query("INSERT INTO `".TABLE_PANEL_DOMAINS."` (`customerid`, `domain`, `documentroot`, `aliasdomain`, `parentdomainid`, `isemaildomain`, `openbasedir`, `safemode`, `speciallogfile`, `specialsettings`) VALUES ('".$userinfo['customerid']."', '$completedomain', '$path', ".(($aliasdomain != 0) ? "'".$aliasdomain."'" : "NULL").", '".$domain_check['id']."', '0', '".$domain_check['openbasedir']."', '".$domain_check['safemode']."', '".$domain_check['speciallogfile']."', '".$domain_check['specialsettings']."')"); -+ $result=$db->query("INSERT INTO `".TABLE_PANEL_DOMAINS."` (`customerid`, `domain`, `documentroot`, `aliasdomain`, `parentdomainid`, `isemaildomain`, `ssi_includes`, `php_engine`, `openbasedir`, `safemode`, `php_errordisplay`, `speciallogfile`, `specialsettings`) VALUES ('".$userinfo['customerid']."', '$completedomain', '$path', ".(($aliasdomain != 0) ? "'".$aliasdomain."'" : "NULL").", '".$domain_check['id']."', '0', '".$domain_check['ssi_includes']."', '".$domain_check['php_engine']."', '".$domain_check['openbasedir']."', '".$domain_check['safemode']."', '".$domain_check['php_errordisplay']."', '".$domain_check['speciallogfile']."', '".$domain_check['specialsettings']."')"); - $result=$db->query("UPDATE `".TABLE_PANEL_CUSTOMERS."` SET `subdomains_used`=`subdomains_used`+1 WHERE `customerid`='".$userinfo['customerid']."'"); - inserttask('1'); - redirectTo ( $filename , Array ( 'page' => $page , 's' => $s ) ) ; -@@ -312,7 +312,7 @@ - - elseif($action=='edit' && $id!=0) - { -- $result=$db->query_first("SELECT `d`.`id`, `d`.`customerid`, `d`.`domain`, `d`.`documentroot`, `d`.`isemaildomain`, `d`.`iswildcarddomain`, `d`.`parentdomainid`, `d`.`aliasdomain`, `pd`.`subcanemaildomain` FROM `".TABLE_PANEL_DOMAINS."` `d`, `".TABLE_PANEL_DOMAINS."` `pd` WHERE `d`.`customerid`='".$userinfo['customerid']."' AND `d`.`id`='$id' AND ((`d`.`parentdomainid`!='0' AND `pd`.`id`=`d`.`parentdomainid`) OR (`d`.`parentdomainid`='0' AND `pd`.`id`=`d`.`id`)) AND `d`.`caneditdomain`='1'"); -+ $result=$db->query_first("SELECT `d`.`id`, `d`.`customerid`, `d`.`domain`, `d`.`documentroot`, `d`.`isemaildomain`, `d`.`php_errordisplay`, `d`.`iswildcarddomain`, `d`.`parentdomainid`, `d`.`aliasdomain`, `pd`.`subcanemaildomain` FROM `".TABLE_PANEL_DOMAINS."` `d`, `".TABLE_PANEL_DOMAINS."` `pd` WHERE `d`.`customerid`='".$userinfo['customerid']."' AND `d`.`id`='$id' AND ((`d`.`parentdomainid`!='0' AND `pd`.`id`=`d`.`parentdomainid`) OR (`d`.`parentdomainid`='0' AND `pd`.`id`=`d`.`id`)) AND `d`.`caneditdomain`='1'"); - $alias_check=$db->query_first('SELECT COUNT(`id`) AS count FROM `'.TABLE_PANEL_DOMAINS.'` WHERE `aliasdomain`=\''.$result['id'].'\''); - $alias_check=$alias_check['count']; - -@@ -358,6 +358,12 @@ - $isemaildomain = $result['isemaildomain']; - } - -+ $php_errordisplay = intval($_POST['php_errordisplay']); -+ if($php_errordisplay != '1') -+ { -+ $php_errordisplay = '0'; -+ } -+ - $aliasdomain_check=array('id' => 0); - if($aliasdomain!=0) - { -@@ -380,10 +386,10 @@ - $db->query("DELETE FROM `".TABLE_MAIL_USERS."` WHERE `customerid`='".$userinfo['customerid']."' AND `domainid`='$id'"); - $db->query("DELETE FROM `".TABLE_MAIL_VIRTUAL."` WHERE `customerid`='".$userinfo['customerid']."' AND `domainid`='$id'"); - } -- if($path != $result['documentroot'] || $isemaildomain != $result['isemaildomain'] || $iswildcarddomain != $result['iswildcarddomain'] || $aliasdomain != $result['aliasdomain']) -+ if($path != $result['documentroot'] || $isemaildomain != $result['isemaildomain'] || $php_errordisplay != $result['php_errordisplay'] || $iswildcarddomain != $result['iswildcarddomain'] || $aliasdomain != $result['aliasdomain']) - { - inserttask('1'); -- $result=$db->query("UPDATE `".TABLE_PANEL_DOMAINS."` SET `documentroot`='$path', `isemaildomain`='$isemaildomain', `iswildcarddomain`='$iswildcarddomain', `aliasdomain`=".(($aliasdomain!=0 && $alias_check==0) ? '\''.$aliasdomain.'\'' : 'NULL')." WHERE `customerid`='".$userinfo['customerid']."' AND `id`='$id'"); -+ $result=$db->query("UPDATE `".TABLE_PANEL_DOMAINS."` SET `documentroot`='$path', `isemaildomain`='$isemaildomain', `php_errordisplay`='$php_errordisplay', `iswildcarddomain`='$iswildcarddomain', `aliasdomain`=".(($aliasdomain!=0 && $alias_check==0) ? '\''.$aliasdomain.'\'' : 'NULL')." WHERE `customerid`='".$userinfo['customerid']."' AND `id`='$id'"); - } - redirectTo ( $filename , Array ( 'page' => $page , 's' => $s ) ) ; - } -@@ -403,6 +409,7 @@ - // $result['documentroot']=str_replace($userinfo['documentroot'],'',$result['documentroot']); - $iswildcarddomain=makeyesno('iswildcarddomain', '1', '0', $result['iswildcarddomain']); - $isemaildomain=makeyesno('isemaildomain', '1', '0', $result['isemaildomain']); -+ $php_errordisplay=makeyesno('php_errordisplay', '1', '0', $result['php_errordisplay']); - eval("echo \"".getTemplate("domains/domains_edit")."\";"); - } - } -diff -Nru syscp-mysql-ftp-imp/customer_extras.php syscp-options/customer_extras.php ---- syscp-mysql-ftp-imp/customer_extras.php 2006-03-26 01:05:34.000000000 +0100 -+++ syscp-options/customer_extras.php 2006-03-26 01:06:22.000000000 +0100 -@@ -176,6 +176,8 @@ - $row['path']=str_replace($userinfo['documentroot'],'',$row['path']); - $row['options_indexes'] = str_replace('1', $lng['panel']['yes'], $row['options_indexes']); - $row['options_indexes'] = str_replace('0', $lng['panel']['no'], $row['options_indexes']); -+ $row['options_execcgi'] = str_replace('1', $lng['panel']['yes'], $row['options_execcgi']); -+ $row['options_execcgi'] = str_replace('0', $lng['panel']['no'], $row['options_execcgi']); - eval("\$htaccess.=\"".getTemplate("extras/htaccess_htaccess")."\";"); - } - eval("echo \"".getTemplate("extras/htaccess")."\";"); -@@ -270,6 +272,7 @@ - ' (`customerid`, ' . - ' `path`, ' . - ' `options_indexes`, ' . -+ ' `options_execcgi`, ' . - ' `error404path`, ' . - ' `error403path`, ' . - // ' `error401path`, ' . -@@ -278,6 +281,7 @@ - 'VALUES ("'.$userinfo['customerid'].'", ' . - ' "'.$path.'", ' . - ' "'.$_POST['options_indexes'].'", ' . -+ ' "'.$_POST['options_execcgi'].'", ' . - ' "'.$error404path.'", ' . - ' "'.$error403path.'", ' . - // ' "'.$error401path.'", ' . -@@ -293,6 +297,7 @@ - $pathSelect = makePathfield( $userinfo['documentroot'], $userinfo['guid'], - $userinfo['guid'], $settings['panel']['pathedit'] ); - $options_indexes = makeyesno('options_indexes','1','0','1'); -+ $options_execcgi = makeyesno('options_execcgi','1','0','0'); - eval("echo \"".getTemplate("extras/htaccess_add")."\";"); - } - } -@@ -317,6 +322,11 @@ - { - $option_indexes = '0'; - } -+ $option_execcgi = intval($_POST['options_execcgi']); -+ if ($option_execcgi != '1') -+ { -+ $option_execcgi = '0'; -+ } - if ( ($_POST['error404path'] == '') - || (preg_match('/^https?\:\/\//', $_POST['error404path']) ) - ) -@@ -359,6 +369,7 @@ - // } - - if ( ($option_indexes != $result['options_indexes']) -+ || ($option_execcgi != $result['options_execcgi']) - || ($error404path != $result['error404path']) - || ($error403path != $result['error403path']) - // || ($error401path != $result['error401path']) -@@ -369,6 +380,7 @@ - $db->query( - 'UPDATE `'.TABLE_PANEL_HTACCESS.'` ' . - 'SET `options_indexes` = "'.$option_indexes.'",' . -+ ' `options_execcgi` = "'.$option_execcgi.'",' . - ' `error404path` = "'.$error404path.'", ' . - ' `error403path` = "'.$error403path.'", ' . - // ' `error401path` = "'.$error401path.'", ' . -@@ -387,6 +399,7 @@ - // $result['error401path'] = $result['error401path']; - $result['error500path'] = $result['error500path']; - $options_indexes = makeyesno('options_indexes', '1', '0', $result['options_indexes']); -+ $options_execcgi = makeyesno('options_execcgi', '1', '0', $result['options_execcgi']); - eval("echo \"".getTemplate("extras/htaccess_edit")."\";"); - } - } -diff -Nru syscp-mysql-ftp-imp/lng/english.lng.php syscp-options/lng/english.lng.php ---- syscp-mysql-ftp-imp/lng/english.lng.php 2006-03-26 01:05:47.000000000 +0100 -+++ syscp-options/lng/english.lng.php 2006-03-26 01:06:22.000000000 +0100 -@@ -413,4 +413,14 @@ - $lng['error']['dbuserstillhasdb'] = 'You cannot delete this database user, databases are still assigned to it!
Please reassign or delete all databases assigned to this user first.'; - $lng['question']['mysql_reallydelete_user'] = 'Do you really want to delete the user %s? This cannot be undone!'; - $lng['ftp']['ftpsuffix'] = 'Account suffix'; -+ -+/** -+ * CHANGED FOR MOREOPTIONS PATCH -+ */ -+ -+/** -+ * ADDED FOR MOREOPTIONS PATCH -+ */ -+$lng['extras']['view_execcgi'] = 'permit CGI execution'; -+$lng['extras']['directory_execcgi'] = 'execute CGI scripts'; - ?> -\ No newline at end of file -diff -Nru syscp-mysql-ftp-imp/scripts/cron_tasks.php syscp-options/scripts/cron_tasks.php ---- syscp-mysql-ftp-imp/scripts/cron_tasks.php 2006-03-26 01:05:34.000000000 +0100 -+++ syscp-options/scripts/cron_tasks.php 2006-03-26 01:06:22.000000000 +0100 -@@ -75,7 +75,7 @@ - // $vhosts_file.='ServerName '.$settings['system']['hostname']."\n"; - // $vhosts_file.=''."\n"."\n"; - -- $result_domains=$db->query("SELECT `d`.`id`, `d`.`domain`, `d`.`customerid`, `d`.`documentroot`, CONCAT(`ip`.`ip`,':',`ip`.`port`) AS `ipandport`, `d`.`parentdomainid`, `d`.`isemaildomain`, `d`.`iswildcarddomain`, `d`.`openbasedir`, `d`.`safemode`, `d`.`speciallogfile`, `d`.`specialsettings`, `pd`.`domain` AS `parentdomain`, `c`.`loginname`, `c`.`guid`, `c`.`email`, `c`.`documentroot` AS `customerroot` FROM `".TABLE_PANEL_DOMAINS."` `d` LEFT JOIN `".TABLE_PANEL_CUSTOMERS."` `c` USING(`customerid`) LEFT JOIN `".TABLE_PANEL_DOMAINS."` `pd` ON (`pd`.`id` = `d`.`parentdomainid`) LEFT JOIN `".TABLE_PANEL_IPSANDPORTS."` `ip` ON (`d`.`ipandport` = `ip`.`id`) WHERE `d`.`deactivated` <> '1' AND `d`.`aliasdomain` IS NULL ORDER BY `d`.`iswildcarddomain`, `d`.`domain` ASC"); -+ $result_domains=$db->query("SELECT `d`.`id`, `d`.`domain`, `d`.`customerid`, `d`.`documentroot`, CONCAT(`ip`.`ip`,':',`ip`.`port`) AS `ipandport`, `d`.`parentdomainid`, `d`.`isemaildomain`, `d`.`iswildcarddomain`, `d`.`ssi_includes`, `d`.`php_engine`, `d`.`openbasedir`, `d`.`safemode`, `d`.`php_errordisplay`, `d`.`speciallogfile`, `d`.`specialsettings`, `pd`.`domain` AS `parentdomain`, `c`.`loginname`, `c`.`guid`, `c`.`email`, `c`.`documentroot` AS `customerroot` FROM `".TABLE_PANEL_DOMAINS."` `d` LEFT JOIN `".TABLE_PANEL_CUSTOMERS."` `c` USING(`customerid`) LEFT JOIN `".TABLE_PANEL_DOMAINS."` `pd` ON (`pd`.`id` = `d`.`parentdomainid`) LEFT JOIN `".TABLE_PANEL_IPSANDPORTS."` `ip` ON (`d`.`ipandport` = `ip`.`id`) WHERE `d`.`deactivated` <> '1' AND `d`.`aliasdomain` IS NULL ORDER BY `d`.`iswildcarddomain`, `d`.`domain` ASC"); - while($domain=$db->fetch_array($result_domains)) - { - fwrite( $debugHandler, ' cron_tasks: Task1 - Writing Domain '.$domain['id'].'::'.$domain['domain']); -@@ -108,19 +108,43 @@ - { - $domain['documentroot'] = makeCorrectDir ($domain['documentroot']); - $vhosts_file.=' DocumentRoot "'.$domain['documentroot']."\"\n"; -- if($domain['openbasedir'] == '1') -- { -- $vhosts_file.=' php_admin_value open_basedir "'.$domain['documentroot']."\"\n"; -- } -- if($domain['safemode'] == '1') -- { -- $vhosts_file.=' php_admin_flag safe_mode On '."\n"; -- } -- if($domain['safemode'] == '0') -+ if($domain['ssi_includes'] == '1') - { -- $vhosts_file.=' php_admin_flag safe_mode Off '."\n"; -+ $vhosts_file.=' Options +Includes'."\n"; - } -- -+ if($domain['ssi_includes'] == '0') -+ { -+ $vhosts_file.=' Options -Includes'."\n"; -+ } -+ if($domain['php_engine'] == '1') -+ { -+ $vhosts_file.=' php_admin_flag engine On'."\n"; -+ if($domain['openbasedir'] == '1') -+ { -+ $vhosts_file.=' php_admin_value open_basedir "'.$domain['documentroot']."\"\n"; -+ } -+ if($domain['safemode'] == '1') -+ { -+ $vhosts_file.=' php_admin_flag safe_mode On '."\n"; -+ } -+ if($domain['safemode'] == '0') -+ { -+ $vhosts_file.=' php_admin_flag safe_mode Off '."\n"; -+ } -+ if($domain['php_errordisplay'] == '1') -+ { -+ $vhosts_file.=' php_admin_flag display_errors On '."\n"; -+ } -+ if($domain['php_errordisplay'] == '0') -+ { -+ $vhosts_file.=' php_admin_flag display_errors Off '."\n"; -+ } -+ } -+ if($domain['php_engine'] == '0') -+ { -+ $vhosts_file.=' php_admin_flag engine Off'."\n"; -+ } -+ - if(!is_dir($domain['documentroot'])) - { - safe_exec('mkdir -p "'.$domain['documentroot'].'"'); -@@ -238,6 +262,16 @@ - $diroptions_file .= ' Options -Indexes'."\n"; - fwrite( $debugHandler, ' cron_tasks: Task3 - Setting Options -Indexes'); - } -+ if ( isset ( $row_diroptions['options_execcgi'] ) && $row_diroptions['options_execcgi'] == '1' ) -+ { -+ $diroptions_file .= ' Options +ExecCGI'."\n"; -+ fwrite( $debugHandler, ' cron_tasks: Task3 - Setting Options +ExecCGI'); -+ } -+ if ( isset ( $row_diroptions['options_execcgi'] ) && $row_diroptions['options_execcgi'] == '0' ) -+ { -+ $diroptions_file .= ' Options -ExecCGI'."\n"; -+ fwrite( $debugHandler, ' cron_tasks: Task3 - Setting Options -ExecCGI'); -+ } - if ( isset ( $row_diroptions['error404path'] ) && $row_diroptions['error404path'] != '') - { - $diroptions_file .= ' ErrorDocument 404 "'.$row_diroptions['error404path']."\"\n"; -diff -Nru syscp-mysql-ftp-imp/templates/admin/domains/domains_add.tpl syscp-options/templates/admin/domains/domains_add.tpl ---- syscp-mysql-ftp-imp/templates/admin/domains/domains_add.tpl 2006-03-26 01:05:34.000000000 +0100 -+++ syscp-options/templates/admin/domains/domains_add.tpl 2006-03-26 01:06:22.000000000 +0100 -@@ -49,6 +49,18 @@ - {$lng['admin']['domain_edit']}: - $caneditdomain - -+ -+ ServerSideIncludes: -+ $ssi_includes -+ -+ -+ PHP Engine: -+ $php_engine -+ -+ -+ PHP Error Display: -+ $php_errordisplay -+ - - - OpenBasedir: -diff -Nru syscp-mysql-ftp-imp/templates/admin/domains/domains_edit.tpl syscp-options/templates/admin/domains/domains_edit.tpl ---- syscp-mysql-ftp-imp/templates/admin/domains/domains_edit.tpl 2006-03-26 01:05:34.000000000 +0100 -+++ syscp-options/templates/admin/domains/domains_edit.tpl 2006-03-26 01:06:22.000000000 +0100 -@@ -52,6 +52,18 @@ - {$lng['admin']['domain_edit']}: - $caneditdomain - -+ -+ ServerSideIncludes: -+ $ssi_includes -+ -+ -+ PHP Engine: -+ $php_engine -+ -+ -+ PHP Error Display: -+ $php_errordisplay -+ - - - OpenBasedir: -diff -Nru syscp-mysql-ftp-imp/templates/customer/domains/domains_edit.tpl syscp-options/templates/customer/domains/domains_edit.tpl ---- syscp-mysql-ftp-imp/templates/customer/domains/domains_edit.tpl 2006-03-26 01:05:34.000000000 +0100 -+++ syscp-options/templates/customer/domains/domains_edit.tpl 2006-03-26 01:06:22.000000000 +0100 -@@ -35,6 +35,10 @@ - - - -+ PHP Error Display: -+ $php_errordisplay -+ -+ - - - -diff -Nru syscp-mysql-ftp-imp/templates/customer/extras/htaccess_add.tpl syscp-options/templates/customer/extras/htaccess_add.tpl ---- syscp-mysql-ftp-imp/templates/customer/extras/htaccess_add.tpl 2006-03-26 01:05:34.000000000 +0100 -+++ syscp-options/templates/customer/extras/htaccess_add.tpl 2006-03-26 01:06:22.000000000 +0100 -@@ -16,6 +16,10 @@ - $options_indexes - - -+ {$lng['extras']['directory_execcgi']}: -+ $options_execcgi -+ -+ - {$lng['extras']['errordocument404path']}:
{$lng['panel']['emptyfordefault']} - - -diff -Nru syscp-mysql-ftp-imp/templates/customer/extras/htaccess_edit.tpl syscp-options/templates/customer/extras/htaccess_edit.tpl ---- syscp-mysql-ftp-imp/templates/customer/extras/htaccess_edit.tpl 2006-03-26 01:05:34.000000000 +0100 -+++ syscp-options/templates/customer/extras/htaccess_edit.tpl 2006-03-26 01:06:22.000000000 +0100 -@@ -17,6 +17,10 @@ - $options_indexes - - -+ {$lng['extras']['directory_execcgi']}: -+ $options_execcgi -+ -+ - {$lng['extras']['errordocument404path']}:
{$lng['panel']['emptyfordefault']} - - -diff -Nru syscp-mysql-ftp-imp/templates/customer/extras/htaccess_htaccess.tpl syscp-options/templates/customer/extras/htaccess_htaccess.tpl ---- syscp-mysql-ftp-imp/templates/customer/extras/htaccess_htaccess.tpl 2006-03-26 01:05:34.000000000 +0100 -+++ syscp-options/templates/customer/extras/htaccess_htaccess.tpl 2006-03-26 01:06:22.000000000 +0100 -@@ -1,6 +1,7 @@ - - {$row['path']} - {$row['options_indexes']} -+ {$row['options_execcgi']} - {$row['error404path']} - {$row['error403path']} - {$row['error500path']} -diff -Nru syscp-mysql-ftp-imp/templates/customer/extras/htaccess.tpl syscp-options/templates/customer/extras/htaccess.tpl ---- syscp-mysql-ftp-imp/templates/customer/extras/htaccess.tpl 2006-03-26 01:05:34.000000000 +0100 -+++ syscp-options/templates/customer/extras/htaccess.tpl 2006-03-26 01:06:22.000000000 +0100 -@@ -1,11 +1,12 @@ - $header - - -- -+ - - - - -+ - - - -@@ -13,7 +14,7 @@ - - $htaccess - -- -+ - -
 {$lng['menue']['extras']['pathoptions']} {$lng['menue']['extras']['pathoptions']}
{$lng['panel']['path']}{$lng['extras']['view_directory']}{$lng['extras']['view_execcgi']}{$lng['extras']['error404path']}{$lng['extras']['error403path']}{$lng['extras']['error500path']}
{$lng['extras']['pathoptions_add']}{$lng['extras']['pathoptions_add']}
-
diff --git a/syscp/patches/options-patch/syscp-1.2.13-options-patch-r3.tar.bz2 b/syscp/patches/options-patch/syscp-1.2.13-options-patch-r3.tar.bz2 deleted file mode 100644 index 9187e3e..0000000 Binary files a/syscp/patches/options-patch/syscp-1.2.13-options-patch-r3.tar.bz2 and /dev/null differ diff --git a/syscp/patches/suexec-patch/syscp-1.2.13-suexec-patch-r3.tar.bz2 b/syscp/patches/suexec-patch/syscp-1.2.13-suexec-patch-r3.tar.bz2 deleted file mode 100644 index cd9aae1..0000000 Binary files a/syscp/patches/suexec-patch/syscp-1.2.13-suexec-patch-r3.tar.bz2 and /dev/null differ diff --git a/syscp/patches/suexec-patch/syscp-1.2.13-suexec-support.patch b/syscp/patches/suexec-patch/syscp-1.2.13-suexec-support.patch deleted file mode 100644 index 3cd7424..0000000 --- a/syscp/patches/suexec-patch/syscp-1.2.13-suexec-support.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nru syscp-options/scripts/cron_tasks.php syscp-suexec/scripts/cron_tasks.php ---- syscp-options/scripts/cron_tasks.php 2006-03-26 01:24:58.000000000 +0100 -+++ syscp-suexec/scripts/cron_tasks.php 2006-03-26 04:09:01.000000000 +0200 -@@ -108,6 +108,7 @@ - { - $domain['documentroot'] = makeCorrectDir ($domain['documentroot']); - $vhosts_file.=' DocumentRoot "'.$domain['documentroot']."\"\n"; -+ $vhosts_file.=' SuexecUserGroup '.$domain['loginname'].' '.$domain['loginname']."\n"; - if($domain['ssi_includes'] == '1') - { - $vhosts_file.=' Options +Includes'."\n"; diff --git a/syscp/patches/suphp-patch/syscp-1.2.13-suphp-patch-r3.tar.bz2 b/syscp/patches/suphp-patch/syscp-1.2.13-suphp-patch-r3.tar.bz2 deleted file mode 100644 index 81add91..0000000 Binary files a/syscp/patches/suphp-patch/syscp-1.2.13-suphp-patch-r3.tar.bz2 and /dev/null differ diff --git a/syscp/patches/suphp-patch/syscp-1.2.13-suphp-support.patch b/syscp/patches/suphp-patch/syscp-1.2.13-suphp-support.patch deleted file mode 100644 index b2f7b06..0000000 --- a/syscp/patches/suphp-patch/syscp-1.2.13-suphp-support.patch +++ /dev/null @@ -1,370 +0,0 @@ -diff -Nru syscp-suexec/customer_extras.php syscp-suphp/customer_extras.php ---- syscp-suexec/customer_extras.php 2006-03-26 04:08:39.000000000 +0200 -+++ syscp-suphp/customer_extras.php 2006-03-26 04:11:22.000000000 +0200 -@@ -178,6 +178,8 @@ - $row['options_indexes'] = str_replace('0', $lng['panel']['no'], $row['options_indexes']); - $row['options_execcgi'] = str_replace('1', $lng['panel']['yes'], $row['options_execcgi']); - $row['options_execcgi'] = str_replace('0', $lng['panel']['no'], $row['options_execcgi']); -+ $row['options_phpversionselect'] = str_replace('4', $lng['extras']['php4'], $row['options_phpversionselect']); -+ $row['options_phpversionselect'] = str_replace('5', $lng['extras']['php5'], $row['options_phpversionselect']); - eval("\$htaccess.=\"".getTemplate("extras/htaccess_htaccess")."\";"); - } - eval("echo \"".getTemplate("extras/htaccess")."\";"); -@@ -273,6 +275,7 @@ - ' `path`, ' . - ' `options_indexes`, ' . - ' `options_execcgi`, ' . -+ ' `options_phpversionselect`, ' . - ' `error404path`, ' . - ' `error403path`, ' . - // ' `error401path`, ' . -@@ -282,6 +285,7 @@ - ' "'.$path.'", ' . - ' "'.$_POST['options_indexes'].'", ' . - ' "'.$_POST['options_execcgi'].'", ' . -+ ' "'.$_POST['options_phpversionselect'].'", ' . - ' "'.$error404path.'", ' . - ' "'.$error403path.'", ' . - // ' "'.$error401path.'", ' . -@@ -298,6 +302,7 @@ - $userinfo['guid'], $settings['panel']['pathedit'] ); - $options_indexes = makeyesno('options_indexes','1','0','1'); - $options_execcgi = makeyesno('options_execcgi','1','0','0'); -+ $options_phpversionselect = "".$lng['extras']['php4']." \n".$lng['extras']['php5'].""; - eval("echo \"".getTemplate("extras/htaccess_add")."\";"); - } - } -@@ -327,6 +332,11 @@ - { - $option_execcgi = '0'; - } -+ $option_phpversionselect = intval($_POST['options_phpversionselect']); -+ if ($option_phpversionselect != '5') -+ { -+ $option_phpversionselect = '4'; -+ } - if ( ($_POST['error404path'] == '') - || (preg_match('/^https?\:\/\//', $_POST['error404path']) ) - ) -@@ -370,6 +380,7 @@ - - if ( ($option_indexes != $result['options_indexes']) - || ($option_execcgi != $result['options_execcgi']) -+ || ($option_phpversionselect != $result['options_phpversionselect']) - || ($error404path != $result['error404path']) - || ($error403path != $result['error403path']) - // || ($error401path != $result['error401path']) -@@ -381,6 +392,7 @@ - 'UPDATE `'.TABLE_PANEL_HTACCESS.'` ' . - 'SET `options_indexes` = "'.$option_indexes.'",' . - ' `options_execcgi` = "'.$option_execcgi.'",' . -+ ' `options_phpversionselect` = "'.$option_phpversionselect.'",' . - ' `error404path` = "'.$error404path.'", ' . - ' `error403path` = "'.$error403path.'", ' . - // ' `error401path` = "'.$error401path.'", ' . -@@ -400,6 +412,14 @@ - $result['error500path'] = $result['error500path']; - $options_indexes = makeyesno('options_indexes', '1', '0', $result['options_indexes']); - $options_execcgi = makeyesno('options_execcgi', '1', '0', $result['options_execcgi']); -+ if($result['options_phpversionselect'] == '5') -+ { -+ $options_phpversionselect = "".$lng['extras']['php4']." \n".$lng['extras']['php5'].""; -+ } -+ else -+ { -+ $options_phpversionselect = "".$lng['extras']['php4']." \n".$lng['extras']['php5'].""; -+ } - eval("echo \"".getTemplate("extras/htaccess_edit")."\";"); - } - } -diff -Nru syscp-suexec/lng/english.lng.php syscp-suphp/lng/english.lng.php ---- syscp-suexec/lng/english.lng.php 2006-03-26 04:08:39.000000000 +0200 -+++ syscp-suphp/lng/english.lng.php 2006-03-26 04:11:22.000000000 +0200 -@@ -423,4 +423,16 @@ - */ - $lng['extras']['view_execcgi'] = 'permit CGI execution'; - $lng['extras']['directory_execcgi'] = 'execute CGI scripts'; -+ -+/** -+ * CHANGED FOR SUPHP PATCH -+ */ -+ -+/** -+ * ADDED FOR SUPHP PATCH -+ */ -+$lng['extras']['php4'] = 'PHP4'; -+$lng['extras']['php5'] = 'PHP5'; -+$lng['extras']['view_phpversionselect'] = 'PHP version'; -+$lng['extras']['directory_phpversionselect'] = 'enabled PHP version'; - ?> -\ No newline at end of file -diff -Nru syscp-suexec/scripts/create_suphp_inis.php syscp-suphp/scripts/create_suphp_inis.php ---- syscp-suexec/scripts/create_suphp_inis.php 1970-01-01 01:00:00.000000000 +0100 -+++ syscp-suphp/scripts/create_suphp_inis.php 2006-03-26 04:11:22.000000000 +0200 -@@ -0,0 +1,129 @@ -+ -\ No newline at end of file -diff -Nru syscp-suexec/scripts/cron_tasks.php syscp-suphp/scripts/cron_tasks.php ---- syscp-suexec/scripts/cron_tasks.php 2006-03-26 04:09:01.000000000 +0200 -+++ syscp-suphp/scripts/cron_tasks.php 2006-03-26 04:11:22.000000000 +0200 -@@ -119,31 +119,14 @@ - } - if($domain['php_engine'] == '1') - { -- $vhosts_file.=' php_admin_flag engine On'."\n"; -- if($domain['openbasedir'] == '1') -- { -- $vhosts_file.=' php_admin_value open_basedir "'.$domain['documentroot']."\"\n"; -- } -- if($domain['safemode'] == '1') -- { -- $vhosts_file.=' php_admin_flag safe_mode On '."\n"; -- } -- if($domain['safemode'] == '0') -- { -- $vhosts_file.=' php_admin_flag safe_mode Off '."\n"; -- } -- if($domain['php_errordisplay'] == '1') -- { -- $vhosts_file.=' php_admin_flag display_errors On '."\n"; -- } -- if($domain['php_errordisplay'] == '0') -- { -- $vhosts_file.=' php_admin_flag display_errors Off '."\n"; -- } -+ $vhosts_file.=' suPHP_Engine On'."\n"; -+ $vhosts_file.=' suPHP_UserGroup '.$domain['loginname'].' '.$domain['loginname']."\n"; -+ include 'create_suphp_inis.php'; -+ $vhosts_file.=' suPHP_ConfigPath "'.$configdir."\"\n"; - } - if($domain['php_engine'] == '0') - { -- $vhosts_file.=' php_admin_flag engine Off'."\n"; -+ $vhosts_file.=' suPHP_Engine Off'."\n"; - } - - if(!is_dir($domain['documentroot'])) -@@ -198,6 +181,8 @@ - safe_exec('chown -R '.$row['data']['uid'].':'.$row['data']['gid'].' "'.$settings['system']['documentroot_prefix'].$row['data']['loginname'].'"'); - safe_exec('chown -R '.$settings['system']['vmail_uid'].':'.$settings['system']['vmail_gid'].' "'.$settings['system']['vmail_homedir'].$row['data']['loginname'].'"'); - safe_exec('chmod 0750 "'.$settings['system']['vmail_homedir'].$row['data']['loginname'].'"'); -+ safe_exec('chown '.$row['data']['uid'].':apache "'.$settings['system']['documentroot_prefix'].$row['data']['loginname'].'"'); -+ safe_exec('chmod 0750 "'.$settings['system']['documentroot_prefix'].$row['data']['loginname'].'"'); - } - } - -@@ -273,6 +258,20 @@ - $diroptions_file .= ' Options -ExecCGI'."\n"; - fwrite( $debugHandler, ' cron_tasks: Task3 - Setting Options -ExecCGI'); - } -+ if ( isset ( $row_diroptions['options_phpversionselect'] ) && $row_diroptions['options_phpversionselect'] == '5' ) -+ { -+ $diroptions_file .= ' AddType application/x-httpd-php5 .php .php5 .php4 .php3 .phtml'."\n"; -+ $diroptions_file .= ' AddHandler x-httpd-php5 .php .php5 .php4 .php3 .phtml'."\n"; -+ $diroptions_file .= ' suPHP_AddHandler x-httpd-php5'."\n"; -+ fwrite( $debugHandler, ' cron_tasks: Task3 - Setting PHP version to 5'); -+ } -+ if ( isset ( $row_diroptions['options_phpversionselect'] ) && $row_diroptions['options_phpversionselect'] == '4' ) -+ { -+ $diroptions_file .= ' AddType application/x-httpd-php4 .php .php5 .php4 .php3 .phtml'."\n"; -+ $diroptions_file .= ' AddHandler x-httpd-php4 .php .php5 .php4 .php3 .phtml'."\n"; -+ $diroptions_file .= ' suPHP_AddHandler x-httpd-php4'."\n"; -+ fwrite( $debugHandler, ' cron_tasks: Task3 - Setting PHP version to 4'); -+ } - if ( isset ( $row_diroptions['error404path'] ) && $row_diroptions['error404path'] != '') - { - $diroptions_file .= ' ErrorDocument 404 "'.$row_diroptions['error404path']."\"\n"; -diff -Nru syscp-suexec/templates/customer/extras/htaccess_add.tpl syscp-suphp/templates/customer/extras/htaccess_add.tpl ---- syscp-suexec/templates/customer/extras/htaccess_add.tpl 2006-03-26 04:08:39.000000000 +0200 -+++ syscp-suphp/templates/customer/extras/htaccess_add.tpl 2006-03-26 04:11:22.000000000 +0200 -@@ -20,6 +20,10 @@ - $options_execcgi - - -+ {$lng['extras']['directory_phpversionselect']}: -+ $options_phpversionselect -+ -+ - {$lng['extras']['errordocument404path']}:
{$lng['panel']['emptyfordefault']} - - -diff -Nru syscp-suexec/templates/customer/extras/htaccess_edit.tpl syscp-suphp/templates/customer/extras/htaccess_edit.tpl ---- syscp-suexec/templates/customer/extras/htaccess_edit.tpl 2006-03-26 04:08:39.000000000 +0200 -+++ syscp-suphp/templates/customer/extras/htaccess_edit.tpl 2006-03-26 04:11:22.000000000 +0200 -@@ -21,6 +21,10 @@ - $options_execcgi - - -+ {$lng['extras']['directory_phpversionselect']}: -+ $options_phpversionselect -+ -+ - {$lng['extras']['errordocument404path']}:
{$lng['panel']['emptyfordefault']} - - -diff -Nru syscp-suexec/templates/customer/extras/htaccess_htaccess.tpl syscp-suphp/templates/customer/extras/htaccess_htaccess.tpl ---- syscp-suexec/templates/customer/extras/htaccess_htaccess.tpl 2006-03-26 04:08:39.000000000 +0200 -+++ syscp-suphp/templates/customer/extras/htaccess_htaccess.tpl 2006-03-26 04:11:22.000000000 +0200 -@@ -2,6 +2,7 @@ - {$row['path']} - {$row['options_indexes']} - {$row['options_execcgi']} -+ {$row['options_phpversionselect']} - {$row['error404path']} - {$row['error403path']} - {$row['error500path']} -diff -Nru syscp-suexec/templates/customer/extras/htaccess.tpl syscp-suphp/templates/customer/extras/htaccess.tpl ---- syscp-suexec/templates/customer/extras/htaccess.tpl 2006-03-26 04:08:39.000000000 +0200 -+++ syscp-suphp/templates/customer/extras/htaccess.tpl 2006-03-26 04:11:22.000000000 +0200 -@@ -1,12 +1,13 @@ - $header - - -- -+ - - - - - -+ - - - -@@ -14,7 +15,7 @@ - - $htaccess - -- -+ - -
 {$lng['menue']['extras']['pathoptions']} {$lng['menue']['extras']['pathoptions']}
{$lng['panel']['path']}{$lng['extras']['view_directory']}{$lng['extras']['view_execcgi']}{$lng['extras']['view_phpversionselect']}{$lng['extras']['error404path']}{$lng['extras']['error403path']}{$lng['extras']['error500path']}
{$lng['extras']['pathoptions_add']}{$lng['extras']['pathoptions_add']}
-
diff --git a/syscp/patches/syscp-patches/syscp-1.2.13-gentoo-compatibility.patch b/syscp/patches/syscp-patches/syscp-1.2.13-gentoo-compatibility.patch deleted file mode 100644 index 288f2a6..0000000 --- a/syscp/patches/syscp-patches/syscp-1.2.13-gentoo-compatibility.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff -Nru syscp/admin_customers.php syscp-gentoo-comp/admin_customers.php ---- syscp/admin_customers.php 2006-03-25 23:38:00.000000000 +0100 -+++ syscp-gentoo-comp/admin_customers.php 2006-03-26 00:39:05.000000000 +0100 -@@ -421,7 +421,7 @@ - $db->query( - "INSERT INTO `".TABLE_PANEL_DOMAINS."` " . - "(`domain`, `customerid`, `adminid`, `parentdomainid`, `documentroot`, `zonefile`, `isemaildomain`, `caneditdomain`, `openbasedir`, `safemode`, `speciallogfile`, `specialsettings`) " . -- "VALUES ('$loginname.{$settings['system']['hostname']}', '$customerid', '{$userinfo['adminid']}', '-1', '$documentroot', '', '0', '0', '1', '1', '0', '')" -+ "VALUES ('$loginname.{$settings['system']['hostname']}', '$customerid', '{$userinfo['adminid']}', '-1', '$documentroot', '', '1', '1', '1', '1', '0', '')" - ); - $domainid=$db->insert_id(); - $db->query( -@@ -552,7 +552,7 @@ - $db->query( - "INSERT INTO `".TABLE_PANEL_DOMAINS."` " . - "(`domain`, `customerid`, `adminid`, `documentroot`, `zonefile`, `isemaildomain`, `caneditdomain`, `openbasedir`, `safemode`, `speciallogfile`, `specialsettings`) " . -- "VALUES ('{$result['loginname']}.{$settings['system']['hostname']}', '{$result['customerid']}', '{$userinfo['adminid']}', '{$result['documentroot']}', '', '0', '0', '1', '1', '0', '')" -+ "VALUES ('{$result['loginname']}.{$settings['system']['hostname']}', '{$result['customerid']}', '{$userinfo['adminid']}', '{$result['documentroot']}', '', '1', '1', '1', '1', '0', '')" - ); - $domainid=$db->insert_id(); - $db->query( -diff -Nru syscp/admin_domains.php syscp-gentoo-comp/admin_domains.php ---- syscp/admin_domains.php 2006-03-25 23:38:00.000000000 +0100 -+++ syscp-gentoo-comp/admin_domains.php 2006-03-26 00:39:05.000000000 +0100 -@@ -390,9 +390,9 @@ - { - $domains.=makeoption($idna_convert->decode($row_domain['domain']).' ('.$row_domain['loginname'].')',$row_domain['id']); - } -- $isbinddomain=makeyesno('isbinddomain', '1', '0', '1'); -+ $isbinddomain=makeyesno('isbinddomain', '1', '0', '0'); - $isemaildomain=makeyesno('isemaildomain', '1', '0', '1'); -- $subcanemaildomain=makeyesno('subcanemaildomain', '1', '0', '0'); -+ $subcanemaildomain=makeyesno('subcanemaildomain', '1', '0', '1'); - $caneditdomain=makeyesno('caneditdomain', '1', '0', '1'); - $openbasedir=makeyesno('openbasedir', '1', '0', '1'); - $safemode=makeyesno('safemode', '1', '0', '1'); -diff -Nru syscp/customer_email.php syscp-gentoo-comp/customer_email.php ---- syscp/customer_email.php 2006-03-25 23:38:00.000000000 +0100 -+++ syscp-gentoo-comp/customer_email.php 2006-03-26 00:39:05.000000000 +0100 -@@ -285,7 +285,7 @@ - - else - { -- $db->query("INSERT INTO `".TABLE_MAIL_USERS."` (`customerid`, `email`, `username`, `password`, `password_enc`, `homedir`, `maildir`, `uid`, `gid`, `domainid`, `postfix`) VALUES ('".$userinfo['customerid']."', '$email_full', '$username', '$password', ENCRYPT('$password'), '".$settings['system']['vmail_homedir']."', '".$userinfo['loginname']."/$email_full/', '".$settings['system']['vmail_uid']."', '".$settings['system']['vmail_gid']."', '".$result['domainid']."', 'y')"); -+ $db->query("INSERT INTO `".TABLE_MAIL_USERS."` (`customerid`, `email`, `username`, `password`, `password_enc`, `homedir`, `maildir`, `uid`, `gid`, `domainid`, `postfix`) VALUES ('".$userinfo['customerid']."', '$email_full', '$username', '', ENCRYPT('$password'), '".$settings['system']['vmail_homedir']."', '".$userinfo['loginname']."/$email_full/', '".$settings['system']['vmail_uid']."', '".$settings['system']['vmail_gid']."', '".$result['domainid']."', 'y')"); - $popaccountid = $db->insert_id(); - $result['destination'] .= ' ' . $email_full; - $db->query("UPDATE `".TABLE_MAIL_VIRTUAL."` SET `destination` = '".makeCorrectDestination($result['destination'])."', `popaccountid` = '$popaccountid' WHERE `customerid`='".$userinfo['customerid']."' AND `id`='$id'"); -@@ -333,7 +333,7 @@ - } - else - { -- $result=$db->query("UPDATE `".TABLE_MAIL_USERS."` SET `password` = '$password', `password_enc`=ENCRYPT('$password') WHERE `customerid`='".$userinfo['customerid']."' AND `id`='".$result['popaccountid']."'"); -+ $result=$db->query("UPDATE `".TABLE_MAIL_USERS."` SET `password` = '', `password_enc`=ENCRYPT('$password') WHERE `customerid`='".$userinfo['customerid']."' AND `id`='".$result['popaccountid']."'"); - redirectTo ( $filename , Array ( 'page' => 'emails' , 'action' => 'edit' , 'id' => $id , 's' => $s ) ) ; - } - } -diff -Nru syscp/scripts/cron_tasks.php syscp-gentoo-comp/scripts/cron_tasks.php ---- syscp/scripts/cron_tasks.php 2006-03-25 23:38:02.000000000 +0100 -+++ syscp-gentoo-comp/scripts/cron_tasks.php 2006-03-26 00:39:05.000000000 +0100 -@@ -70,10 +70,10 @@ - } - $vhosts_file.="\n"; - -- $vhosts_file.='# DummyHost for DefaultSite'."\n"; -- $vhosts_file.=''."\n"; -- $vhosts_file.='ServerName '.$settings['system']['hostname']."\n"; -- $vhosts_file.=''."\n"."\n"; -+// $vhosts_file.='# DummyHost for DefaultSite'."\n"; -+// $vhosts_file.=''."\n"; -+// $vhosts_file.='ServerName '.$settings['system']['hostname']."\n"; -+// $vhosts_file.=''."\n"."\n"; - - $result_domains=$db->query("SELECT `d`.`id`, `d`.`domain`, `d`.`customerid`, `d`.`documentroot`, CONCAT(`ip`.`ip`,':',`ip`.`port`) AS `ipandport`, `d`.`parentdomainid`, `d`.`isemaildomain`, `d`.`iswildcarddomain`, `d`.`openbasedir`, `d`.`safemode`, `d`.`speciallogfile`, `d`.`specialsettings`, `pd`.`domain` AS `parentdomain`, `c`.`loginname`, `c`.`guid`, `c`.`email`, `c`.`documentroot` AS `customerroot` FROM `".TABLE_PANEL_DOMAINS."` `d` LEFT JOIN `".TABLE_PANEL_CUSTOMERS."` `c` USING(`customerid`) LEFT JOIN `".TABLE_PANEL_DOMAINS."` `pd` ON (`pd`.`id` = `d`.`parentdomainid`) LEFT JOIN `".TABLE_PANEL_IPSANDPORTS."` `ip` ON (`d`.`ipandport` = `ip`.`id`) WHERE `d`.`deactivated` <> '1' AND `d`.`aliasdomain` IS NULL ORDER BY `d`.`iswildcarddomain`, `d`.`domain` ASC"); - while($domain=$db->fetch_array($result_domains)) -@@ -172,6 +172,7 @@ - safe_exec('cp -a '.$pathtophpfiles.'/templates/misc/standardcustomer/* "'.$settings['system']['documentroot_prefix'].$row['data']['loginname'].'/"'); - safe_exec('chown -R '.$row['data']['uid'].':'.$row['data']['gid'].' "'.$settings['system']['documentroot_prefix'].$row['data']['loginname'].'"'); - safe_exec('chown -R '.$settings['system']['vmail_uid'].':'.$settings['system']['vmail_gid'].' "'.$settings['system']['vmail_homedir'].$row['data']['loginname'].'"'); -+ safe_exec('chmod 0750 "'.$settings['system']['vmail_homedir'].$row['data']['loginname'].'"'); - } - } - diff --git a/syscp/patches/syscp-patches/syscp-1.2.13-patches-r3.tar.bz2 b/syscp/patches/syscp-patches/syscp-1.2.13-patches-r3.tar.bz2 deleted file mode 100644 index a4be393..0000000 Binary files a/syscp/patches/syscp-patches/syscp-1.2.13-patches-r3.tar.bz2 and /dev/null differ diff --git a/syscp/patches/syscp-sqlfile/syscp-1.2.13-addopts-db.sql b/syscp/patches/syscp-sqlfile/syscp-1.2.13-addopts-db.sql deleted file mode 100644 index 1bc4b28..0000000 --- a/syscp/patches/syscp-sqlfile/syscp-1.2.13-addopts-db.sql +++ /dev/null @@ -1,7 +0,0 @@ -USE `MYSQL_DATABASE_NAME` ; - -ALTER TABLE `panel_domains` ADD `ssi_includes` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `parentdomainid` , -ADD `php_engine` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `ssi_includes` , -ADD `php_errordisplay` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `safemode` ; - -ALTER TABLE `panel_htaccess` ADD `options_execcgi` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `options_indexes` ; diff --git a/syscp/patches/syscp-sqlfile/syscp-1.2.13-baseinstall-db.sql b/syscp/patches/syscp-sqlfile/syscp-1.2.13-baseinstall-db.sql deleted file mode 100644 index f02d175..0000000 --- a/syscp/patches/syscp-sqlfile/syscp-1.2.13-baseinstall-db.sql +++ /dev/null @@ -1,646 +0,0 @@ -# $Id: syscp.sql,v 1.50 2005/09/21 10:33:05 flo Exp $ -# -------------------------------------------------------- - -# -# Delete old users and databases if present -# - -DELETE FROM `mysql`.`user` WHERE `User` = 'MYSQL_UNPRIV_USER' AND `Host` = 'MYSQL_ACCESS_HOST'; -DELETE FROM `mysql`.`db` WHERE `User` = 'MYSQL_UNPRIV_USER' AND `Host` = 'MYSQL_ACCESS_HOST'; -DELETE FROM `mysql`.`tables_priv` WHERE `User` = 'MYSQL_UNPRIV_USER' AND `Host` = 'MYSQL_ACCESS_HOST'; -DELETE FROM `mysql`.`columns_priv` WHERE `User` = 'MYSQL_UNPRIV_USER' AND `Host` = 'MYSQL_ACCESS_HOST'; -DROP DATABASE IF EXISTS `MYSQL_DATABASE_NAME`; -FLUSH PRIVILEGES; - -# -# Create new users and databases -# - -CREATE DATABASE `MYSQL_DATABASE_NAME`; -GRANT ALL PRIVILEGES ON `MYSQL_DATABASE_NAME`.* TO MYSQL_UNPRIV_USER@MYSQL_ACCESS_HOST IDENTIFIED BY 'password'; -SET PASSWORD FOR MYSQL_UNPRIV_USER@MYSQL_ACCESS_HOST = PASSWORD('MYSQL_UNPRIV_PASSWORD'); -FLUSH PRIVILEGES; - -USE `MYSQL_DATABASE_NAME`; - -# -# Table structure for table `ftp_groups` -# - -DROP TABLE IF EXISTS `ftp_groups`; -CREATE TABLE `ftp_groups` ( - `id` int(20) NOT NULL auto_increment, - `groupname` varchar(60) NOT NULL default '', - `gid` int(5) NOT NULL default '0', - `members` longtext NOT NULL, - `customerid` int(11) NOT NULL default '0', - PRIMARY KEY (`id`), - UNIQUE KEY `groupname` (`groupname`), - KEY `customerid` (`customerid`) -) TYPE=MyISAM ; - -# -# Dumping data for table `ftp_groups` -# - - -# -------------------------------------------------------- - -# -# Table structure for table `ftp_users` -# - -DROP TABLE IF EXISTS `ftp_users`; -CREATE TABLE `ftp_users` ( - `id` int(20) NOT NULL auto_increment, - `username` varchar(128) NOT NULL default '', - `uid` int(5) NOT NULL default '0', - `gid` int(5) NOT NULL default '0', - `password` varchar(128) NOT NULL default '', - `homedir` varchar(255) NOT NULL default '', - `shell` varchar(255) NOT NULL default '/bin/false', - `login_enabled` enum('N','Y') NOT NULL default 'N', - `login_count` int(15) NOT NULL default '0', - `last_login` datetime NOT NULL default '0000-00-00 00:00:00', - `up_count` int(15) NOT NULL default '0', - `up_bytes` bigint(30) NOT NULL default '0', - `down_count` int(15) NOT NULL default '0', - `down_bytes` bigint(30) NOT NULL default '0', - `customerid` int(11) NOT NULL default '0', - PRIMARY KEY (`id`), - UNIQUE KEY `username` (`username`), - KEY `customerid` (`customerid`) -) TYPE=MyISAM ; - -# -# Dumping data for table `ftp_users` -# - -# -------------------------------------------------------- - - -# -# Table structure for table `mail_users` -# - -DROP TABLE IF EXISTS `mail_users`; -CREATE TABLE `mail_users` ( - `id` int(11) NOT NULL auto_increment, - `email` varchar(255) NOT NULL default '', - `username` varchar(255) NOT NULL default '', - `password` varchar(128) NOT NULL default '', - `password_enc` varchar(128) NOT NULL default '', - `uid` int(11) NOT NULL default '0', - `gid` int(11) NOT NULL default '0', - `homedir` varchar(255) NOT NULL default '', - `maildir` varchar(255) NOT NULL default '', - `postfix` enum('Y','N') NOT NULL default 'Y', - `domainid` int(11) NOT NULL default '0', - `customerid` int(11) NOT NULL default '0', - PRIMARY KEY (`id`), - UNIQUE KEY `email` (`email`) -) TYPE=MyISAM ; - -# -# Dumping data for table `mail_users` -# - - -# -------------------------------------------------------- - -# -# Table structure for table `mail_virtual` -# - -DROP TABLE IF EXISTS `mail_virtual`; -CREATE TABLE `mail_virtual` ( - `id` int(11) NOT NULL auto_increment, - `email` varchar(255) NOT NULL default '', - `email_full` varchar(255) NOT NULL default '', - `destination` text NOT NULL, - `domainid` int(11) NOT NULL default '0', - `customerid` int(11) NOT NULL default '0', - `popaccountid` int(11) NOT NULL default '0', - `iscatchall` tinyint(1) unsigned NOT NULL default '0', - PRIMARY KEY (`id`) -) TYPE=MyISAM ; - -# -# Dumping data for table `mail_virtual` -# - -# -------------------------------------------------------- - - -# -# Table structure for table `panel_admins` -# - -DROP TABLE IF EXISTS `panel_admins`; -CREATE TABLE `panel_admins` ( - `adminid` int(11) unsigned NOT NULL auto_increment, - `loginname` varchar(50) NOT NULL default '', - `password` varchar(50) NOT NULL default '', - `name` varchar(255) NOT NULL default '', - `email` varchar(255) NOT NULL default '', - `def_language` varchar(255) NOT NULL default '', - `customers` int(15) NOT NULL default '0', - `customers_used` int(15) NOT NULL default '0', - `customers_see_all` tinyint(1) NOT NULL default '0', - `domains` int(15) NOT NULL default '0', - `domains_used` int(15) NOT NULL default '0', - `domains_see_all` tinyint(1) NOT NULL default '0', - `change_serversettings` tinyint(1) NOT NULL default '0', - `diskspace` int(15) NOT NULL default '0', - `diskspace_used` int(15) NOT NULL default '0', - `mysqls` int(15) NOT NULL default '0', - `mysqls_used` int(15) NOT NULL default '0', - `emails` int(15) NOT NULL default '0', - `emails_used` int(15) NOT NULL default '0', - `email_accounts` int(15) NOT NULL default '0', - `email_accounts_used` int(15) NOT NULL default '0', - `email_forwarders` int(15) NOT NULL default '0', - `email_forwarders_used` int(15) NOT NULL default '0', - `ftps` int(15) NOT NULL default '0', - `ftps_used` int(15) NOT NULL default '0', - `subdomains` int(15) NOT NULL default '0', - `subdomains_used` int(15) NOT NULL default '0', - `traffic` int(15) NOT NULL default '0', - `traffic_used` int(15) NOT NULL default '0', - `deactivated` tinyint(1) NOT NULL default '0', - `lastlogin_succ` int(11) unsigned NOT NULL default '0', - `lastlogin_fail` int(11) unsigned NOT NULL default '0', - `loginfail_count` int(11) unsigned NOT NULL default '0', - PRIMARY KEY (`adminid`) -) TYPE=MyISAM ; - - -# -------------------------------------------------------- - -# -# Table structure for table `panel_customers` -# - -DROP TABLE IF EXISTS `panel_customers`; -CREATE TABLE `panel_customers` ( - `customerid` int(11) unsigned NOT NULL auto_increment, - `loginname` varchar(50) NOT NULL default '', - `password` varchar(50) NOT NULL default '', - `adminid` int(11) unsigned NOT NULL default '0', - `name` varchar(255) NOT NULL default '', - `firstname` varchar(255) NOT NULL default '', - `company` varchar(255) NOT NULL default '', - `street` varchar(255) NOT NULL default '', - `zipcode` varchar(255) NOT NULL default '', - `city` varchar(255) NOT NULL default '', - `phone` varchar(255) NOT NULL default '', - `fax` varchar(255) NOT NULL default '', - `email` varchar(255) NOT NULL default '', - `customernumber` varchar(255) NOT NULL default '', - `def_language` varchar(255) NOT NULL default '', - `diskspace` int(15) NOT NULL default '0', - `diskspace_used` int(15) NOT NULL default '0', - `mysqls` int(15) NOT NULL default '0', - `mysqls_used` int(15) NOT NULL default '0', - `emails` int(15) NOT NULL default '0', - `emails_used` int(15) NOT NULL default '0', - `email_accounts` int(15) NOT NULL default '0', - `email_accounts_used` int(15) NOT NULL default '0', - `email_forwarders` int(15) NOT NULL default '0', - `email_forwarders_used` int(15) NOT NULL default '0', - `ftps` int(15) NOT NULL default '0', - `ftps_used` int(15) NOT NULL default '0', - `subdomains` int(15) NOT NULL default '0', - `subdomains_used` int(15) NOT NULL default '0', - `traffic` int(15) NOT NULL default '0', - `traffic_used` int(15) NOT NULL default '0', - `documentroot` varchar(255) NOT NULL default '', - `standardsubdomain` int(11) NOT NULL default '0', - `guid` int(5) NOT NULL default '0', - `ftp_lastaccountnumber` int(11) NOT NULL default '0', - `mysql_lastaccountnumber` int(11) NOT NULL default '0', - `deactivated` tinyint(1) NOT NULL default '0', - `lastlogin_succ` int(11) unsigned NOT NULL default '0', - `lastlogin_fail` int(11) unsigned NOT NULL default '0', - `loginfail_count` int(11) unsigned NOT NULL default '0', - PRIMARY KEY (`customerid`), - KEY `loginname` (`loginname`) -) TYPE=MyISAM ; -# -# Dumping data for table `panel_customers` -# - - -# -------------------------------------------------------- - -# -# Table structure for table `panel_databases` -# - -DROP TABLE IF EXISTS `panel_databases`; -CREATE TABLE `panel_databases` ( - `id` int(11) unsigned NOT NULL auto_increment, - `customerid` int(11) NOT NULL default '0', - `databasename` varchar(255) NOT NULL default '', - `description` varchar(255) NOT NULL default '', - PRIMARY KEY (`id`), - KEY `customerid` (`customerid`) -) TYPE=MyISAM ; - -# -# Dumping data for table `panel_databases` -# - - -# -------------------------------------------------------- - -# -# Table structure for table `panel_domains` -# -DROP TABLE IF EXISTS `panel_domains`; -CREATE TABLE `panel_domains` ( - `id` int(11) unsigned NOT NULL auto_increment, - `domain` varchar(255) NOT NULL default '', - `adminid` int(11) unsigned NOT NULL default '0', - `customerid` int(11) unsigned NOT NULL default '0', - `aliasdomain` int(11) unsigned NULL, - `documentroot` varchar(255) NOT NULL default '', - `ipandport` int(11) unsigned NOT NULL default '1', - `isbinddomain` tinyint(1) NOT NULL default '0', - `isemaildomain` tinyint(1) NOT NULL default '0', - `iswildcarddomain` tinyint(1) NOT NULL default '0', - `subcanemaildomain` tinyint(1) NOT NULL default '0', - `caneditdomain` tinyint(1) NOT NULL default '1', - `zonefile` varchar(255) NOT NULL default '', - `parentdomainid` int(11) unsigned NOT NULL default '0', - `openbasedir` tinyint(1) NOT NULL default '0', - `safemode` tinyint(1) NOT NULL default '0', - `speciallogfile` tinyint(1) NOT NULL default '0', - `specialsettings` text NOT NULL, - `deactivated` tinyint(1) NOT NULL default '0', - PRIMARY KEY (`id`), - KEY `customerid` (`customerid`), - KEY `parentdomain` (`parentdomainid`) -) TYPE=MyISAM ; - -# -# Dumping data for table `panel_domains` -# - - -# -------------------------------------------------------- - -# -# Table structure for table `panel_ipsandports` -# -DROP TABLE IF EXISTS `panel_ipsandports`; -CREATE TABLE `panel_ipsandports` ( - `id` int(11) unsigned NOT NULL auto_increment, - `ip` varchar(15) NOT NULL default '', - `port` int(5) NOT NULL default '80', - `default` int(1) NOT NULL default '0', - PRIMARY KEY (`id`) -) TYPE=MyISAM ; - -# -# Dumping data for table `panel_ipsandports` -# - - -# -------------------------------------------------------- - -# -# Table structure for table `panel_htaccess` -# - -DROP TABLE IF EXISTS `panel_htaccess`; -CREATE TABLE `panel_htaccess` ( - `id` int(11) unsigned NOT NULL auto_increment, - `customerid` int(11) unsigned NOT NULL default '0', - `path` varchar(255) NOT NULL default '', - `options_indexes` tinyint(1) NOT NULL default '0', - `error404path` varchar(255) NOT NULL default '', - `error403path` varchar(255) NOT NULL default '', - `error500path` varchar(255) NOT NULL default '', - PRIMARY KEY (`id`) -) TYPE=MyISAM ; - -# -# Dumping data for table `panel_htaccess` -# - - -# -------------------------------------------------------- - -# -# Table structure for table `panel_htpasswds` -# - -DROP TABLE IF EXISTS `panel_htpasswds`; -CREATE TABLE `panel_htpasswds` ( - `id` int(11) unsigned NOT NULL auto_increment, - `customerid` int(11) unsigned NOT NULL default '0', - `path` varchar(255) NOT NULL default '', - `username` varchar(255) NOT NULL default '', - `password` varchar(255) NOT NULL default '', - PRIMARY KEY (`id`), - KEY `customerid` (`customerid`) -) TYPE=MyISAM ; - -# -# Dumping data for table `panel_htpasswds` -# - - -# -------------------------------------------------------- - -# -# Table structure for table `panel_sessions` -# - -DROP TABLE IF EXISTS `panel_sessions`; -CREATE TABLE `panel_sessions` ( - `hash` varchar(32) NOT NULL default '', - `userid` int(11) unsigned NOT NULL default '0', - `ipaddress` varchar(16) NOT NULL default '', - `useragent` varchar(255) NOT NULL default '', - `lastactivity` int(11) unsigned NOT NULL default '0', - `language` varchar(64) NOT NULL default '', - `adminsession` tinyint(1) unsigned NOT NULL default '0', - PRIMARY KEY (`hash`), - KEY `userid` (`userid`) -) TYPE=HEAP; - -# -# Dumping data for table `panel_sessions` -# - - -# -------------------------------------------------------- - -# -# Table structure for table `panel_settings` -# - -DROP TABLE IF EXISTS `panel_settings`; -CREATE TABLE `panel_settings` ( - `settingid` int(11) unsigned NOT NULL auto_increment, - `settinggroup` varchar(255) NOT NULL default '', - `varname` varchar(255) NOT NULL default '', - `value` text NOT NULL, - PRIMARY KEY (`settingid`) -) TYPE=MyISAM ; - - -# -------------------------------------------------------- - -# -# Dumping data for table `panel_settings` -# - -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (1, 'session', 'sessiontimeout', '600'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (2, 'panel', 'adminmail', 'admin@SERVERNAME'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (3, 'panel', 'phpmyadmin_url', ''); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (5, 'customer', 'accountprefix', 'web'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (6, 'customer', 'ftpprefix', 'f'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (7, 'customer', 'mysqlprefix', 's'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (8, 'system', 'lastaccountnumber', '0'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (9, 'system', 'lastguid', '10000'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (10, 'system', 'documentroot_prefix', '/var/www/syscpwebs/'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (11, 'system', 'logfiles_directory', '/var/log/syscplogs/'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (12, 'system', 'ipaddress', 'SERVERIP'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (13, 'system', 'apacheconf_directory', '/etc/apache2/'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (14, 'system', 'apachereload_command', '/etc/init.d/apache2 reload'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (15, 'system', 'last_traffic_run', '000000'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (16, 'system', 'vmail_uid', '9997'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (17, 'system', 'vmail_gid', '9997'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (18, 'system', 'vmail_homedir', '/var/syscpvmail/'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (19, 'system', 'bindconf_directory', '/etc/bind/'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (20, 'system', 'bindreload_command', '/bin/true'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (21, 'system', 'binddefaultzone', 'default.zone'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '1.2.13'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (23, 'system', 'hostname', 'SERVERNAME'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (24, 'login', 'maxloginattempts', '3'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (25, 'login', 'deactivatetime', '900'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (26, 'panel', 'webmail_url', ''); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (27, 'panel', 'webftp_url', ''); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (28, 'panel', 'standardlanguage', 'English'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (29, 'system', 'mysql_access_host', 'MYSQL_ACCESS_HOST'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (30, 'panel', 'pathedit', 'Manual'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (31, 'system', 'apacheconf_filename', 'vhosts.d/99_syscp-vhosts.conf'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (32, 'system', 'lastcronrun', UNIX_TIMESTAMP()); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (33, 'panel', 'paging', '20'); - -# -------------------------------------------------------- - -# -# Table structure for table `panel_tasks` -# - -DROP TABLE IF EXISTS `panel_tasks`; -CREATE TABLE `panel_tasks` ( - `id` int(11) unsigned NOT NULL auto_increment, - `type` int(11) NOT NULL default '0', - `data` text NOT NULL, - PRIMARY KEY (`id`) -) TYPE=MyISAM ; - -# -# Dumping data for table `panel_tasks` -# - - -# -------------------------------------------------------- - -# -# Table structure for table `panel_templates` -# - -DROP TABLE IF EXISTS `panel_templates`; -CREATE TABLE `panel_templates` ( - `id` int(11) NOT NULL auto_increment, - `adminid` int(11) NOT NULL default '0', - `language` varchar(255) NOT NULL default '', - `templategroup` varchar(255) NOT NULL default '', - `varname` varchar(255) NOT NULL default '', - `value` longtext NOT NULL, - PRIMARY KEY (id), - KEY adminid (adminid) -) TYPE=MyISAM; - -# -# Dumping data for table `panel_templates` -# - - -# -------------------------------------------------------- - -# -# Table structure for table `panel_traffic` -# - -DROP TABLE IF EXISTS `panel_traffic`; -CREATE TABLE `panel_traffic` ( - `id` int(11) unsigned NOT NULL auto_increment, - `customerid` int(11) unsigned NOT NULL default '0', - `year` int(4) unsigned zerofill NOT NULL default '0000', - `month` int(2) unsigned zerofill NOT NULL default '00', - `day` int(2) unsigned zerofill NOT NULL default '00', - `http` bigint(30) unsigned NOT NULL default '0', - `ftp_up` bigint(30) unsigned NOT NULL default '0', - `ftp_down` bigint(30) unsigned NOT NULL default '0', - `mail` bigint(30) unsigned NOT NULL default '0', - PRIMARY KEY (`id`), - KEY `customerid` (`customerid`), - UNIQUE `date` (`customerid` , `year` , `month` , `day`) -) TYPE=MyISAM ; - -# -# Dumping data for table `panel_traffic` -# - - -# -------------------------------------------------------- - -# -# Table structure for table `panel_traffic_admins` -# - -DROP TABLE IF EXISTS `panel_traffic_admins`; -CREATE TABLE `panel_traffic_admins` ( - `id` int(11) unsigned NOT NULL auto_increment, - `adminid` int(11) unsigned NOT NULL default '0', - `year` int(4) unsigned zerofill NOT NULL default '0000', - `month` int(2) unsigned zerofill NOT NULL default '00', - `day` int(2) unsigned zerofill NOT NULL default '00', - `http` bigint(30) unsigned NOT NULL default '0', - `ftp_up` bigint(30) unsigned NOT NULL default '0', - `ftp_down` bigint(30) unsigned NOT NULL default '0', - `mail` bigint(30) unsigned NOT NULL default '0', - PRIMARY KEY (`id`), - KEY `adminid` (`adminid`), - UNIQUE `date` (`adminid` , `year` , `month` , `day`) -) TYPE=MyISAM ; - -# -# Dumping data for table `panel_traffic_admins` -# - - -# -------------------------------------------------------- - -# -# Table structure for table `panel_navigation` -# - -DROP TABLE IF EXISTS `panel_navigation`; -CREATE TABLE `panel_navigation` ( - `id` int(11) unsigned NOT NULL auto_increment, - `area` varchar(20) NOT NULL default '', - `parent_url` varchar(255) NOT NULL default '', - `lang` varchar(255) NOT NULL default '', - `url` varchar(255) NOT NULL default '', - `order` int(4) NOT NULL default '0', - `required_resources` varchar(255) NOT NULL default '', - `new_window` tinyint(1) unsigned NOT NULL default '0', - PRIMARY KEY (`id`) -) TYPE=MyISAM ; - -# -# Dumping data for table `panel_navigation` -# - -INSERT INTO `panel_navigation` VALUES (1, 'login', '', 'login;login', 'login.nourl', '10', '', 0); -INSERT INTO `panel_navigation` VALUES (2, 'login', 'login.nourl', 'login;login', 'index.php', '10', '', 0); -INSERT INTO `panel_navigation` VALUES (3, 'customer', '', 'menue;main;main', 'customer_index.php', '10', '', 0); -INSERT INTO `panel_navigation` VALUES (4, 'customer', 'customer_index.php', 'menue;main;changepassword', 'customer_index.php?page=change_password', '10', '', 0); -INSERT INTO `panel_navigation` VALUES (5, 'customer', 'customer_index.php', 'menue;main;changelanguage', 'customer_index.php?page=change_language', '20', '', 0); -INSERT INTO `panel_navigation` VALUES (6, 'customer', 'customer_index.php', 'login;logout', 'customer_index.php?action=logout', '30', '', 0); -INSERT INTO `panel_navigation` VALUES (7, 'customer', '', 'menue;email;email', 'customer_email.php', '20', '', 0); -INSERT INTO `panel_navigation` VALUES (8, 'customer', 'customer_email.php', 'menue;email;emails', 'customer_email.php?page=emails', '10', 'emails', 0); -INSERT INTO `panel_navigation` VALUES (9, 'customer', '', 'menue;mysql;mysql', 'customer_mysql.php', '30', '', 0); -INSERT INTO `panel_navigation` VALUES (10, 'customer', 'customer_mysql.php', 'menue;mysql;databases', 'customer_mysql.php?page=mysqls', '10', 'mysqls', 0); -INSERT INTO `panel_navigation` VALUES (11, 'customer', '', 'menue;domains;domains', 'customer_domains.php', '40', '', 0); -INSERT INTO `panel_navigation` VALUES (12, 'customer', 'customer_domains.php', 'menue;domains;settings', 'customer_domains.php?page=domains', '10', '', 0); -INSERT INTO `panel_navigation` VALUES (13, 'customer', '', 'menue;ftp;ftp', 'customer_ftp.php', '50', '', 0); -INSERT INTO `panel_navigation` VALUES (14, 'customer', 'customer_ftp.php', 'menue;ftp;accounts', 'customer_ftp.php?page=accounts', '10', '', 0); -INSERT INTO `panel_navigation` VALUES (15, 'customer', '', 'menue;extras;extras', 'customer_extras.php', '60', '', 0); -INSERT INTO `panel_navigation` VALUES (16, 'customer', 'customer_extras.php', 'menue;extras;directoryprotection', 'customer_extras.php?page=htpasswds', '10', '', 0); -INSERT INTO `panel_navigation` VALUES (17, 'customer', 'customer_extras.php', 'menue;extras;pathoptions', 'customer_extras.php?page=htaccess', '20', '', 0); -INSERT INTO `panel_navigation` VALUES (18, 'admin', '', 'admin;overview', 'admin_index.php', '10', '', 0); -INSERT INTO `panel_navigation` VALUES (19, 'admin', 'admin_index.php', 'menue;main;changepassword', 'admin_index.php?page=change_password', '10', '', 0); -INSERT INTO `panel_navigation` VALUES (20, 'admin', 'admin_index.php', 'menue;main;changelanguage', 'admin_index.php?page=change_language', '20', '', 0); -INSERT INTO `panel_navigation` VALUES (21, 'admin', 'admin_index.php', 'login;logout', 'admin_index.php?action=logout', '30', '', 0); -INSERT INTO `panel_navigation` VALUES (22, 'admin', '', 'admin;resources', 'admin_resources.nourl', '20', 'customers', 0); -INSERT INTO `panel_navigation` VALUES (23, 'admin', 'admin_resources.nourl', 'admin;customers', 'admin_customers.php?page=customers', '10', 'customers', 0); -INSERT INTO `panel_navigation` VALUES (24, 'admin', 'admin_resources.nourl', 'admin;domains', 'admin_domains.php?page=domains', '20', 'domains', 0); -INSERT INTO `panel_navigation` VALUES (25, 'admin', 'admin_resources.nourl', 'admin;admins', 'admin_admins.php?page=admins', '30', 'change_serversettings', 0); -INSERT INTO `panel_navigation` VALUES (26, 'admin', '', 'admin;server', 'admin_server.nourl', '30', 'change_serversettings', 0); -INSERT INTO `panel_navigation` VALUES (27, 'admin', 'admin_server.nourl', 'admin;configfiles;serverconfiguration', 'admin_configfiles.php?page=configfiles', '10', 'change_serversettings', 0); -INSERT INTO `panel_navigation` VALUES (28, 'admin', 'admin_server.nourl', 'admin;serversettings', 'admin_settings.php?page=settings', '20', 'change_serversettings', 0); -INSERT INTO `panel_navigation` VALUES (29, 'admin', '', 'admin;templates;templates', 'admin_templates.nourl', '40', '', 0); -INSERT INTO `panel_navigation` VALUES (30, 'admin', 'admin_templates.nourl', 'admin;templates;email', 'admin_templates.php?page=email', '10', '', 0); -INSERT INTO `panel_navigation` VALUES (31, 'admin', 'admin_server.nourl', 'admin;rebuildconf', 'admin_settings.php?page=rebuildconfigs', '30', 'change_serversettings', 0); -INSERT INTO `panel_navigation` VALUES (32, 'admin', 'admin_server.nourl', 'admin;ipsandports;ipsandports', 'admin_ipsandports.php?page=ipsandports', '40', 'change_serversettings', 0); - - -# -------------------------------------------------------- - -# -# Table structure for table `panel_languages` -# - -DROP TABLE IF EXISTS `panel_languages`; -CREATE TABLE `panel_languages` ( - `id` int(11) unsigned NOT NULL auto_increment, - `language` varchar(30) NOT NULL default '', - `file` varchar(255) NOT NULL default '', - PRIMARY KEY (`id`) -) TYPE=MyISAM ; - -# -# Dumping data for table `panel_languages` -# - -INSERT INTO `panel_languages` VALUES (1, 'Deutsch', 'lng/german.lng.php'); -INSERT INTO `panel_languages` VALUES (2, 'English', 'lng/english.lng.php'); -INSERT INTO `panel_languages` VALUES (3, 'Français', 'lng/french.lng.php'); -INSERT INTO `panel_languages` VALUES (4, 'Chinese', 'lng/zh-cn.lng.php'); -INSERT INTO `panel_languages` VALUES (5, 'Catalan', 'lng/catalan.lng.php'); -INSERT INTO `panel_languages` VALUES (6, 'Español', 'lng/spanish.lng.php'); -INSERT INTO `panel_languages` VALUES (7, 'Português', 'lng/portugues.lng.php'); -INSERT INTO `panel_languages` VALUES (8, 'Italiano', 'lng/italian.lng.php'); - - -# -------------------------------------------------------- - -# -# Table structure for table `panel_cronscript` -# - -DROP TABLE IF EXISTS `panel_cronscript`; -CREATE TABLE `panel_cronscript` ( - `id` int(11) unsigned NOT NULL auto_increment, - `file` varchar(255) NOT NULL default '', - PRIMARY KEY (`id`) -) TYPE=MyISAM ; - -# -# Dumping data for table `panel_cronscript` -# - -INSERT INTO `panel_cronscript` (`id`, `file`) VALUES (1, 'cron_traffic.php'); -INSERT INTO `panel_cronscript` (`id`, `file`) VALUES (2, 'cron_tasks.php'); - - -# -# Add the main IP/Port combo -# - -INSERT INTO `panel_ipsandports` (`ip`, `port`, `default`) VALUES ('SERVERIP', '80', '1'); - -# -# Add the main admin user -# - -INSERT INTO `panel_admins` (`loginname`, `password`, `name`, `email`, `customers`, `customers_used`, `customers_see_all`, `domains`, `domains_used`, `domains_see_all`, `change_serversettings`, `diskspace`, `diskspace_used`, `mysqls`, `mysqls_used`, `emails`, `emails_used`, `email_accounts`, `email_accounts_used`, `email_forwarders`, `email_forwarders_used`, `ftps`, `ftps_used`, `subdomains`, `subdomains_used`, `traffic`, `traffic_used`, `deactivated`) VALUES ('ADMIN_USERNAME', MD5('ADMIN_PASSWORD'), 'Siteadmin', 'admin@SERVERNAME', -1, 0, 1, -1, 0, 1, 1, -1024, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1048576, 0, 0); diff --git a/syscp/patches/syscp-sqlfile/syscp-1.2.13-mysqlftpimp-db.sql b/syscp/patches/syscp-sqlfile/syscp-1.2.13-mysqlftpimp-db.sql deleted file mode 100644 index 3f29dea..0000000 --- a/syscp/patches/syscp-sqlfile/syscp-1.2.13-mysqlftpimp-db.sql +++ /dev/null @@ -1,15 +0,0 @@ -USE `MYSQL_DATABASE_NAME` ; - -ALTER TABLE `panel_databases` ADD `databaseuser` VARCHAR( 255 ) NOT NULL AFTER `customerid` ; - -DROP TABLE IF EXISTS `panel_databases_users` ; -CREATE TABLE `panel_databases_users` ( -`id` INT( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT, -`customerid` INT( 11 ) NOT NULL DEFAULT '0', -`databaseuser` VARCHAR( 255 ) NOT NULL, -PRIMARY KEY (`id`), -KEY `customerid` (`customerid`) -) TYPE = MYISAM ; - -ALTER TABLE `panel_customers` ADD `mysqls_used_users` INT( 15 ) NOT NULL DEFAULT '0' AFTER `mysqls_used` ; -ALTER TABLE `panel_customers` ADD `mysql_lastusernumber` INT( 11 ) NOT NULL DEFAULT '0' AFTER `mysql_lastaccountnumber` ; diff --git a/syscp/patches/syscp-sqlfile/syscp-1.2.13-sqlfile-r3.tar.bz2 b/syscp/patches/syscp-sqlfile/syscp-1.2.13-sqlfile-r3.tar.bz2 deleted file mode 100644 index 98fce46..0000000 Binary files a/syscp/patches/syscp-sqlfile/syscp-1.2.13-sqlfile-r3.tar.bz2 and /dev/null differ diff --git a/syscp/patches/syscp-sqlfile/syscp-1.2.13-suphp-db.sql b/syscp/patches/syscp-sqlfile/syscp-1.2.13-suphp-db.sql deleted file mode 100644 index f351acd..0000000 --- a/syscp/patches/syscp-sqlfile/syscp-1.2.13-suphp-db.sql +++ /dev/null @@ -1,3 +0,0 @@ -USE `MYSQL_DATABASE_NAME` ; - -ALTER TABLE `panel_htaccess` ADD `options_phpversionselect` TINYINT( 1 ) NOT NULL DEFAULT '4' AFTER `options_execcgi` ; diff --git a/syscp/www-apps/syscp/Manifest b/syscp/www-apps/syscp/Manifest deleted file mode 100644 index e11a18e..0000000 --- a/syscp/www-apps/syscp/Manifest +++ /dev/null @@ -1,23 +0,0 @@ -DIST syscp-1.2.13-gentoo-config-bind-r2.tar.bz2 15280 RMD160 b0e943e73e983c8e31203dffc19c32e70dabe084 SHA1 8322e893e87f09db3d6fee4405c064b480be392f SHA256 93a173d068d2ae30af9e091941861b35a381a139d55226f2bb98af50d71eef4c -DIST syscp-1.2.13-gentoo-config-bind-ssl-r2.tar.bz2 15312 RMD160 2a8004c7fe7b1aba139662ac730d2847818bbecf SHA1 450e1f7ab357293fad9ded15de7367de5d665254 SHA256 d6c8e6cd7b111c0069ee39404d5db32a082db76df1d31ae35b3f5d36502c9441 -DIST syscp-1.2.13-gentoo-config-nodns-r2.tar.bz2 15032 RMD160 b9cdf3a9c6d66cf5c7cb66432e1d76ffe42669ae SHA1 a7f0435534e3d577bc2f022eb9e7c5d74adb13f7 SHA256 a04468b0d1b007866916d7dff9f934a65dc3558fb69f71dead8c05dcdb20d8ce -DIST syscp-1.2.13-gentoo-config-nodns-ssl-r2.tar.bz2 15035 RMD160 a9fcf09496567e540a67366b2561d6e7f2475a6d SHA1 6bc91e80c9b31b10d957a807a53ef676deb1784e SHA256 8f6e798c60cffad1fb9d2d13f3c4668517f1994dc99bdcc41ad89b74ba81ac0e -DIST syscp-1.2.13-gentoo-syscp-design-r3.tar.bz2 104718 RMD160 d21d42cc5e3545a3b2c7cbcd29074dcbeb590a29 SHA1 d18cf683d2169af6033e96a2d0419b1ea29a7798 SHA256 24ea8105492bc32a5f7f98c23ca0b8bc7cf1f897df274d5275540ca67e5dc93e -DIST syscp-1.2.13-mysql-ftp-patch-r3.tar.bz2 6182 RMD160 aca7e4ebfc9cf109678bbd613c5f8123262274a3 SHA1 7a92adbc79ab783fe624172a7a1c023eafc4a4c9 SHA256 9b9430b7054898f21755d4a4a3382ec7bdfcd548e9ec731a0d18def8de03e847 -DIST syscp-1.2.13-options-patch-r3.tar.bz2 6086 RMD160 e6b6546e1deb176aa6cd6b8deee70a8f8d209f44 SHA1 2a3613f43250f9824436c585818af747f317d382 SHA256 4db6c4728205e600f12e36d61854423069b2f3caf0ca56fc3b4852a0cfab6a54 -DIST syscp-1.2.13-patches-r3.tar.bz2 1971 RMD160 3f82b7a0ff4d24928b4ce5a9296acd06bf1f07db SHA1 9ca05dec43df7a8c0003c3be2c682d52f0df8d0b SHA256 c341c6f33d61cae7576922a6bcdae91d984c51b4bcf694c285924f894eb5d4d6 -DIST syscp-1.2.13-sqlfile-r3.tar.bz2 4092 RMD160 b29764870a6e785b3c24b8110549d186db401286 SHA1 17ec0f98b0a1016ae45b30240793f83f64bdeeb3 SHA256 63652a0c95bdc0db1c526a6b3f2d9b3dc5b2e21f26fe8c15aa17b3474712276e -DIST syscp-1.2.13-suexec-patch-r3.tar.bz2 454 RMD160 e489f780a0e15a8e79b25cd4eb4eb83afe686161 SHA1 d8ec7dce87e019845cec66f73440b7ccb1edfb60 SHA256 d79995958248e7fe2cda67c4f3411ddcb2148fe647a510bda5501f6234867e91 -DIST syscp-1.2.13-suphp-patch-r3.tar.bz2 4019 RMD160 36b4ac3c378e78ca4afdcd9e2846903e9ff5079d SHA1 923ef6c5dfd920dfab15a3d6885dc6d36608b298 SHA256 62b3b289e1bec2e33a40165fde79fd7d9af17bf7666d92c9b1975d158e97b559 -DIST syscp-1.2.13.tar.bz2 87596 RMD160 38115c201f42f0c6416180254f34f6bf351b592d SHA1 2dc4e7ae165b0b308e4abea5c71cfe8da47f8399 SHA256 b48369083de91dab5e733e433ac96eadeda6c02bd8c6d3f96670a32e151dd699 -EBUILD syscp-1.2.13.ebuild 35342 RMD160 d9b73db16f144f7399f13e4dcb31e9ff3196d615 SHA1 6ae4ffac14059d36f24f0aeb6dd9acb8058f8934 SHA256 e1ef8ccdd3c3b5b024318f0d20f82328a1fdb51439103dc10ec1099fb8fb5586 -MD5 360ae6bdf0f1987b9a7ba7e2b8f68ca2 syscp-1.2.13.ebuild 35342 -RMD160 d9b73db16f144f7399f13e4dcb31e9ff3196d615 syscp-1.2.13.ebuild 35342 -SHA256 e1ef8ccdd3c3b5b024318f0d20f82328a1fdb51439103dc10ec1099fb8fb5586 syscp-1.2.13.ebuild 35342 -MISC metadata.xml 234 RMD160 bde4b09055faf7a4cbb9c7e9435fd9ab5594f086 SHA1 a14ac92b63917bb861b95fd337952a7af9a9e4a3 SHA256 b0cd58869f7beca4e79394639da18a8fc4a4cb356c0fa4cef8e9320562a694e7 -MD5 51f893a98c0008dccb7760ff6110a09f metadata.xml 234 -RMD160 bde4b09055faf7a4cbb9c7e9435fd9ab5594f086 metadata.xml 234 -SHA256 b0cd58869f7beca4e79394639da18a8fc4a4cb356c0fa4cef8e9320562a694e7 metadata.xml 234 -MD5 a6590fe22a00eb6feb0eac18cd18d0fd files/digest-syscp-1.2.13 3468 -RMD160 ea23cff266170c2dca76550075c89f1ca7463b71 files/digest-syscp-1.2.13 3468 -SHA256 78b9d7d3a222b290e153fafb005c44838c1496619cf1d69aaf7af07659d8ddfc files/digest-syscp-1.2.13 3468 diff --git a/syscp/www-apps/syscp/files/digest-syscp-1.2.13 b/syscp/www-apps/syscp/files/digest-syscp-1.2.13 deleted file mode 100644 index 233cbc3..0000000 --- a/syscp/www-apps/syscp/files/digest-syscp-1.2.13 +++ /dev/null @@ -1,36 +0,0 @@ -MD5 948c686d23d339dd05300220981a0f21 syscp-1.2.13-gentoo-config-bind-r2.tar.bz2 15280 -RMD160 b0e943e73e983c8e31203dffc19c32e70dabe084 syscp-1.2.13-gentoo-config-bind-r2.tar.bz2 15280 -SHA256 93a173d068d2ae30af9e091941861b35a381a139d55226f2bb98af50d71eef4c syscp-1.2.13-gentoo-config-bind-r2.tar.bz2 15280 -MD5 649d0c3932286b1d9ebf4ce1e8068e7f syscp-1.2.13-gentoo-config-bind-ssl-r2.tar.bz2 15312 -RMD160 2a8004c7fe7b1aba139662ac730d2847818bbecf syscp-1.2.13-gentoo-config-bind-ssl-r2.tar.bz2 15312 -SHA256 d6c8e6cd7b111c0069ee39404d5db32a082db76df1d31ae35b3f5d36502c9441 syscp-1.2.13-gentoo-config-bind-ssl-r2.tar.bz2 15312 -MD5 80ed8f98552aeccb47ca48ee6d1c7769 syscp-1.2.13-gentoo-config-nodns-r2.tar.bz2 15032 -RMD160 b9cdf3a9c6d66cf5c7cb66432e1d76ffe42669ae syscp-1.2.13-gentoo-config-nodns-r2.tar.bz2 15032 -SHA256 a04468b0d1b007866916d7dff9f934a65dc3558fb69f71dead8c05dcdb20d8ce syscp-1.2.13-gentoo-config-nodns-r2.tar.bz2 15032 -MD5 936d13d4903154203ff27986ad0293f7 syscp-1.2.13-gentoo-config-nodns-ssl-r2.tar.bz2 15035 -RMD160 a9fcf09496567e540a67366b2561d6e7f2475a6d syscp-1.2.13-gentoo-config-nodns-ssl-r2.tar.bz2 15035 -SHA256 8f6e798c60cffad1fb9d2d13f3c4668517f1994dc99bdcc41ad89b74ba81ac0e syscp-1.2.13-gentoo-config-nodns-ssl-r2.tar.bz2 15035 -MD5 d60775187593aa76b441ca8bd646b473 syscp-1.2.13-gentoo-syscp-design-r3.tar.bz2 104718 -RMD160 d21d42cc5e3545a3b2c7cbcd29074dcbeb590a29 syscp-1.2.13-gentoo-syscp-design-r3.tar.bz2 104718 -SHA256 24ea8105492bc32a5f7f98c23ca0b8bc7cf1f897df274d5275540ca67e5dc93e syscp-1.2.13-gentoo-syscp-design-r3.tar.bz2 104718 -MD5 32adbf66a443dcab25305f062329aae9 syscp-1.2.13-mysql-ftp-patch-r3.tar.bz2 6182 -RMD160 aca7e4ebfc9cf109678bbd613c5f8123262274a3 syscp-1.2.13-mysql-ftp-patch-r3.tar.bz2 6182 -SHA256 9b9430b7054898f21755d4a4a3382ec7bdfcd548e9ec731a0d18def8de03e847 syscp-1.2.13-mysql-ftp-patch-r3.tar.bz2 6182 -MD5 cf737cb736cb80ad6f60e3c6d1fa665d syscp-1.2.13-options-patch-r3.tar.bz2 6086 -RMD160 e6b6546e1deb176aa6cd6b8deee70a8f8d209f44 syscp-1.2.13-options-patch-r3.tar.bz2 6086 -SHA256 4db6c4728205e600f12e36d61854423069b2f3caf0ca56fc3b4852a0cfab6a54 syscp-1.2.13-options-patch-r3.tar.bz2 6086 -MD5 ff1f8ac15963f01a5d0df9064dafb870 syscp-1.2.13-patches-r3.tar.bz2 1971 -RMD160 3f82b7a0ff4d24928b4ce5a9296acd06bf1f07db syscp-1.2.13-patches-r3.tar.bz2 1971 -SHA256 c341c6f33d61cae7576922a6bcdae91d984c51b4bcf694c285924f894eb5d4d6 syscp-1.2.13-patches-r3.tar.bz2 1971 -MD5 07f55545d56cd41d6556e22bb8171c08 syscp-1.2.13-sqlfile-r3.tar.bz2 4092 -RMD160 b29764870a6e785b3c24b8110549d186db401286 syscp-1.2.13-sqlfile-r3.tar.bz2 4092 -SHA256 63652a0c95bdc0db1c526a6b3f2d9b3dc5b2e21f26fe8c15aa17b3474712276e syscp-1.2.13-sqlfile-r3.tar.bz2 4092 -MD5 18cb2c157d2ee7595b7fe4afc72cc246 syscp-1.2.13-suexec-patch-r3.tar.bz2 454 -RMD160 e489f780a0e15a8e79b25cd4eb4eb83afe686161 syscp-1.2.13-suexec-patch-r3.tar.bz2 454 -SHA256 d79995958248e7fe2cda67c4f3411ddcb2148fe647a510bda5501f6234867e91 syscp-1.2.13-suexec-patch-r3.tar.bz2 454 -MD5 e2f46f57679c8b744fc05ab5ac156925 syscp-1.2.13-suphp-patch-r3.tar.bz2 4019 -RMD160 36b4ac3c378e78ca4afdcd9e2846903e9ff5079d syscp-1.2.13-suphp-patch-r3.tar.bz2 4019 -SHA256 62b3b289e1bec2e33a40165fde79fd7d9af17bf7666d92c9b1975d158e97b559 syscp-1.2.13-suphp-patch-r3.tar.bz2 4019 -MD5 6f1763b28603fe25c8415fa65ab203fb syscp-1.2.13.tar.bz2 87596 -RMD160 38115c201f42f0c6416180254f34f6bf351b592d syscp-1.2.13.tar.bz2 87596 -SHA256 b48369083de91dab5e733e433ac96eadeda6c02bd8c6d3f96670a32e151dd699 syscp-1.2.13.tar.bz2 87596 diff --git a/syscp/www-apps/syscp/metadata.xml b/syscp/www-apps/syscp/metadata.xml deleted file mode 100644 index a7584c8..0000000 --- a/syscp/www-apps/syscp/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - chtekk@gentoo.org - Luca Longinotti - - diff --git a/syscp/www-apps/syscp/syscp-1.2.13.ebuild b/syscp/www-apps/syscp/syscp-1.2.13.ebuild deleted file mode 100644 index 3af125e..0000000 --- a/syscp/www-apps/syscp/syscp-1.2.13.ebuild +++ /dev/null @@ -1,855 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit eutils depend.apache - -KEYWORDS="~x86 ~amd64" -DESCRIPTION="A PHP-based webhosting-oriented control panel for servers." -HOMEPAGE="http://www.syscp.org/ http://svn.gnqs.org/projects/gentoo-syscp-overlay/" -LICENSE="GPL-2" -SLOT="0" -IUSE="sslserv bind mysqlftpimp addopts suexec suphp" - -SYSCP_VERSION="${PV}" -PATCHES_VERSION="r3" -SQLFILE_VERSION="r3" -DESIGN_VERSION="r3" -BIND_SSL_VERSION="r2" -BIND_VERSION="r2" -NODNS_SSL_VERSION="r2" -NODNS_VERSION="r2" -MYSQL_FTP_VERSION="r3" -OPTIONS_VERSION="r3" -SUEXEC_VERSION="r3" -SUPHP_VERSION="r3" - -SRC_URI="http://gentoo.longitekk.com/${PN}-${SYSCP_VERSION}.tar.bz2 - http://gentoo.longitekk.com/${PN}-${PV}-patches-${PATCHES_VERSION}.tar.bz2 - http://gentoo.longitekk.com/${PN}-${PV}-sqlfile-${SQLFILE_VERSION}.tar.bz2 - http://gentoo.longitekk.com/${PN}-${PV}-gentoo-syscp-design-${DESIGN_VERSION}.tar.bz2 - sslserv? ( bind? ( http://gentoo.longitekk.com/${PN}-${PV}-gentoo-config-bind-ssl-${BIND_SSL_VERSION}.tar.bz2 ) !bind? ( http://gentoo.longitekk.com/${PN}-${PV}-gentoo-config-nodns-ssl-${NODNS_SSL_VERSION}.tar.bz2 ) ) - !sslserv? ( bind? ( http://gentoo.longitekk.com/${PN}-${PV}-gentoo-config-bind-${BIND_VERSION}.tar.bz2 ) !bind? ( http://gentoo.longitekk.com/${PN}-${PV}-gentoo-config-nodns-${NODNS_VERSION}.tar.bz2 ) ) - mysqlftpimp? ( http://gentoo.longitekk.com/${PN}-${PV}-mysql-ftp-patch-${MYSQL_FTP_VERSION}.tar.bz2 ) - addopts? ( http://gentoo.longitekk.com/${PN}-${PV}-options-patch-${OPTIONS_VERSION}.tar.bz2 ) - suexec? ( http://gentoo.longitekk.com/${PN}-${PV}-suexec-patch-${SUEXEC_VERSION}.tar.bz2 ) - suphp? ( http://gentoo.longitekk.com/${PN}-${PV}-suphp-patch-${SUPHP_VERSION}.tar.bz2 )" - -DEPEND=">=dev-db/mysql-4 - =dev-lang/php-4* - >=dev-libs/cyrus-sasl-2.1.20-r2 - mail-mta/postfix - net-libs/courier-authlib - >=net-mail/courier-imap-4 - >=net-ftp/proftpd-1.2.10 - >=app-admin/webalizer-2.01.10-r12 - sys-process/vixie-cron - >=sys-auth/libnss-mysql-1.5 - bind? ( net-dns/bind ) - sslserv? ( dev-libs/openssl ) - suphp? ( =dev-lang/php-5* >=www-apache/mod_suphp-0.6.1 )" - -need_apache - -S="${WORKDIR}/${PN}" - -pkg_setup() { - # Check that the packages we depend upon are compiled - # with the required USE flags for Gentoo-SysCP - - einfo - einfo "Checking for required features ..." - einfo - - # Generate PHP dependency checks - local PHP4DEPEND="" - local PHP5DEPEND="" - if useq suphp ; then - PHP4DEPEND="cgi cli ctype expat force-cgi-redirect ftp gd memlimit mysql nls pcre posix session ssl tokenizer xml xsl zlib" - PHP5DEPEND="cgi cli ctype force-cgi-redirect ftp gd memlimit mysql nls pcre posix reflection session simplexml spl ssl tokenizer xml xsl zlib" - else - if useq apache2 ; then - PHP4DEPEND="apache2 cli ctype expat ftp gd memlimit mysql nls pcre posix session ssl tokenizer xml xsl zlib" - else - PHP4DEPEND="apache cli ctype expat ftp gd memlimit mysql nls pcre posix session ssl tokenizer xml xsl zlib" - fi - fi - - if useq sslserv ; then - if ! built_with_use =`best_version '=dev-lang/php-4*'` ${PHP4DEPEND} \ - || ! built_with_use =`best_version 'net-www/apache'` ssl \ - || ! built_with_use =`best_version '>=dev-libs/cyrus-sasl-2.1.20-r2'` crypt mysql ssl \ - || ! built_with_use =`best_version 'mail-mta/postfix'` mysql sasl ssl \ - || ! built_with_use =`best_version 'net-libs/courier-authlib'` crypt mysql \ - || ! built_with_use =`best_version '>=net-ftp/proftpd-1.2.10'` mysql ssl \ - || ! built_with_use =`best_version '>=app-admin/webalizer-2.01.10-r12'` apache2 ; then - eerror - eerror "Gentoo-SysCP requires you to build the following packages with" - eerror "the mentioned USE flags enabled, please make sure they are" - eerror "indeed enabled and then re-emerge ${PF}." - eerror - eerror "=dev-lang/php-4* ${PHP4DEPEND}" - eerror "net-www/apache ssl" - eerror ">=dev-libs/cyrus-sasl-2.1.20-r2 crypt mysql ssl" - eerror "mail-mta/postfix mysql sasl ssl" - eerror "net-libs/courier-authlib crypt mysql" - eerror ">=net-ftp/proftpd-1.2.10 mysql ssl" - eerror ">=app-admin/webalizer-2.01.10-r12 apache2" - eerror - die "Required features for Gentoo-SysCP not found" - fi - else - if ! built_with_use =`best_version '=dev-lang/php-4*'` ${PHP4DEPEND} \ - || ! built_with_use =`best_version '>=dev-libs/cyrus-sasl-2.1.20-r2'` crypt mysql \ - || ! built_with_use =`best_version 'mail-mta/postfix'` mysql sasl \ - || ! built_with_use =`best_version 'net-libs/courier-authlib'` crypt mysql \ - || ! built_with_use =`best_version '>=net-ftp/proftpd-1.2.10'` mysql \ - || ! built_with_use =`best_version '>=app-admin/webalizer-2.01.10-r12'` apache2 ; then - eerror - eerror "Gentoo-SysCP requires you to build the following packages with" - eerror "the mentioned USE flags enabled, please make sure they are" - eerror "indeed enabled and then re-emerge ${PF}." - eerror - eerror "=dev-lang/php-4* ${PHP4DEPEND}" - eerror ">=dev-libs/cyrus-sasl-2.1.20-r2 crypt mysql" - eerror "mail-mta/postfix mysql sasl" - eerror "net-libs/courier-authlib crypt mysql" - eerror ">=net-ftp/proftpd-1.2.10 mysql" - eerror ">=app-admin/webalizer-2.01.10-r12 apache2" - eerror - die "Required features for Gentoo-SysCP not found" - fi - fi - - # Check for PHP5 support and correct mod_suphp USE flags - if useq suphp ; then - if ! built_with_use =`best_version '=dev-lang/php-5*'` ${PHP5DEPEND} ; then - eerror - eerror "Please enable the following USE flags on your PHP5 install" - eerror "to get a useable PHP5 installation: - eerror - eerror "=dev-lang/php-5* ${PHP5DEPEND}" - eerror - die "Required PHP5 features not found" - fi - if ! built_with_use =`best_version '>=www-apache/mod_suphp-0.6.1'` checkpath mode-paranoid ; then - eerror - eerror "Please enable the following USE flags to get a secure and" - eerror "correctly working mod_suphp installation: - eerror - eerror ">=www-apache/mod_suphp-0.6.1 checkpath mode-paranoid" - eerror - die "Required mod_suphp USE flags not found" - fi - fi - - # Create the user and group that will own the SysCP files - einfo "Creating syscp user ..." - enewgroup syscp 9995 - if useq suphp ; then - enewuser syscp 9995 -1 /var/www/syscp "syscp,apache" - else - enewuser syscp 9995 -1 /var/www/syscp syscp - fi - - # Create the user and group that will run the FTPd - einfo "Creating syscpftpd user ..." - enewgroup syscpftpd 9996 - enewuser syscpftpd 9996 -1 /var/www/syscpwebs syscpftpd - - # Create the user and group that will run the virtual MTA - einfo "Creating vmail user ..." - enewgroup vmail 9997 - enewuser vmail 9997 -1 /var/syscpvmail vmail -} - -src_unpack() { - unpack ${A} - - cd "${S}" - - # Patch SysCP to be Gentoo-compatible - epatch "${WORKDIR}/${PN}-${PV}-gentoo-compatibility.patch" - - # Installing new Gentoo design - cp -Rf "${WORKDIR}/gentoo-syscp-design/templates/" "${S}/" || die "Unable to copy new template" - cp -Rf "${WORKDIR}/gentoo-syscp-design/images/" "${S}/" || die "Unable to copy new template images" - - # Delete userdata.inc.php to avoid overwriting - rm -f "${S}/lib/userdata.inc.php" || die "Unable to delete userdata.inc.php" - - # Patch to get the improved MySQL/FTP management - if use mysqlftpimp ; then - epatch "${WORKDIR}/${PN}-${PV}-mysqli-ftpi.patch" - fi - - # Patch to get a couple of new options: PHP Engine on/off, SSI on/off - # and PHP Error Display on/off per domain, as well as ExecCGI on/off - # per directory - if use addopts ; then - epatch "${WORKDIR}/${PN}-${PV}-moreoptions.patch" - fi - - # Patch to get SuEXEC support, by adding the necessary config - # lines to the vhost file - if use suexec ; then - epatch "${WORKDIR}/${PN}-${PV}-suexec-support.patch" - fi - - # Patch to get SuPHP support, by adding the necessary config - # lines to the vhost file and generating the php.ini's - if use suphp ; then - epatch "${WORKDIR}/${PN}-${PV}-suphp-support.patch" - fi - - # Delete any mention of inserttask('4') if no Bind is used - if ! use bind ; then - find "${S}/" -type f -exec sed -e "s|inserttask('4');||g" -i {} \; - fi -} - -src_install() { - # Install the SysCP files - dodir "/var/www" - cp -Rf "${S}/" "${D}/var/www/" || die "Installation of the SysCP files failed" - - # Installing modified admin_configfiles.php - cp -f "${WORKDIR}/${PN}-${PV}-gentoo-admin_configfiles.php"* "${D}/var/www/syscp/admin_configfiles.php" || die "Unable to copy admin_configfiles.php" - - # Installing new Gentoo configfiles - cp -Rf "${WORKDIR}/gentoo/" "${D}/var/www/syscp/templates/misc/configfiles/" || die "Unable to copy new Gentoo configfiles" - - # Move the SQL and configuration files to /usr/share/${PF} for the emerge installer - dodir "/usr/share/${PF}" - insinto "/usr/share/${PF}" - doins "${WORKDIR}/${PN}-${PV}-"*"-db.sql" - doins "${WORKDIR}/gentoo/"*"/"* - doins "${WORKDIR}/etc_libnss"* - - # If Bind is to be used, change the reload path for it - if useq bind ; then - sed -e 's|/bin/true|/etc/init.d/named reload|g' -i "${D}/usr/share/${PF}/${PN}-${PV}-baseinstall-db.sql" || die "Unable to change reload path for Bind" - fi - - # Apache1 compatibility - if ! useq apache2 ; then - sed -e 's|/etc/init.d/apache2 reload|/etc/init.d/apache reload|g' -i "${D}/usr/share/${PF}/${PN}-${PV}-baseinstall-db.sql" || die "Unable to change reload path for Apache" - sed -e 's|/etc/apache2/|/etc/apache/|g' -i "${D}/usr/share/${PF}/${PN}-${PV}-baseinstall-db.sql" || die "Unable to change config dir for Apache" - fi - - # Fix the permissions for the SysCP files - chown syscp:apache "${D}/var/www/syscp" || die "Unable to fix user:group permissions" - chown -R syscp:syscp "${D}/var/www/syscp" || die "Unable to fix user:group permissions" - find "${D}/var/www/syscp" -type d -exec chmod 0755 {} \; || die "Unable to fix directory permissions" - find "${D}/var/www/syscp" -type f -exec chmod 0644 {} \; || die "Unable to fix file permissions" - chown root:0 "${D}/usr/share/${PF}" || die "Unable to fix user:group permissions" - chown -R root:0 "${D}/usr/share/${PF}" || die "Unable to fix user:group permissions" - find "${D}/usr/share/${PF}" -type d -exec chmod 0750 {} \; || die "Unable to fix directory permissions" - find "${D}/usr/share/${PF}" -type f -exec chmod 0640 {} \; || die "Unable to fix file permissions" - - # Create the main directories for customer data - keepdir "/var/www/syscpwebs" - chown root:root "${D}/var/www/syscpwebs" || die "Unable to fix user:group permissions" - chmod 0755 "${D}/var/www/syscpwebs" || die "Unable to fix directory permissionns" - keepdir "/var/syscpvmail" - chown vmail:vmail "${D}/var/syscpvmail" || die "Unable to fix user:group permissions" - chmod 0750 "${D}/var/syscpvmail" || die "Unable to fix directory permissions" - keepdir "/var/log/syscplogs" - - # SuPHP support - if useq suphp ; then - chown syscp:apache "${D}/var/www/syscp" || die "Unable to fix user:group permissions" - chmod 0750 "${D}/var/www/syscp" || die "Unable to fix directory permissions" - keepdir "/var/www/syscp-suphp/config" - keepdir "/var/www/syscp-suphp/tmp" - keepdir "/var/www/syscp-suphp/syscp" - chown syscp:syscp "${D}/var/www/syscp-suphp/syscp" || die "Unable to fix user:group permissions" - chmod 0750 "${D}/var/www/syscp-suphp/syscp" || die "Unable to fix directory permissions" - fi -} - -pkg_postinst() { - # Normalize permissions - chown syscp:apache "${ROOT}/var/www/syscp" || die "Unable to fix user:group permissions" - chmod 0750 "${ROOT}/var/www/syscp" || die "Unable to fix directory permissions" - chown root:root "${ROOT}/var/www/syscpwebs" || die "Unable to fix user:group permissions" - chmod 0755 "${ROOT}/var/www/syscpwebs" || die "Unable to fix directory permissions" - chown vmail:vmail "${ROOT}/var/syscpvmail" || die "Unable to fix user:group permissions" - chmod 0750 "${ROOT}/var/syscpvmail" || die "Unable to fix directory permissions" - - einfo - einfo "Please run 'emerge --config =${PF}' to continue with" - einfo "the basic setup of Gentoo-SysCP, *after* you have" - einfo "setup your MySQL databases root user and password" - einfo "like the MySQL ebuild tells you to do." - einfo -} - -pkg_config() { - local proceedyesno1 - local servername - local serverip - local mysqlhost - local mysqlaccesshost - local mysqlrootuser - local mysqlrootpw1 - local mysqlrootpw2 - local mysqlrootpw - local mysqldbname - local mysqlunprivuser - local mysqlunprivpw1 - local mysqlunprivpw2 - local mysqlunprivpw - local adminuser - local adminpw1 - local adminpw2 - local adminpw - local proceedyesno2 - - ewarn "Gentoo-SysCP Basic Configuration" - echo - einfo "This will setup Gentoo-SysCP on your system, it will create and" - einfo "populate the MySQL database, create and chmod the needed files" - einfo "correctly and configure all services to work out-of-the-box" - einfo "with Gentoo-SysCP, using a sane default configuration, and" - einfo "start them, along with creating the correct Gentoo-SysCP Apache" - einfo "VirtualHost for you." - einfo "CAUTION: this will backup and then replace your services" - einfo "configuration and restart them!" - echo - einfo "Do you want to proceed? [Y/N]" - echo - read -rp " > " proceedyesno1 ; echo - if [[ ${proceedyesno1} == "Y" ]] || [[ ${proceedyesno1} == "y" ]] || [[ ${proceedyesno1} == "Yes" ]] || [[ ${proceedyesno1} == "yes" ]] ; then - echo - else - echo - die "User abort: not proceeding!" - fi - einfo "Enter the domain under wich SysCP shall be reached, this normally" - einfo "is the FQDN (Fully Qualified Domain Name) of your system." - einfo "If you don't know the FQDN of your system, execute 'hostname -f'." - einfo "This installscript will try to guess your FQDN automatically if" - einfo "you leave this field blank, setting it to the output of 'hostname -f'." - echo - read -rp " > " servername ; echo - echo - if [[ ${servername} == "" ]] ; then - servername=`hostname -f` - fi - einfo "Enter the IP address of your system, under wich all" - einfo "websites shall then be reached. This must be the same" - einfo "IP address the domain you inserted above points to." - einfo "You *must* set this to your correct IP address." - echo - read -rp " > " serverip ; echo - echo - if [[ ${serverip} == "" ]] ; then - die "Abort: need correct IP address!" - fi - einfo "Enter the IP address of the MySQL server, if the MySQL" - einfo "server is on the same machine, enter 'localhost' or" - einfo "simply leave the field blank." - echo - read -rp " > " mysqlhost ; echo - echo - if [[ ${mysqlhost} == "" ]] ; then - mysqlhost="localhost" - fi - if [[ ${mysqlhost} == "localhost" ]] ; then - mysqlaccesshost="localhost" - else - mysqlaccesshost="${serverip}" - fi - einfo "Enter the username of the MySQL root user." - einfo "The default is 'root'." - echo - read -rp " > " mysqlrootuser ; echo - echo - if [[ ${mysqlrootuser} == "" ]] ; then - mysqlrootuser="root" - fi - einfo "Enter the password of the MySQL root user." - echo - read -rsp " > " mysqlrootpw1 ; echo - echo - if [[ ${mysqlrootpw1} == "" ]] ; then - die "Abort: please insert a valid password!" - fi - einfo "Confirm the password of the MySQL root user." - echo - read -rsp " > " mysqlrootpw2 ; echo - echo - if [[ ${mysqlrootpw2} == "" ]] ; then - die "Abort: please insert a valid password!" - fi - if [[ ${mysqlrootpw1} != ${mysqlrootpw2} ]] ; then - die "Abort: the two passwords don't match!" - else - mysqlrootpw="${mysqlrootpw1}" - fi - einfo "Enter the name of the database you want to" - einfo "use for SysCP. The default is 'syscp'." - einfo "CAUTION: any database with that name will" - einfo "be dropped!" - echo - read -rp " > " mysqldbname ; echo - echo - if [[ ${mysqldbname} == "" ]] ; then - mysqldbname="syscp" - fi - einfo "Enter the username of the unprivileged" - einfo "MySQL user you want SysCP to use." - einfo "The default is 'syscp'." - einfo "CAUTION: any user with that name will" - einfo "be deleted!" - echo - read -rp " > " mysqlunprivuser ; echo - echo - if [[ ${mysqlunprivuser} == "" ]] ; then - mysqlunprivuser="syscp" - fi - einfo "Enter the password of the unprivileged" - einfo "MySQL user." - echo - read -rsp " > " mysqlunprivpw1 ; echo - echo - if [[ ${mysqlunprivpw1} == "" ]] ; then - die "Abort: please insert a valid password!" - fi - einfo "Confirm the password of the unprivileged" - einfo "MySQL user." - echo - read -rsp " > " mysqlunprivpw2 ; echo - echo - if [[ ${mysqlunprivpw2} == "" ]] ; then - die "Abort: please insert a valid password!" - fi - if [[ ${mysqlunprivpw1} != ${mysqlunprivpw2} ]] ; then - die "Abort: the two passwords don't match!" - else - mysqlunprivpw="${mysqlunprivpw1}" - fi - einfo "Enter the username of the admin user you" - einfo "want in your SysCP panel." - einfo "Default is 'admin'." - echo - read -rp " > " adminuser ; echo - echo - if [[ ${adminuser} == "" ]] ; then - adminuser="admin" - fi - einfo "Enter the password of the SysCP admin user." - echo - read -rsp " > " adminpw1 ; echo - echo - if [[ ${adminpw1} == "" ]] ; then - die "Abort: please insert a valid password!" - fi - einfo "Confirm the password of the SysCP admin user." - echo - read -rsp " > " adminpw2 ; echo - echo - if [[ ${adminpw2} == "" ]] ; then - die "Abort: please insert a valid password!" - fi - if [[ ${adminpw1} != ${adminpw2} ]] ; then - die "Abort: the two passwords don't match!" - else - adminpw="${adminpw1}" - fi - - einfo "Adding MySQL server to 'default' runlevel ..." - rc-update add mysql default - - einfo "(Re)Starting MySQL server ..." - "${ROOT}/etc/init.d/mysql" restart - - einfo "Creating temporary work directory ..." - rm -Rf "${ROOT}/tmp/syscp-install-by-emerge" - mkdir -p "${ROOT}/tmp/syscp-install-by-emerge" - chown root:0 "${ROOT}/tmp/syscp-install-by-emerge" - chmod 0700 "${ROOT}/tmp/syscp-install-by-emerge" - - einfo "Preparing SQL database files ..." - cp -f "${ROOT}/usr/share/${PF}/${PN}-${PV}-"*"-db.sql" "${ROOT}/tmp/syscp-install-by-emerge/" - chown root:0 "${ROOT}/tmp/syscp-install-by-emerge/${PN}-${PV}-"*"-db.sql" - chmod 0600 "${ROOT}/tmp/syscp-install-by-emerge/${PN}-${PV}-"*"-db.sql" - sed -e "s|MYSQL_ACCESS_HOST|${mysqlaccesshost}|g" -i "${ROOT}/tmp/syscp-install-by-emerge/${PN}-${PV}-"*"-db.sql" - sed -e "s|MYSQL_UNPRIV_USER|${mysqlunprivuser}|g" -i "${ROOT}/tmp/syscp-install-by-emerge/${PN}-${PV}-"*"-db.sql" - sed -e "s|MYSQL_UNPRIV_PASSWORD|${mysqlunprivpw}|g" -i "${ROOT}/tmp/syscp-install-by-emerge/${PN}-${PV}-"*"-db.sql" - sed -e "s|MYSQL_DATABASE_NAME|${mysqldbname}|g" -i "${ROOT}/tmp/syscp-install-by-emerge/${PN}-${PV}-"*"-db.sql" - sed -e "s|SERVERNAME|${servername}|g" -i "${ROOT}/tmp/syscp-install-by-emerge/${PN}-${PV}-"*"-db.sql" - sed -e "s|SERVERIP|${serverip}|g" -i "${ROOT}/tmp/syscp-install-by-emerge/${PN}-${PV}-"*"-db.sql" - sed -e "s|ADMIN_USERNAME|${adminuser}|g" -i "${ROOT}/tmp/syscp-install-by-emerge/${PN}-${PV}-"*"-db.sql" - sed -e "s|ADMIN_PASSWORD|${adminpw}|g" -i "${ROOT}/tmp/syscp-install-by-emerge/${PN}-${PV}-"*"-db.sql" - - einfo "Installing SQL database files ..." - mysql -u ${mysqlrootuser} -p${mysqlrootpw} < "${ROOT}/tmp/syscp-install-by-emerge/${PN}-${PV}-baseinstall-db.sql" - - if built_with_use =`best_version 'www-apps/syscp'` mysqlftpimp ; then - einfo "Installing mysqlftpimp SQL data ..." - mysql -u ${mysqlrootuser} -p${mysqlrootpw} < "${ROOT}/tmp/syscp-install-by-emerge/${PN}-${PV}-mysqlftpimp-db.sql" - fi - - if built_with_use =`best_version 'www-apps/syscp'` addopts ; then - einfo "Installing addopts SQL data ..." - mysql -u ${mysqlrootuser} -p${mysqlrootpw} < "${ROOT}/tmp/syscp-install-by-emerge/${PN}-${PV}-addopts-db.sql" - fi - - if built_with_use =`best_version 'www-apps/syscp'` suphp ; then - einfo "Installing suphp SQL data ..." - mysql -u ${mysqlrootuser} -p${mysqlrootpw} < "${ROOT}/tmp/syscp-install-by-emerge/${PN}-${PV}-suphp-db.sql" - fi - - einfo "Deleting SQL database files ..." - rm -f "${ROOT}/tmp/syscp-install-by-emerge/${PN}-${PV}-"*"-db.sql" - - einfo "Installing SysCP data file ..." - rm -f "${ROOT}/var/www/syscp/lib/userdata.inc.php" - touch "${ROOT}/var/www/syscp/lib/userdata.inc.php" - chown syscp:apache "${ROOT}/var/www/syscp/lib/userdata.inc.php" - chmod 0640 "${ROOT}/var/www/syscp/lib/userdata.inc.php" - echo "" > "${ROOT}/var/www/syscp/lib/userdata.inc.php" - - if built_with_use =`best_version 'www-apps/syscp'` sslserv ; then - einfo "Creating needed SSL certificates ..." - einfo "Please enter the correct input when it's requested." - einfo "ATTENTION: when you're requested to enter a" - einfo "'Common Name' enter ${servername} ." - - # Create the directories where we'll store our SSL - # certificates and set secure permissions on them - mkdir -p "${ROOT}/etc/ssl/server" - chown root:0 "${ROOT}/etc/ssl/server" - chmod 0700 "${ROOT}/etc/ssl/server" - - # We first generate our Private Key - openssl genrsa -des3 -out "${ROOT}/etc/ssl/server/${servername}.key" 2048 - - # Now we generate our CSR (Certificate Signing Request) - openssl req -new -key "${ROOT}/etc/ssl/server/${servername}.key" -out "${ROOT}/etc/ssl/server/${servername}.csr" - - # Create an unencrypted key, to avoid having to always enter - # the passphrase when a service using it is restarted (eg. Apache) - cp -f "${ROOT}/etc/ssl/server/${servername}.key" "${ROOT}/etc/ssl/server/${servername}.key.orig" - openssl rsa -in "${ROOT}/etc/ssl/server/${servername}.key.orig" -out "${ROOT}/etc/ssl/server/${servername}.key" - - einfo "You can now submit ${ROOT}/etc/ssl/server/${servername}.csr" - einfo "to an official CA (Certification Authority) to be" - einfo "signed (with costs) or you can sign it yourself (free)." - einfo "For more informations regarding SSL please visit:" - einfo "http://httpd.apache.org/docs/2.0/ssl/ssl_intro.html" - - echo - einfo "Do you want to self-sign your certificate? [Y/N]" - echo - read -rp " > " proceedyesno2 ; echo - if [[ ${proceedyesno2} == "Y" ]] || [[ ${proceedyesno2} == "y" ]] || [[ ${proceedyesno2} == "Yes" ]] || [[ ${proceedyesno2} == "yes" ]] ; then - echo - # We now generate a self-signed certificate that will - # be valid for 365 days - openssl x509 -req -days 365 -in "${ROOT}/etc/ssl/server/${servername}.csr" -signkey "${ROOT}/etc/ssl/server/${servername}.key" -out "${ROOT}/etc/ssl/server/${servername}.crt" - - # We now create a file that contains both the Private Key - # and the signed certificate, this is needed for Courier - cat "${ROOT}/etc/ssl/server/${servername}.crt" "${ROOT}/etc/ssl/server/${servername}.key" > "${ROOT}/etc/ssl/server/${servername}.crt_and_key" - else - einfo "Note: if you let your certificate be signed by an official" - einfo "CA please be sure to copy the certificate they gave you to" - einfo "${ROOT}/etc/ssl/server/${servername}.crt before starting" - einfo "and using any of the SSL enabled services." - echo - einfo "You'll also need to create a file that contains both the" - einfo "Private Key and the signed certificate, this is needed for" - einfo "Courier to work correctly." - einfo "You can do this with the following command:" - einfo "cat \"${ROOT}/etc/ssl/server/${servername}.crt\" \"${ROOT}/etc/ssl/server/${servername}.key\" > \"${ROOT}/etc/ssl/server/${servername}.crt_and_key\"" - echo - einfo "Additionally, don't forget to set the correct file permissions" - einfo "on your SSL files, you can do this with the following commands:" - einfo "chown root:0 \"${ROOT}/etc/ssl/server/${servername}.\"*" - einfo "chmod 0400 \"${ROOT}/etc/ssl/server/${servername}.\"*" - fi - - # Set secure permissions for our SSL files - chown root:0 "${ROOT}/etc/ssl/server/${servername}."* - chmod 0400 "${ROOT}/etc/ssl/server/${servername}."* - fi - - einfo "Writing Gentoo-SysCP vhost configuration ..." - rm -f "${ROOT}/etc/apache${USE_APACHE2}/vhosts.d/95_${servername}.conf" - touch "${ROOT}/etc/apache${USE_APACHE2}/vhosts.d/95_${servername}.conf" - chown root:0 "${ROOT}/etc/apache${USE_APACHE2}/vhosts.d/95_${servername}.conf" - chmod 0600 "${ROOT}/etc/apache${USE_APACHE2}/vhosts.d/95_${servername}.conf" - - if built_with_use =`best_version 'www-apps/syscp'` suphp ; then - - echo "# Main suPHP AddHandler - - AddType application/x-httpd-php4 .php .php5 .php4 .php3 .phtml - AddHandler x-httpd-php4 .php .php5 .php4 .php3 .phtml - suPHP_AddHandler x-httpd-php4 - -" > "${ROOT}/etc/apache${USE_APACHE2}/vhosts.d/95_${servername}.conf" - - fi - - if built_with_use =`best_version 'www-apps/syscp'` sslserv ; then - - echo "# Gentoo-SysCP SSL-enabled VirtualHost - - - - - DocumentRoot \"/var/www/syscp\" - ServerName ${servername}" >> "${ROOT}/etc/apache${USE_APACHE2}/vhosts.d/95_${servername}.conf" - - if built_with_use =`best_version 'www-apps/syscp'` suexec ; then - echo " SuexecUserGroup syscp syscp" >> "${ROOT}/etc/apache${USE_APACHE2}/vhosts.d/95_${servername}.conf" - fi - - if built_with_use =`best_version 'www-apps/syscp'` suphp ; then - echo " suPHP_Engine On - suPHP_UserGroup syscp syscp - suPHP_ConfigPath \"/etc/php/syscp-vhost/\"" >> "${ROOT}/etc/apache${USE_APACHE2}/vhosts.d/95_${servername}.conf" - fi - - echo " ErrorLog logs/syscp_ssl_error_log - - TransferLog logs/syscp_ssl_access_log - - SSLEngine on - SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL - SSLCertificateFile /etc/ssl/server/${servername}.crt - SSLCertificateKeyFile /etc/ssl/server/${servername}.key - - SSLOptions +StdEnvVars - - - SetEnvIf User-Agent \".*MSIE.*\" nokeepalive ssl-unclean-shutdown \\ - downgrade-1.0 force-response-1.0 - - - CustomLog logs/syscp_ssl_request_log \\ - \"%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \\\"%r\\\" %b\" - - - Order allow,deny - allow from all - - - - - - -# Redirect to the SSL-enabled Gentoo-SysCP vhost - - - RedirectPermanent / https://${servername}/index.php - -" >> "${ROOT}/etc/apache${USE_APACHE2}/vhosts.d/95_${servername}.conf" - - else - - echo "# Gentoo-SysCP VirtualHost - - - DocumentRoot \"/var/www/syscp\" - ServerName ${servername}" >> "${ROOT}/etc/apache${USE_APACHE2}/vhosts.d/95_${servername}.conf" - - if built_with_use =`best_version 'www-apps/syscp'` suexec ; then - echo " SuexecUserGroup syscp syscp" >> "${ROOT}/etc/apache${USE_APACHE2}/vhosts.d/95_${servername}.conf" - fi - - if built_with_use =`best_version 'www-apps/syscp'` suphp ; then - echo " suPHP_Engine On - suPHP_UserGroup syscp syscp - suPHP_ConfigPath \"/etc/php/syscp-vhost/\"" >> "${ROOT}/etc/apache${USE_APACHE2}/vhosts.d/95_${servername}.conf" - fi - - echo " - Order allow,deny - allow from all - - -" >> "${ROOT}/etc/apache${USE_APACHE2}/vhosts.d/95_${servername}.conf" - - fi - - # Automatical Apache configuration - if built_with_use =`best_version 'www-apps/syscp'` sslserv ; then - einfo "Attempting to edit ${ROOT}/etc/conf.d/apache${USE_APACHE2} to suit Gentoo-SysCP ..." - if built_with_use =`best_version 'www-apps/syscp'` suphp ; then - sed -e "s|^APACHE${USE_APACHE2}_OPTS=\".*|APACHE${USE_APACHE2}_OPTS=\"-D SSL -D SSL_SYSCP_VHOST -D SUPHP\"|g" -i "${ROOT}/etc/conf.d/apache${USE_APACHE2}" || ewarn "Unable to change APACHE${USE_APACHE2}_OPTS in ${ROOT}/etc/conf.d/apache${USE_APACHE2}, please change it manually to add '-D SSL -D SSL_SYSCP_VHOST -D SUPHP'" - else - sed -e "s|^APACHE${USE_APACHE2}_OPTS=\".*|APACHE${USE_APACHE2}_OPTS=\"-D SSL -D SSL_SYSCP_VHOST -D PHP4\"|g" -i "${ROOT}/etc/conf.d/apache${USE_APACHE2}" || ewarn "Unable to change APACHE${USE_APACHE2}_OPTS in ${ROOT}/etc/conf.d/apache${USE_APACHE2}, please change it manually to add '-D SSL -D SSL_SYSCP_VHOST -D PHP4'" - fi - else - einfo "Attempting to edit ${ROOT}/etc/conf.d/apache${USE_APACHE2} to suit Gentoo-SysCP ..." - if built_with_use =`best_version 'www-apps/syscp'` suphp ; then - sed -e "s|^APACHE${USE_APACHE2}_OPTS=\".*|APACHE${USE_APACHE2}_OPTS=\"-D SYSCP_VHOST -D SUPHP\"|g" -i "${ROOT}/etc/conf.d/apache${USE_APACHE2}" || ewarn "Unable to change APACHE${USE_APACHE2}_OPTS in ${ROOT}/etc/conf.d/apache${USE_APACHE2}, please change it manually to add '-D SYSCP_VHOST -D SUPHP'" - else - sed -e "s|^APACHE${USE_APACHE2}_OPTS=\".*|APACHE${USE_APACHE2}_OPTS=\"-D SYSCP_VHOST -D PHP4\"|g" -i "${ROOT}/etc/conf.d/apache${USE_APACHE2}" || ewarn "Unable to change APACHE${USE_APACHE2}_OPTS in ${ROOT}/etc/conf.d/apache${USE_APACHE2}, please change it manually to add '-D SYSCP_VHOST -D PHP4'" - fi - fi - - einfo "Fix general Apache configuration to work with Gentoo-SysCP ..." - sed -e "s|^\#ServerName localhost.*|ServerName ${servername}|g" -i "${ROOT}/etc/apache${USE_APACHE2}/httpd.conf" || ewarn "Please make sure that the ServerName directive in ${ROOT}/etc/apache${USE_APACHE2}/httpd.conf is set to a valid value!" - sed -e "s|^ServerAdmin root\@localhost.*|ServerAdmin root\@${servername}|g" -i "${ROOT}/etc/apache${USE_APACHE2}/httpd.conf" || ewarn "Please make sure that the ServerAdmin directive in ${ROOT}/etc/apache${USE_APACHE2}/httpd.conf is set to a valid value!" - sed -e "s|\*:80|${serverip}:80|g" -i "${ROOT}/etc/apache${USE_APACHE2}/vhosts.d/00_default_vhost.conf" || ewarn "Please make sure the NameVirtualHost and VirtualHost directives in ${ROOT}/etc/apache${USE_APACHE2}/vhosts.d/00_default_vhost.conf are set to the Gentoo-SysCP IP and Port 80!" - - # SuPHP config substitution - if built_with_use =`best_version 'www-apps/syscp'` suphp ; then - echo " - - LoadModule suphp_module modules/mod_suphp.so - - - AddDirectoryIndex index.php index.php5 index.php4 index.php3 index.phtml -" > "${ROOT}/etc/apache${USE_APACHE2}/modules.d/70_mod_suphp.conf" - fi - - # Automatical Bind configuration, if Bind is installed - if built_with_use =`best_version 'www-apps/syscp'` bind ; then - einfo "Add Gentoo-SysCP include to Bind configuration ..." - echo "include \"/etc/bind/syscp_bind.conf\";" >> "${ROOT}/etc/bind/named.conf" - fi - - # NSS-MySQL preparations - einfo "Modifying nsswitch.conf to use MySQL ..." - sed -e "s|compat|compat mysql|g" -i "${ROOT}/etc/nsswitch.conf" - - # Helper functions - create_config_file() { - if [[ -f "${ROOT}/${1}" ]] ; then - einfo "Moving old ${ROOT}/${1} to ${ROOT}/${1}.bak and setting restrictive permissions ..." - mv -f "${ROOT}/${1}" "${ROOT}/${1}.bak" - chown root:0 "${ROOT}/${1}.bak" - chmod 0400 "${ROOT}/${1}.bak" - fi - einfo "Installing ${ROOT}/${1} and setting permissions ..." - rm -f "${ROOT}/${1}" - touch "${ROOT}/${1}" - if [[ -n "${CHOWN}" ]] ; then - chown ${CHOWN} "${ROOT}/${1}" - else - chown root:0 "${ROOT}/${1}" - fi - if [[ -n "${CHMOD}" ]] ; then - chmod ${CHMOD} "${ROOT}/${1}" - else - chmod 0600 "${ROOT}/${1}" - fi - if [[ -f "${ROOT}/tmp/syscp-install-by-emerge/${1//\//_}" ]] ; then - cat "${ROOT}/tmp/syscp-install-by-emerge/${1//\//_}" > "${ROOT}/${1}" - fi - } - - srv_add_restart() { - einfo "Adding ${1} to 'default' runlevel ..." - rc-update add ${1} default - einfo "(Re)Starting ${1} ..." - "${ROOT}/etc/init.d/${1}" restart - } - - # Prepare service configuration files - - cp -f "${ROOT}/usr/share/${PF}/etc_"* "${ROOT}/tmp/syscp-install-by-emerge/" - chown root:0 "${ROOT}/tmp/syscp-install-by-emerge/etc_"* - chmod 0600 "${ROOT}/tmp/syscp-install-by-emerge/etc_"* - sed -e "s||${serverip}|g" -i "${ROOT}/tmp/syscp-install-by-emerge/etc_"* - sed -e "s||${servername}|g" -i "${ROOT}/tmp/syscp-install-by-emerge/etc_"* - sed -e "s||${mysqlhost}|g" -i "${ROOT}/tmp/syscp-install-by-emerge/etc_"* - sed -e "s||${mysqldbname}|g" -i "${ROOT}/tmp/syscp-install-by-emerge/etc_"* - sed -e "s||${mysqlunprivuser}|g" -i "${ROOT}/tmp/syscp-install-by-emerge/etc_"* - sed -e "s||${mysqlunprivpw}|g" -i "${ROOT}/tmp/syscp-install-by-emerge/etc_"* - sed -e "s||9997|g" -i "${ROOT}/tmp/syscp-install-by-emerge/etc_"* - sed -e "s||9997|g" -i "${ROOT}/tmp/syscp-install-by-emerge/etc_"* - sed -e "s||/var/syscpvmail/|g" -i "${ROOT}/tmp/syscp-install-by-emerge/etc_"* - - # Automatical services configuration - - einfo "Configuring NSS-MySQL ..." - create_config_file "etc/libnss-mysql.cfg" - create_config_file "etc/libnss-mysql-root.cfg" - mkdir -p "${ROOT}/var/run/nscd" - chown root:0 "${ROOT}/var/run/nscd" - chmod 0755 "${ROOT}/var/run/nscd" - - einfo "Configuring Apache ..." - create_config_file "etc/apache${USE_APACHE2}/vhosts.d/99_syscp-vhosts.conf" - create_config_file "etc/apache${USE_APACHE2}/diroptions.conf" - if built_with_use =`best_version 'www-apps/syscp'` suphp ; then - mkdir -p "${ROOT}/etc/php/syscp-vhost" - chown syscp:syscp "${ROOT}/etc/php/syscp-vhost" - chmod 0700 "${ROOT}/etc/php/syscp-vhost" - create_config_file "etc/php/syscp-vhost/php.ini" - chown syscp:syscp "${ROOT}/etc/php/syscp-vhost/php.ini" - chmod 0600 "${ROOT}/etc/php/syscp-vhost/php.ini" - fi - - einfo "Configuring Gentoo-SysCP cronjob ..." - create_config_file "etc/cron.d/syscp" - mkdir -p "${ROOT}/etc/php/syscp-cronjob" - chmod 0700 "${ROOT}/etc/php/syscp-cronjob" - create_config_file "etc/php/syscp-cronjob/php.ini" - - einfo "Configuring ProFTPd ..." - create_config_file "etc/proftpd/proftpd.conf" - - einfo "Configuring Courier-IMAP ..." - create_config_file "etc/courier/authlib/authdaemonrc" - create_config_file "etc/courier/authlib/authmysqlrc" - create_config_file "etc/courier-imap/pop3d" - create_config_file "etc/courier-imap/imapd" - if built_with_use =`best_version 'www-apps/syscp'` sslserv ; then - create_config_file "etc/courier-imap/pop3d-ssl" - create_config_file "etc/courier-imap/imapd-ssl" - fi - - einfo "Configuring Postfix ..." - create_config_file "etc/sasl2/smtpd.conf" - CHMOD="0644" create_config_file "etc/postfix/main.cf" - CHOWN="root:postfix" CHMOD="0640" create_config_file "etc/postfix/mysql-virtual_alias_maps.cf" - CHOWN="root:postfix" CHMOD="0640" create_config_file "etc/postfix/mysql-virtual_mailbox_domains.cf" - CHOWN="root:postfix" CHMOD="0640" create_config_file "etc/postfix/mysql-virtual_mailbox_maps.cf" - - if built_with_use =`best_version 'www-apps/syscp'` bind ; then - einfo "Configuring Bind .." - CHMOD="0644" create_config_file "etc/bind/syscp_bind.conf" - CHMOD="0644" create_config_file "etc/bind/default.zone" - fi - - # Automatical service starting - - srv_add_restart nscd - sleep 2 - srv_add_restart apache${USE_APACHE2} - srv_add_restart vixie-cron - if built_with_use =`best_version 'www-apps/syscp'` bind ; then - srv_add_restart named - fi - srv_add_restart proftpd - srv_add_restart courier-authlib - srv_add_restart courier-pop3d - srv_add_restart courier-imapd - if built_with_use =`best_version 'www-apps/syscp'` sslserv ; then - srv_add_restart courier-pop3d-ssl - srv_add_restart courier-imapd-ssl - fi - srv_add_restart postfix - - einfo "Removing temporary work directory ..." - rm -Rf "${ROOT}/tmp/syscp-install-by-emerge" || ewarn "Please remove the temporary install data manually by doing 'rm -Rf \"${ROOT}/tmp/syscp-install-by-emerge\"'" - - einfo "Configuration completed successfully!" -} diff --git a/vda/postfix-2.5.1-vda-ng-r2.patch.gz b/vda/postfix-2.5.1-vda-ng-r2.patch.gz deleted file mode 100644 index 9e303e7..0000000 Binary files a/vda/postfix-2.5.1-vda-ng-r2.patch.gz and /dev/null differ diff --git a/vda/postfix-2.5.1-vda-ng.patch b/vda/postfix-2.5.1-vda-ng.patch deleted file mode 100644 index d4238e1..0000000 --- a/vda/postfix-2.5.1-vda-ng.patch +++ /dev/null @@ -1,1449 +0,0 @@ -diff -Nru postfix-2.5.1/README_FILES/VDA_README postfix-2.5.1-vda-ng/README_FILES/VDA_README ---- postfix-2.5.1/README_FILES/VDA_README 1970-01-01 01:00:00.000000000 +0100 -+++ postfix-2.5.1-vda-ng/README_FILES/VDA_README 2008-03-15 15:06:00.007734561 +0100 -@@ -0,0 +1,97 @@ -+Installation: -+ -+1 - Get the Postfix source code ( http://www.postfix.org/ ) -+2 - Get this software ( http://vda.sourceforge.net ) for your Postfix version -+3 - Unpack the source code: tar -xvzf postfix-VERSION.tar.gz -+4 - Unpack the patch: gunzip postfix-VERSION-vda-ng-rREV.patch.gz -+5 - Apply the patch: cd postfix-VERSION; patch -p1 < ../postfix-VERSION-vda-ng-rREV.patch -+6 - Configure -+7 - Make -+ -+Configuration: -+ -+#### Postfix main.cf -+ -+# I use only virtual as local delivery -+mailbox_transport = virtual -+ -+# Base directory where the mailboxes are located -+virtual_mailbox_base = /var/virtualmail -+ -+# Virtual users maps -+virtual_mailbox_maps = hash:/etc/postfix/vmailbox -+transport_maps = hash:/etc/postfix/vtransport -+ -+# Minimal permitted UID value (for virtual_uid_maps) -+virtual_minimum_uid = 1000 -+ -+# GIDs and UIDs to run as -+# Can also be stored in hash, mysql, ... -+virtual_uid_maps = static:4000 -+virtual_gid_maps = static:4000 -+ -+# A maximum size limit for a mailbox -+virtual_mailbox_limit = 100000000 -+ -+# Quota values maps -+virtual_mailbox_limit_maps = hash:/etc/postfix/vquota -+ -+# Limit only the INBOX -+# (useful for when you have IMAP users) -+virtual_mailbox_limit_inbox = no -+ -+# Enable limits smaller than maximum message size -+virtual_mailbox_limit_override = yes -+ -+# Enable Maildir++ extensions for faster maildir quota calculation -+# (maildirsize file and ",S=" filename extension) -+# Needs Maildir++ compatible IMAP servers, like Courier-IMAP -+virtual_maildir_extended = yes -+ -+# Always bounce the message when quota reached -+virtual_overquota_bounce = yes -+ -+# Custom message to send when bouncing -+#virtual_maildir_limit_message = "Sorry, maximum quota reached!" -+ -+# Custom message maps for the bounces -+#virtual_maildir_limit_message_maps = hash:/etc/postfix/vmsg -+ -+# Also count the Trash folder when calculating quotas? -+virtual_trash_count = yes -+ -+# The name of the Trash folder -+# (if it doesn't need to be calculated) -+#virtual_trash_name = ".Trash" -+ -+# Enable the Maildirfilter feature -+virtual_maildir_filter = yes -+ -+# Maildirfilter maps -+virtual_maildir_filter_maps = hash:/etc/postfix/vfilter -+ -+#### Mailbox users file - vmailbox -+user@domain.com.br /path/to/mailbox - path relative to virtual_mailbox_base -+user1@domain.com.br /domain.com.br/user1 - no trailing slash, user has a MAILBOX -+user2@domain.com.br /domain.com.br/user2 - no trailing slash, user has a MAILBOX -+user1@domain.net.br /domain.net.br/user1/ - trailing slash, user has a MAILDIR -+user2@domain.net.br /domain.net.br/user2/ - trailing slash, user has a MAILDIR -+ -+#### Quota users file - vquota -+user@domain.com.br QUOTA IN BYTES -+user1@domain.com.br 2048000 -+user2@domain.com.br 2048000 -+user1@domain.net.br 5192000 -+user2@domain.net.br 0 - NO QUOTA -+ -+#### Maildirfilter file - vfilter -+# ATTENTION: the syntax for maildirfilter values is the following: -+# the # sign, followed by a space, followed by a M (uppercase), then a modification time value -+# (you need to change this when you change the regexps) made of a maximum of 10 digits, then a -+# space again and an arbitrary number of regexps (a regexp always starts with /^ and ends with -+# a space) and their corresponding actions -+user@domain.com.br # M regexp1 action1 regexp2 action2 ... -+user1@domain.net.br # M2007022701 /^subject:.*BAD.*/m DISCARD /^from:.*user@domain.com.br*/m MOVE Trash -+user2@domain.com.br # M2007022617 /^subject:.*Viagra.*/m REJECT /^subject:.*trash.*/m MOVE SpamFolder /^subject:.*pharmacy.*/m DISCARD -+ -+More informations can be found at http://vda.sourceforge.net -diff -Nru postfix-2.5.1/src/global/mail_params.h postfix-2.5.1-vda-ng/src/global/mail_params.h ---- postfix-2.5.1/src/global/mail_params.h 2008-01-24 02:10:19.000000000 +0100 -+++ postfix-2.5.1-vda-ng/src/global/mail_params.h 2008-03-15 15:06:00.095731675 +0100 -@@ -2167,6 +2167,54 @@ - #define DEF_VIRT_GID_MAPS "" - extern char *var_virt_gid_maps; - -+#define VAR_VIRT_MAILBOX_LIMIT_MAPS "virtual_mailbox_limit_maps" -+#define DEF_VIRT_MAILBOX_LIMIT_MAPS "" -+extern char *var_virt_mailbox_limit_maps; -+ -+#define VAR_VIRT_MAILBOX_LIMIT_INBOX "virtual_mailbox_limit_inbox" -+#define DEF_VIRT_MAILBOX_LIMIT_INBOX 0 -+extern bool var_virt_mailbox_limit_inbox; -+ -+#define VAR_VIRT_MAILBOX_LIMIT_OVERRIDE "virtual_mailbox_limit_override" -+#define DEF_VIRT_MAILBOX_LIMIT_OVERRIDE 0 -+extern bool var_virt_mailbox_limit_override; -+ -+#define VAR_VIRT_MAILDIR_EXTENDED "virtual_maildir_extended" -+#define DEF_VIRT_MAILDIR_EXTENDED 0 -+extern bool var_virt_maildir_extended; -+ -+#define VAR_VIRT_OVERQUOTA_BOUNCE "virtual_overquota_bounce" -+#define DEF_VIRT_OVERQUOTA_BOUNCE 0 -+extern bool var_virt_overquota_bounce; -+ -+#define VAR_VIRT_MAILDIR_LIMIT_MESSAGE "virtual_maildir_limit_message" -+#define DEF_VIRT_MAILDIR_LIMIT_MESSAGE "Sorry, the user's maildir has overdrawn his diskspace quota, please try again later." -+extern char *var_virt_maildir_limit_message; -+ -+#define VAR_VIRT_MAILDIR_LIMIT_MESSAGE_MAPS "virtual_maildir_limit_message_maps" -+#define DEF_VIRT_MAILDIR_LIMIT_MESSAGE_MAPS "" -+extern char *var_virt_maildir_limit_message_maps; -+ -+#define VAR_VIRT_MAILDIR_SUFFIX "virtual_maildir_suffix" -+#define DEF_VIRT_MAILDIR_SUFFIX "" -+extern char *var_virt_maildir_suffix; -+ -+#define VAR_VIRT_TRASH_COUNT "virtual_trash_count" -+#define DEF_VIRT_TRASH_COUNT 0 -+extern bool var_virt_trash_count; -+ -+#define VAR_VIRT_TRASH_NAME "virtual_trash_name" -+#define DEF_VIRT_TRASH_NAME ".Trash" -+extern char *var_virt_trash_name; -+ -+#define VAR_VIRT_MAILDIR_FILTER "virtual_maildir_filter" -+#define DEF_VIRT_MAILDIR_FILTER 0 -+extern bool var_virt_maildir_filter; -+ -+#define VAR_VIRT_MAILDIR_FILTER_MAPS "virtual_maildir_filter_maps" -+#define DEF_VIRT_MAILDIR_FILTER_MAPS "" -+extern char *var_virt_maildir_filter_maps; -+ - #define VAR_VIRT_MINUID "virtual_minimum_uid" - #define DEF_VIRT_MINUID 100 - extern int var_virt_minimum_uid; -diff -Nru postfix-2.5.1/src/util/file_limit.c postfix-2.5.1-vda-ng/src/util/file_limit.c ---- postfix-2.5.1/src/util/file_limit.c 2003-10-22 20:48:36.000000000 +0200 -+++ postfix-2.5.1-vda-ng/src/util/file_limit.c 2008-03-15 15:06:00.539717108 +0100 -@@ -85,7 +85,11 @@ - #else - struct rlimit rlim; - -- rlim.rlim_cur = rlim.rlim_max = limit; -+ /* rlim_max can only be changed by root. */ -+ if (getrlimit(RLIMIT_FSIZE, &rlim) < 0) -+ msg_fatal("getrlimit: %m"); -+ rlim.rlim_cur = limit; -+ - if (setrlimit(RLIMIT_FSIZE, &rlim) < 0) - msg_fatal("setrlimit: %m"); - #ifdef SIGXFSZ -diff -Nru postfix-2.5.1/src/virtual/mailbox.c postfix-2.5.1-vda-ng/src/virtual/mailbox.c ---- postfix-2.5.1/src/virtual/mailbox.c 2006-06-26 14:59:19.000000000 +0200 -+++ postfix-2.5.1-vda-ng/src/virtual/mailbox.c 2008-03-15 15:06:00.951703589 +0100 -@@ -70,6 +70,70 @@ - #define YES 1 - #define NO 0 - -+/* change_mailbox_limit - change limit for mailbox file */ -+static int change_mailbox_limit(LOCAL_STATE state, USER_ATTR usr_attr) -+{ -+ char *myname = "change_mailbox_limit"; -+ const char *limit_res; -+ long n = 0; -+ int status = NO; -+ -+ /* -+ * Look up the virtual mailbox limit size for this user. -+ * Fall back to virtual_mailbox_limit in case lookup failed. -+ * If virtual mailbox limit size is negative, fall back to virtual_mailbox_limit. -+ * If it's 0, set the mailbox limit to 0, which means unlimited. -+ * If it's more than 0 (positive int), check if the value is smaller than the maximum message size, -+ * if it is and the virtual mailbox limit can't be overridden, fall back to virtual_mailbox_limit and -+ * warn the user, else use the value directly as the mailbox limit. -+ */ -+ if (*var_virt_mailbox_limit_maps != 0 && (limit_res = mail_addr_find(virtual_mailbox_limit_maps, state.msg_attr.user, (char **) NULL)) != 0) { -+ n = atol(limit_res); -+ if (n > 0) { -+ if ((n < var_message_limit) && (!var_virt_mailbox_limit_override)) { -+ set_file_limit(var_virt_mailbox_limit); -+ status = NO; -+ -+ msg_warn("%s: recipient %s - virtual mailbox limit is " -+ "smaller than %s in %s - falling back to %s", -+ myname, -+ state.msg_attr.user, -+ VAR_MESSAGE_LIMIT, -+ virtual_mailbox_limit_maps->title, -+ VAR_VIRT_MAILBOX_LIMIT); -+ } -+ else { -+ set_file_limit((off_t) n); -+ status = YES; -+ -+ if (msg_verbose) -+ msg_info("%s: set virtual mailbox limit size for %s to %ld", -+ myname, usr_attr.mailbox, n); -+ } -+ } -+ else if (n == 0) { -+ set_file_limit(OFF_T_MAX); -+ status = YES; -+ -+ if (msg_verbose) -+ msg_info("%s: set virtual mailbox limit size for %s to %ld", -+ myname, usr_attr.mailbox, OFF_T_MAX); -+ } -+ else { -+ /* Invalid limit size (negative). Use default virtual_mailbox_limit. */ -+ set_file_limit(var_virt_mailbox_limit); -+ status = NO; -+ } -+ } -+ else { -+ /* There is no limit in the maps. Use default virtual_mailbox_limit. */ -+ set_file_limit(var_virt_mailbox_limit); -+ status = NO; -+ } -+ -+ return(status); -+} -+ - /* deliver_mailbox_file - deliver to recipient mailbox */ - - static int deliver_mailbox_file(LOCAL_STATE state, USER_ATTR usr_attr) -@@ -207,62 +271,72 @@ - * Look up the mailbox owner rights. Defer in case of trouble. - */ - uid_res = mail_addr_find(virtual_uid_maps, state.msg_attr.user, -- IGNORE_EXTENSION); -- if (uid_res == 0) { -- msg_warn("recipient %s: not found in %s", -- state.msg_attr.user, virtual_uid_maps->title); -- dsb_simple(why, "4.3.5", "mail system configuration error"); -- *statusp = defer_append(BOUNCE_FLAGS(state.request), -- BOUNCE_ATTR(state.msg_attr)); -- RETURN(YES); -+ IGNORE_EXTENSION); -+ -+ if ((uid_res = mail_addr_find(virtual_uid_maps, state.msg_attr.user, (char **) 0)) == 0) { -+ if ((uid_res = maps_find(virtual_uid_maps, strchr(state.msg_attr.user, '@'), DICT_FLAG_FIXED)) == 0) { -+ msg_warn("recipient %s: not found in %s", state.msg_attr.user, virtual_uid_maps->title); -+ dsb_simple(why, "4.3.5", "mail system configuration error"); -+ *statusp = defer_append(BOUNCE_FLAGS(state.request), BOUNCE_ATTR(state.msg_attr)); -+ RETURN(YES); -+ } - } -+ - if ((n = atol(uid_res)) < var_virt_minimum_uid) { -- msg_warn("recipient %s: bad uid %s in %s", -- state.msg_attr.user, uid_res, virtual_uid_maps->title); -- dsb_simple(why, "4.3.5", "mail system configuration error"); -- *statusp = defer_append(BOUNCE_FLAGS(state.request), -- BOUNCE_ATTR(state.msg_attr)); -- RETURN(YES); -+ msg_warn("recipient %s: bad uid %s in %s", state.msg_attr.user, uid_res, virtual_uid_maps->title); -+ dsb_simple(why, "4.3.5", "mail system configuration error"); -+ *statusp = defer_append(BOUNCE_FLAGS(state.request), BOUNCE_ATTR(state.msg_attr)); -+ RETURN(YES); - } -+ - usr_attr.uid = (uid_t) n; - - /* - * Look up the mailbox group rights. Defer in case of trouble. - */ - gid_res = mail_addr_find(virtual_gid_maps, state.msg_attr.user, -- IGNORE_EXTENSION); -- if (gid_res == 0) { -- msg_warn("recipient %s: not found in %s", -- state.msg_attr.user, virtual_gid_maps->title); -- dsb_simple(why, "4.3.5", "mail system configuration error"); -- *statusp = defer_append(BOUNCE_FLAGS(state.request), -- BOUNCE_ATTR(state.msg_attr)); -- RETURN(YES); -+ IGNORE_EXTENSION); -+ -+ if ((gid_res = mail_addr_find(virtual_gid_maps, state.msg_attr.user, (char **) 0)) == 0) { -+ if ((gid_res = maps_find(virtual_gid_maps, strchr(state.msg_attr.user, '@'), DICT_FLAG_FIXED)) == 0) { -+ msg_warn("recipient %s: not found in %s", state.msg_attr.user, virtual_gid_maps->title); -+ dsb_simple(why, "4.3.5", "mail system configuration error"); -+ *statusp = defer_append(BOUNCE_FLAGS(state.request), BOUNCE_ATTR(state.msg_attr)); -+ RETURN(YES); -+ } - } -+ - if ((n = atol(gid_res)) <= 0) { -- msg_warn("recipient %s: bad gid %s in %s", -- state.msg_attr.user, gid_res, virtual_gid_maps->title); -- dsb_simple(why, "4.3.5", "mail system configuration error"); -- *statusp = defer_append(BOUNCE_FLAGS(state.request), -- BOUNCE_ATTR(state.msg_attr)); -- RETURN(YES); -+ msg_warn("recipient %s: bad gid %s in %s", state.msg_attr.user, gid_res, virtual_gid_maps->title); -+ dsb_simple(why, "4.3.5", "mail system configuration error"); -+ *statusp = defer_append(BOUNCE_FLAGS(state.request), BOUNCE_ATTR(state.msg_attr)); -+ RETURN(YES); - } -+ - usr_attr.gid = (gid_t) n; - - if (msg_verbose) -- msg_info("%s[%d]: set user_attr: %s, uid = %u, gid = %u", -- myname, state.level, usr_attr.mailbox, -- (unsigned) usr_attr.uid, (unsigned) usr_attr.gid); -+ msg_info("%s[%d]: set user_attr: %s, uid = %u, gid = %u", -+ myname, state.level, usr_attr.mailbox, -+ (unsigned) usr_attr.uid, (unsigned) usr_attr.gid); - - /* - * Deliver to mailbox or to maildir. - */ - #define LAST_CHAR(s) (s[strlen(s) - 1]) - -- if (LAST_CHAR(usr_attr.mailbox) == '/') -- *statusp = deliver_maildir(state, usr_attr); -- else -- *statusp = deliver_mailbox_file(state, usr_attr); -+ if (LAST_CHAR(usr_attr.mailbox) == '/') { -+ *statusp = deliver_maildir(state, usr_attr); -+ } -+ else { -+ int changed_limit; -+ -+ changed_limit = change_mailbox_limit(state, usr_attr); -+ *statusp = deliver_mailbox_file(state, usr_attr); -+ -+ if (changed_limit) -+ set_file_limit(var_virt_mailbox_limit); -+ } - - /* - * Cleanup. -diff -Nru postfix-2.5.1/src/virtual/maildir.c postfix-2.5.1-vda-ng/src/virtual/maildir.c ---- postfix-2.5.1/src/virtual/maildir.c 2006-06-26 14:59:19.000000000 +0200 -+++ postfix-2.5.1-vda-ng/src/virtual/maildir.c 2008-03-15 15:06:01.303692043 +0100 -@@ -63,28 +63,406 @@ - #include - #include - -+/* Patch library. */ -+ -+#include /* opendir(3), stat(2) */ -+#include /* stat(2) */ -+#include /* opendir(3) */ -+#include /* stat(2) */ -+#include /* atol(3) */ -+#include /* strrchr(3) */ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ - /* Application-specific. */ - - #include "virtual.h" - --/* deliver_maildir - delivery to maildir-style mailbox */ -+/* Maildirsize maximal size. */ -+ -+#define SIZEFILE_MAX 5120 -+ -+/* -+ * Chris Stratford -+ * Read the maildirsize file to get quota info. -+ * -+ * Arguments: -+ * dirname: the maildir -+ * countptr: number of messages -+ * -+ * Returns the size of all mails as read from maildirsize, -+ * zero if it couldn't read the file. -+ */ -+static long read_maildirsize(char *dirname, long *countptr) -+{ -+ struct stat statbuf; -+ VSTRING *sizefilename = vstring_alloc(1024); -+ VSTREAM *sizefile; -+ char *p; -+ int len, first; -+ long sum = 0, count = 0; -+ -+ vstring_sprintf(sizefilename, "%s/%s", dirname, "maildirsize"); -+ -+ sizefile = vstream_fopen(STR(sizefilename), O_RDONLY, 0); -+ if (!sizefile || (stat(STR(sizefilename), &statbuf) < 0) || (statbuf.st_size > SIZEFILE_MAX)) { -+ if (sizefile) { -+ vstream_fclose(sizefile); -+ unlink(STR(sizefilename)); -+ } -+ vstring_free(sizefilename); -+ -+ return 0; -+ } -+ -+ VSTRING *sizebuf = vstring_alloc(SIZEFILE_MAX); -+ len = vstream_fread(sizefile, STR(sizebuf), SIZEFILE_MAX); -+ -+ p = STR(sizebuf); -+ *(p + len) = '\0'; -+ first = 1; -+ -+ while (*p) { -+ long n = 0, c = 0; -+ char *q = p; -+ -+ while (*p) { -+ if (*p++ == '\n') { -+ p[-1] = 0; -+ break; -+ } -+ } -+ -+ if (first) { -+ first = 0; -+ continue; -+ } -+ -+ if(sscanf(q, "%ld %ld", &n, &c) == 2) { -+ sum += n; -+ count += c; -+ } -+ else { -+ vstream_fclose(sizefile); -+ unlink(STR(sizefilename)); -+ -+ msg_warn("read_maildirsize: invalid line '%s' found in %s, removing maildirsize file", q, STR(sizefilename)); -+ -+ vstring_free(sizefilename); -+ vstring_free(sizebuf); -+ -+ return 0; -+ } -+ } -+ -+ vstream_fclose(sizefile); -+ vstring_free(sizefilename); -+ vstring_free(sizebuf); -+ -+ *countptr = count; -+ -+ return sum; -+} -+ -+/* -+ * Gives the size of the file according to the Maildir++ extension -+ * present in the filename (code taken from courier-imap). -+ * -+ * Arguments: -+ * n: filename -+ * -+ * Returns the size given in ",S=" in the filename, -+ * zero if it cannot find ",S=" in the filename. -+ */ -+static long maildir_parsequota(const char *n) -+{ -+ const char *o; -+ int yes = 0; - --int deliver_maildir(LOCAL_STATE state, USER_ATTR usr_attr) -+ if ((o = strrchr(n, '/')) == 0) -+ o = n; -+ -+ for (; *o; o++) { -+ if (*o == ':') -+ break; -+ } -+ -+ for (; o >= n; --o) { -+ if (*o == '/') -+ break; -+ -+ if (*o == ',' && o[1] == 'S' && o[2] == '=') { -+ yes = 1; -+ o += 3; -+ break; -+ } -+ } -+ -+ if (yes) { -+ long s = 0; -+ -+ while (*o >= '0' && *o <= '9') -+ s = s*10 + (*o++ - '0'); -+ -+ return s; -+ } -+ -+ return 0; -+} -+ -+/* -+ * Computes quota usage for a directory (taken from exim). -+ * -+ * This function is called to determine the exact quota usage of a virtual -+ * maildir box. To achieve maximum possible speed while doing this, it takes -+ * advantage of the maildirsize file and the Maildir++ extensions to filenames, -+ * when applicable and configured to be used. In all other cases it simply -+ * stats all the files as needed to get the size information. -+ * -+ * Arguments: -+ * dirname: the name of the directory -+ * countptr: where to add the file count (because this function recurses) -+ * -+ * Returns the sum of the sizes of all measurable files, -+ * zero if the directory could not be opened. -+ */ -+static long check_dir_size(char *dirname, long *countptr) -+{ -+ char *myname = "check_dir_size"; -+ DIR *dir; -+ long sum = 0; -+ struct dirent *ent; -+ struct stat statbuf; -+ -+ if (!var_virt_mailbox_limit_inbox && var_virt_maildir_extended && (sum = read_maildirsize(dirname, countptr))) { -+ if (msg_verbose) -+ msg_info("%s: maildirsize used: dir=%s sum=%ld count=%ld", myname, dirname, sum, *countptr); -+ return sum; -+ } -+ -+ dir = opendir(dirname); -+ if (dir == NULL) { -+ if (make_dirs(dirname, 0700) == 0) { /* Try to create the dirs. */ -+ dir = opendir(dirname); /* Reopen the dir. */ -+ if (dir == NULL) { -+ msg_warn("%s: cannot reopen directory: %s", myname, dirname); -+ return 0; -+ } -+ } -+ else { -+ msg_warn("%s: cannot open directory: %s", myname, dirname); -+ return 0; -+ } -+ } -+ -+ while ((ent = readdir(dir)) != NULL) { -+ char *name = ent->d_name; -+ long tmpsum = 0; -+ VSTRING *buffer; -+ -+ if (var_virt_trash_count) { -+ if(strcmp(name, ".") == 0 || strcmp(name, "..") == 0) -+ continue; -+ } -+ else { -+ if(strcmp(name, ".") == 0 || strcmp(name, "..") == 0 || strcmp(name, var_virt_trash_name) == 0) -+ continue; -+ } -+ -+ /* -+ * Here comes the real logic behind this function. -+ * Optimized to be the most efficient possible, -+ * depending on the settings given. -+ * See above for a more detailed description. -+ */ -+ if (var_virt_mailbox_limit_inbox) { -+ if (var_virt_maildir_extended && (tmpsum = maildir_parsequota(name))) { -+ sum += tmpsum; -+ (*countptr)++; -+ } -+ else { -+ buffer = vstring_alloc(1024); -+ vstring_sprintf(buffer, "%s/%s", dirname, name); -+ -+ if (stat(STR(buffer), &statbuf) < 0) { -+ vstring_free(buffer); -+ continue; -+ } -+ if ((statbuf.st_mode & S_IFREG) != 0) { -+ sum += (long) statbuf.st_size; -+ (*countptr)++; -+ } -+ -+ vstring_free(buffer); -+ } -+ } -+ else { -+ buffer = vstring_alloc(1024); -+ vstring_sprintf(buffer, "%s/%s", dirname, name); -+ -+ if (stat(STR(buffer), &statbuf) < 0) { -+ vstring_free(buffer); -+ continue; -+ } -+ if ((statbuf.st_mode & S_IFREG) != 0) { -+ if (strcmp(dirname + strlen(dirname) - 3, "new") == 0 || strcmp(dirname + strlen(dirname) - 3, "cur") == 0 || strcmp(dirname + strlen(dirname) - 3, "tmp") == 0) { -+ sum += (long) statbuf.st_size; -+ (*countptr)++; -+ } -+ } -+ else if ((statbuf.st_mode & S_IFDIR) != 0) { -+ sum += check_dir_size(STR(buffer), countptr); -+ } -+ -+ vstring_free(buffer); -+ } -+ } -+ closedir(dir); -+ -+ if (msg_verbose) -+ msg_info("%s: full scan done: dir=%s sum=%ld count=%ld", myname, dirname, sum, *countptr); -+ -+ return sum; -+} -+ -+/* Cut all occurrences of pattern from string. */ -+static char *strcut(char *str, const char *pat) -+{ -+ char *ptr, *loc, *ret; -+ ret = str; -+ loc = str; -+ -+ /* No match, return original string. */ -+ if (!strstr(loc, pat)) -+ return(str); -+ -+ while (*loc && (ptr = strstr(loc, pat))) { -+ while (loc < ptr) -+ *str++ = *loc++; -+ loc += strlen(pat); -+ } -+ -+ while (*loc) -+ *str++ = *loc++; -+ -+ *str = 0; -+ -+ return(ret); -+} -+ -+/* Check if maildirfilter file is up-to-date compared to SQL, (re)write it if not. */ -+static long sql2file(char *filename, char *user) -+{ -+ char *myname = "sql2file"; -+ char *filter_sqlres; -+ char filter_fileres[128]; -+ long sqlmtime = 0, filemtime = 0, retval = 0; -+ int filterfile, size_sqlres, i; -+ struct stat statbuf; -+ -+ if (*var_virt_maildir_filter_maps != 0) { -+ filter_sqlres = (char *) mymalloc(16000); -+ filter_sqlres = (char *) mail_addr_find(virtual_maildir_filter_maps, user, (char **) 0); -+ -+ if (filter_sqlres) { -+ strcut(filter_sqlres, "\r"); -+ if (filter_sqlres[0] == '#' && filter_sqlres[1] == ' ' && filter_sqlres[2] == 'M') { -+ size_sqlres = strlen(filter_sqlres); -+ -+ for (i = 4; i <= size_sqlres; i++) { -+ if(filter_sqlres[i] == '/' && filter_sqlres[i+1] == '^') { -+ filter_sqlres[i-1] = '\n'; -+ } -+ } -+ -+ filter_sqlres[(size_sqlres+1)] = '\0'; -+ -+ sqlmtime = atol(filter_sqlres+3); -+ retval = sqlmtime; -+ -+ filterfile = open(filename, O_RDONLY, 0); -+ if (filterfile) { -+ read(filterfile, (void *) filter_fileres, 127); -+ close(filterfile); -+ -+ filemtime = atol(filter_fileres+3); -+ } -+ -+ if (msg_verbose) -+ msg_info("%s: filter data: sql_size=%d sql_mtime=%ld file_mtime=%ld", myname, strlen(filter_sqlres), sqlmtime, filemtime); -+ } -+ if (sqlmtime != filemtime && sqlmtime != 0) { -+ if ((filterfile = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0640))) { -+ if (msg_verbose) -+ msg_info("%s: updating filter file: %s", myname, filename); -+ write(filterfile, filter_sqlres, strlen(filter_sqlres)); -+ close(filterfile); -+ } -+ else { -+ msg_warn("%s: can't create filter file: %s", myname, filename); -+ retval = 0; -+ } -+ } -+ } -+ } -+ else { -+ if (stat(filename, &statbuf) == 0) -+ retval = (long) statbuf.st_mtime; -+ if (msg_verbose) -+ msg_info("%s: processing filter file: file_mtime=%ld", myname, retval); -+ } -+ -+ return retval; -+} -+ -+/* deliver_maildir - delivery to maildir-style mailbox */ -+int deliver_maildir(LOCAL_STATE state, USER_ATTR usr_attr) - { - const char *myname = "deliver_maildir"; -- char *newdir; -- char *tmpdir; -- char *curdir; -- char *tmpfile; -- char *newfile; -+ char *newdir; -+ char *tmpdir; -+ char *curdir; -+ char *newfile; -+ char *tmpfile; - DSN_BUF *why = state.msg_attr.why; - VSTRING *buf; - VSTREAM *dst; -- int mail_copy_status; -- int deliver_status; -- int copy_flags; -- struct stat st; -- struct timeval starttime; -+ int mail_copy_status; -+ int deliver_status; -+ int copy_flags; -+ struct stat st; -+ struct timeval starttime; -+ -+ /* Maildir Quota. */ -+ const char *limit_res; /* Limit from map. */ -+ char *sizefilename = (char *) 0; /* Maildirsize file name. */ -+ VSTRING *filequota; /* Quota setting from the maildirsize file. */ -+ VSTREAM *sizefile; /* Maildirsize file handle. */ -+ long n = 0; /* Limit in long integer format. */ -+ long saved_count = 0; /* The total number of files. */ -+ long saved_size = 0; /* The total quota of all files. */ -+ struct stat mail_stat; /* To check the size of the mail to be written. */ -+ struct stat sizefile_stat; /* To check the size of the maildirsize file. */ -+ time_t tm; /* To check the age of the maildirsize file. */ -+ -+ /* Maildir Filters. */ -+ const char *value, *cmd_text; /* Filter values. */ -+ char *filtername; -+ char *header; -+ char *bkpnewfile; -+ char *mdffilename = (char *) 0; /* Maildirfolder file name. */ -+ VSTRING *fltstr; -+ VSTREAM *tmpfilter; -+ VSTREAM *mdffile; /* Maildirfolder file handle. */ -+ DICT *FILTERS; -+ long sqlmtime; /* Latest modification time from sql2file(). */ -+ int cmd_len; -+ struct stat mdffile_stat; /* To check if the maildirfolder file exists. */ - - GETTIMEOFDAY(&starttime); - -@@ -93,15 +471,14 @@ - */ - state.level++; - if (msg_verbose) -- MSG_LOG_STATE(myname, state); -+ MSG_LOG_STATE(myname, state); - - /* - * Don't deliver trace-only requests. - */ - if (DEL_REQ_TRACE_ONLY(state.request->flags)) { -- dsb_simple(why, "2.0.0", "delivers to maildir"); -- return (sent(BOUNCE_FLAGS(state.request), -- SENT_ATTR(state.msg_attr))); -+ dsb_simple(why, "2.0.0", "delivers to maildir"); -+ return (sent(BOUNCE_FLAGS(state.request), SENT_ATTR(state.msg_attr))); - } - - /* -@@ -109,17 +486,91 @@ - * attribute to reflect the final recipient. - */ - if (vstream_fseek(state.msg_attr.fp, state.msg_attr.offset, SEEK_SET) < 0) -- msg_fatal("seek message file %s: %m", VSTREAM_PATH(state.msg_attr.fp)); -+ msg_fatal("seek message file %s: %m", VSTREAM_PATH(state.msg_attr.fp)); - state.msg_attr.delivered = state.msg_attr.rcpt.address; - mail_copy_status = MAIL_COPY_STAT_WRITE; - buf = vstring_alloc(100); - -- copy_flags = MAIL_COPY_TOFILE | MAIL_COPY_RETURN_PATH -- | MAIL_COPY_DELIVERED | MAIL_COPY_ORIG_RCPT; -+ copy_flags = MAIL_COPY_TOFILE | MAIL_COPY_RETURN_PATH | MAIL_COPY_DELIVERED | MAIL_COPY_ORIG_RCPT; - -- newdir = concatenate(usr_attr.mailbox, "new/", (char *) 0); -- tmpdir = concatenate(usr_attr.mailbox, "tmp/", (char *) 0); -- curdir = concatenate(usr_attr.mailbox, "cur/", (char *) 0); -+ /* -+ * Concatenate the maildir suffix (if set). -+ */ -+ if (*var_virt_maildir_suffix == 0) { -+ newdir = concatenate(usr_attr.mailbox, "new/", (char *) 0); -+ tmpdir = concatenate(usr_attr.mailbox, "tmp/", (char *) 0); -+ curdir = concatenate(usr_attr.mailbox, "cur/", (char *) 0); -+ } -+ else { -+ newdir = concatenate(usr_attr.mailbox, var_virt_maildir_suffix, (char *) 0); -+ tmpdir = concatenate(usr_attr.mailbox, var_virt_maildir_suffix, (char *) 0); -+ curdir = concatenate(usr_attr.mailbox, var_virt_maildir_suffix, (char *) 0); -+ newdir = concatenate(newdir, "new/", (char *) 0); -+ tmpdir = concatenate(tmpdir, "tmp/", (char *) 0); -+ curdir = concatenate(curdir, "cur/", (char *) 0); -+ } -+ -+ /* -+ * Look up the virtual maildir limit size for this user. -+ * Fall back to virtual_mailbox_limit in case lookup failed. -+ * If virtual maildir limit size is negative, fall back to virtual_mailbox_limit. -+ * If it's 0, set the mailbox limit to 0, which means unlimited. -+ * If it's more than 0 (positive int), check if the value is smaller than the maximum message size, -+ * if it is and the virtual maildir limit can't be overridden, fall back to virtual_mailbox_limit and -+ * warn the user, else use the value directly as the maildir limit. -+ */ -+ if (*var_virt_mailbox_limit_maps != 0 && (limit_res = mail_addr_find(virtual_mailbox_limit_maps, state.msg_attr.user, (char **) NULL)) != 0) { -+ n = atol(limit_res); -+ if (n > 0) { -+ if ((n < var_message_limit) && (!var_virt_mailbox_limit_override)) { -+ n = var_virt_mailbox_limit; -+ -+ msg_warn("%s: recipient %s - virtual maildir limit is " -+ "smaller than %s in %s - falling back to %s", -+ myname, -+ state.msg_attr.user, -+ VAR_MESSAGE_LIMIT, -+ virtual_mailbox_limit_maps->title, -+ VAR_VIRT_MAILBOX_LIMIT); -+ } -+ else { -+ if (msg_verbose) -+ msg_info("%s: set virtual maildir limit size for %s to %ld", -+ myname, usr_attr.mailbox, n); -+ } -+ } -+ else if (n == 0) { -+ if (msg_verbose) -+ msg_info("%s: set virtual maildir limit size for %s to %ld", -+ myname, usr_attr.mailbox, n); -+ } -+ else { -+ /* Invalid limit size (negative). Use default virtual_mailbox_limit. */ -+ n = var_virt_mailbox_limit; -+ } -+ } -+ else { -+ /* There is no limit in the maps. Use default virtual_mailbox_limit. */ -+ n = var_virt_mailbox_limit; -+ } -+ -+ /* -+ * Check quota before delivering the mail. -+ */ -+ if (n != 0) { -+ set_eugid(usr_attr.uid, usr_attr.gid); -+ if (var_virt_mailbox_limit_inbox) { -+ /* Check Inbox only (new, cur and tmp dirs). */ -+ saved_size = check_dir_size(newdir, &saved_count); -+ saved_size += check_dir_size(curdir, &saved_count); -+ saved_size += check_dir_size(tmpdir, &saved_count); -+ } -+ else { -+ /* Check all boxes. */ -+ saved_size = check_dir_size(usr_attr.mailbox, &saved_count); -+ } -+ set_eugid(var_owner_uid, var_owner_gid); -+ } - - /* - * Create and write the file as the recipient, so that file quota work. -@@ -174,46 +625,296 @@ - * [...] - */ - set_eugid(usr_attr.uid, usr_attr.gid); -- vstring_sprintf(buf, "%lu.P%d.%s", -- (unsigned long) starttime.tv_sec, var_pid, get_hostname()); -+ vstring_sprintf(buf, "%lu.P%d.%s", (unsigned long) starttime.tv_sec, var_pid, get_hostname()); - tmpfile = concatenate(tmpdir, STR(buf), (char *) 0); - newfile = 0; -+ bkpnewfile = 0; - if ((dst = vstream_fopen(tmpfile, O_WRONLY | O_CREAT | O_EXCL, 0600)) == 0 -- && (errno != ENOENT -- || make_dirs(tmpdir, 0700) < 0 -- || (dst = vstream_fopen(tmpfile, O_WRONLY | O_CREAT | O_EXCL, 0600)) == 0)) { -- dsb_simple(why, mbox_dsn(errno, "4.2.0"), -- "create maildir file %s: %m", tmpfile); -- } else if (fstat(vstream_fileno(dst), &st) < 0) { -- -- /* -- * Coverity 200604: file descriptor leak in code that never executes. -- * Code replaced by msg_fatal(), as it is not worthwhile to continue -- * after an impossible error condition. -- */ -- msg_fatal("fstat %s: %m", tmpfile); -- } else { -- vstring_sprintf(buf, "%lu.V%lxI%lxM%lu.%s", -- (unsigned long) starttime.tv_sec, -- (unsigned long) st.st_dev, -- (unsigned long) st.st_ino, -- (unsigned long) starttime.tv_usec, -- get_hostname()); -- newfile = concatenate(newdir, STR(buf), (char *) 0); -- if ((mail_copy_status = mail_copy(COPY_ATTR(state.msg_attr), -- dst, copy_flags, "\n", -- why)) == 0) { -- if (sane_link(tmpfile, newfile) < 0 -- && (errno != ENOENT -- || (make_dirs(curdir, 0700), make_dirs(newdir, 0700)) < 0 -- || sane_link(tmpfile, newfile) < 0)) { -- dsb_simple(why, mbox_dsn(errno, "4.2.0"), -- "create maildir file %s: %m", newfile); -- mail_copy_status = MAIL_COPY_STAT_WRITE; -- } -- } -- if (unlink(tmpfile) < 0) -- msg_warn("remove %s: %m", tmpfile); -+ && (errno != ENOENT -+ || make_dirs(tmpdir, 0700) < 0 -+ || (dst = vstream_fopen(tmpfile, O_WRONLY | O_CREAT | O_EXCL, 0600)) == 0)) { -+ dsb_simple(why, mbox_dsn(errno, "4.2.0"), "create maildir file %s: %m", tmpfile); -+ } -+ else if (fstat(vstream_fileno(dst), &st) < 0) { -+ /* -+ * Coverity 200604: file descriptor leak in code that never executes. -+ * Code replaced by msg_fatal(), as it is not worthwhile to continue -+ * after an impossible error condition. -+ */ -+ msg_fatal("fstat %s: %m", tmpfile); -+ } -+ else { -+ vstring_sprintf(buf, "%lu.V%lxI%lxM%lu.%s", -+ (unsigned long) starttime.tv_sec, -+ (unsigned long) st.st_dev, -+ (unsigned long) st.st_ino, -+ (unsigned long) starttime.tv_usec, -+ get_hostname()); -+ newfile = concatenate(newdir, STR(buf), (char *) 0); -+ bkpnewfile = concatenate(STR(buf), (char *) 0); /* Will need it later, if we MOVE to other folders. */ -+ -+ if ((mail_copy_status = mail_copy(COPY_ATTR(state.msg_attr), dst, copy_flags, "\n", why)) == 0) { -+ /* -+ * Add a ",S=" to the newly written file according to the -+ * Maildir++ specifications: http://www.inter7.com/courierimap/README.maildirquota.html -+ * This needs a stat(2) of the tempfile and modification of the -+ * name of the file. -+ */ -+ if (stat(tmpfile, &mail_stat) == 0) { -+ if (n != 0) { -+ saved_size += (long) mail_stat.st_size; -+ saved_count++; -+ } -+ if (var_virt_maildir_extended) { -+ /* Append the size of the file to newfile. */ -+ vstring_sprintf(buf, ",S=%ld", (long) mail_stat.st_size); -+ newfile = concatenate(newfile, STR(buf), (char *) 0); -+ bkpnewfile = concatenate(bkpnewfile, STR(buf), (char *) 0); -+ } -+ } -+ -+ /* -+ * Now we have the maildir size in saved_size, compare it to the max -+ * quota value and eventually issue a message that we've overdrawn it. -+ */ -+ if (saved_size > n) { -+ mail_copy_status = MAIL_COPY_STAT_WRITE; -+ if (((long) mail_stat.st_size > n) || (var_virt_overquota_bounce)) -+ errno = EFBIG; -+ else -+ errno = EDQUOT; -+ } -+ else { -+ /* Maildirfilter code by rk@demiurg.net. */ -+ if (var_virt_maildir_filter) { -+ if (msg_verbose) -+ msg_info("%s: loading DICT filters", myname); -+ -+#define STREQUAL(x,y,l) (strncasecmp((x), (y), (l)) == 0 && (y)[l] == 0) -+#define MAIL_COPY_STAT_REJECT (1<<3) -+#define MAIL_COPY_STAT_DISCARD (1<<4) -+ -+ /* Read filters. */ -+ filtername = concatenate("regexp:", usr_attr.mailbox, "maildirfilter", (char *) 0); -+ sqlmtime = sql2file(strchr(filtername, '/'), state.msg_attr.user); -+ -+ /* Check if this filter is already registered as dictionary. */ -+ if (msg_verbose) -+ msg_info("%s: checking DICT filters for %s", myname, filtername); -+ -+ if ((FILTERS = dict_handle(filtername))) { -+ if (msg_verbose) -+ msg_info("%s: DICT filter found", myname); -+ -+ /* -+ * If we have mtime in our DICT structure, check it against sqlmtime -+ * and reload the filters if they differ. -+ */ -+ if (FILTERS->mtime > 0 && sqlmtime > 0 && FILTERS->mtime != sqlmtime) { -+ if (msg_verbose) -+ msg_info("%s: reloading DICT filters (dict_mtime=%ld != sql_mtime=%ld)", -+ myname, FILTERS->mtime, sqlmtime); -+ -+ dict_unregister(filtername); -+ FILTERS = dict_open(filtername, O_RDONLY, DICT_FLAG_LOCK); -+ dict_register(filtername, FILTERS); -+ FILTERS->mtime = sqlmtime; -+ } -+ } -+ else { -+ if (sqlmtime > 0) { -+ /* Registering filter as new dictionary. */ -+ if (msg_verbose) -+ msg_info("%s: loading DICT filters from %s (mtime=%ld)", -+ myname, filtername, sqlmtime); -+ -+ FILTERS = dict_open(filtername, O_RDONLY, DICT_FLAG_LOCK); -+ dict_register(filtername, FILTERS); -+ FILTERS->mtime = sqlmtime; -+ } -+ } -+ -+ if (FILTERS && (tmpfilter = vstream_fopen(tmpfile, O_RDONLY, 0))) { -+ fltstr = vstring_alloc(1024); -+ header = (char *) malloc(8192); /* !!!INSECURE!!! See 7168-hack below. */ -+ header[0] = 0; -+ vstring_get_nonl_bound(fltstr, tmpfilter, 1023); -+ header = concatenate(header, STR(fltstr), (char *) 0); -+ -+ while(!vstream_feof(tmpfilter) && fltstr->vbuf.data[0] && strlen(header) < 7168 ) { -+ vstring_get_nonl_bound(fltstr, tmpfilter, 1023); -+ /* Glue multiline headers, replacing leading TAB with space. */ -+ if (msg_verbose) -+ msg_info("%s: fltstr value: %s", myname, STR(fltstr)); -+ -+ if (fltstr->vbuf.data[0] == ' ' || fltstr->vbuf.data[0] == '\t' ) { -+ if (fltstr->vbuf.data[0] == '\t') -+ fltstr->vbuf.data[0] = ' '; -+ header = concatenate(header, STR(fltstr), (char *) 0); -+ } -+ else { -+ header = concatenate(header, "\n", STR(fltstr), (char *) 0); -+ } -+ } -+ -+ if (msg_verbose) -+ msg_info("%s: checking filter CMD for %s", myname, filtername); -+ -+ /* Check whole header part with regexp maps. */ -+ if ((value = dict_get(FILTERS, lowercase(header))) != 0) { -+ if (msg_verbose) -+ msg_info("%s: preparing filter CMD", myname); -+ -+ cmd_text = value + strcspn(value, " \t"); -+ cmd_len = cmd_text - value; -+ while (*cmd_text && ISSPACE(*cmd_text)) -+ cmd_text++; -+ -+ if (msg_verbose) -+ msg_info("%s: executing filter CMD", myname); -+ -+ if (STREQUAL(value, "REJECT", cmd_len)) { -+ if (msg_verbose) -+ msg_info("%s: executing filter CMD REJECT", myname); -+ -+ mail_copy_status = MAIL_COPY_STAT_REJECT; -+ vstring_sprintf(why->reason, "%s", cmd_text); -+ dsb_simple(why, "5.0.0", "User filter - REJECT"); -+ } -+ -+ if (STREQUAL(value, "DISCARD", cmd_len)) { -+ if (msg_verbose) -+ msg_info("%s: executing filter CMD DISCARD", myname); -+ -+ mail_copy_status = MAIL_COPY_STAT_DISCARD; -+ vstring_sprintf(why->reason, "%s", cmd_text); -+ dsb_simple(why, "5.0.0", "User filter - DISCARD"); -+ } -+ -+ if (var_virt_maildir_extended) { -+ if (STREQUAL(value, "MOVE", cmd_len)) { -+ if (msg_verbose) -+ msg_info("%s: executing filter CMD MOVE", myname); -+ -+ strcut((char *) cmd_text, " "); -+ strcut((char *) cmd_text, "\t"); -+ strcut((char *) cmd_text, "/"); -+ strcut((char *) cmd_text, ".."); -+ -+ if (*var_virt_maildir_suffix == 0) { -+ newfile = concatenate(usr_attr.mailbox, (char *) 0); -+ } -+ else { -+ newfile = concatenate(usr_attr.mailbox, var_virt_maildir_suffix, (char *) 0); -+ } -+ -+ if (cmd_text[0] != '.') { -+ newfile = concatenate(newfile, ".", (char *) 0); -+ } -+ newdir = concatenate(newfile, cmd_text, "/", "new/", (char *) 0); -+ tmpdir = concatenate(newfile, cmd_text, "/", "tmp/", (char *) 0); -+ curdir = concatenate(newfile, cmd_text, "/", "cur/", (char *) 0); -+ mdffilename = concatenate(newfile, cmd_text, "/", "maildirfolder", (char *) 0); -+ newfile = concatenate(newfile, cmd_text, "/", "new/", bkpnewfile, (char *) 0); -+ } -+ } -+ -+ if (STREQUAL(value, "LOG", cmd_len) || STREQUAL(value, "WARN", cmd_len)) { -+ msg_warn("%s: header check warning: %s", myname, cmd_text); -+ } -+ -+ if (STREQUAL(value, "INFO", cmd_len)) { -+ msg_info("%s: header check info: %s", myname, cmd_text); -+ } -+ -+ if (msg_verbose) -+ msg_info("%s: exiting filter CMD", myname); -+ } /* End-Of-Check */ -+ -+ myfree(header); -+ vstring_free(fltstr); -+ vstream_fclose(tmpfilter); -+ } -+ -+ myfree(filtername); -+ } /* End-Of-Maildirfilter */ -+ -+ /* Deliver to curdir. */ -+ if (mail_copy_status == 0) { -+ if (sane_link(tmpfile, newfile) < 0 -+ && (errno != ENOENT -+ || (make_dirs(curdir, 0700), make_dirs(newdir, 0700), make_dirs(tmpdir, 0700)) < 0 -+ || sane_link(tmpfile, newfile) < 0)) { -+ dsb_simple(why, mbox_dsn(errno, "4.2.0"), "create maildir file %s: %m", newfile); -+ mail_copy_status = MAIL_COPY_STAT_WRITE; -+ } -+ -+ if (var_virt_maildir_extended) { -+ time(&tm); -+ -+ if (*var_virt_maildir_suffix == 0) { -+ sizefilename = concatenate(usr_attr.mailbox, "maildirsize", (char *) 0); -+ } -+ else { -+ sizefilename = concatenate(usr_attr.mailbox, var_virt_maildir_suffix, (char *) 0); -+ sizefilename = concatenate(sizefilename, "maildirsize", (char *) 0); -+ } -+ -+ /* Check if the quota in the file is the same as the current one, if not, delete the file. */ -+ sizefile = vstream_fopen(sizefilename, O_RDONLY, 0); -+ if (sizefile) { -+ filequota = vstring_alloc(128); -+ vstring_get_null_bound(filequota, sizefile, 127); -+ vstream_fclose(sizefile); -+ if (atol(vstring_export(filequota)) != n) -+ unlink(sizefilename); -+ } -+ -+ /* Open maildirsize file to append this transaction. */ -+ sizefile = vstream_fopen(sizefilename, O_WRONLY | O_APPEND, 0640); -+ -+ /* If the open fails (maildirsize doesn't exist), or it's too large, or too old, overwrite it. */ -+ if(!sizefile || (stat(sizefilename, &sizefile_stat) < 0) || (sizefile_stat.st_size > SIZEFILE_MAX) || (sizefile_stat.st_mtime + 15*60 < tm)) { -+ /* If the file exists, sizefile has been opened above, so close it first. */ -+ if (sizefile) { -+ vstream_fclose(sizefile); -+ sizefile = vstream_fopen(sizefilename, O_WRONLY | O_TRUNC, 0640); -+ } -+ else { -+ sizefile = vstream_fopen(sizefilename, O_WRONLY | O_CREAT, 0640); -+ } -+ -+ /* If the creation worked, write to the file, otherwise just give up. */ -+ if (sizefile) { -+ vstream_fprintf(sizefile, "%ldS\n%ld %ld\n", n, saved_size, saved_count); -+ vstream_fclose(sizefile); -+ } -+ } -+ else { -+ /* We opened maildirsize, so let's just append this transaction and close it. */ -+ vstream_fprintf(sizefile, "%ld 1\n", (long) mail_stat.st_size); -+ vstream_fclose(sizefile); -+ } -+ -+ /* -+ * 1) mdffilename != 0, so the maildirfilter code went through the MOVE to subfolder rule. -+ * 2) stat() failed, maybe the file does not exist? Try to create it. -+ */ -+ if (mdffilename && (stat(mdffilename, &mdffile_stat) < 0)) { -+ mdffile = vstream_fopen(mdffilename, O_WRONLY | O_CREAT, 0600); -+ if (mdffile) { -+ vstream_fclose(mdffile); -+ } -+ else { -+ msg_warn("Cannot create maildirfolder file '%s': %s", mdffilename, strerror(errno)); -+ } -+ } -+ } -+ } -+ } -+ } -+ if (unlink(tmpfile) < 0) -+ msg_warn("remove %s: %m", tmpfile); - } - set_eugid(var_owner_uid, var_owner_gid); - -@@ -223,31 +924,64 @@ - * location possibly under user control. - */ - if (mail_copy_status & MAIL_COPY_STAT_CORRUPT) { -- deliver_status = DEL_STAT_DEFER; -- } else if (mail_copy_status != 0) { -- if (errno == EACCES) { -- msg_warn("maildir access problem for UID/GID=%lu/%lu: %s", -- (long) usr_attr.uid, (long) usr_attr.gid, -- STR(why->reason)); -- msg_warn("perhaps you need to create the maildirs in advance"); -- } -- vstring_sprintf_prepend(why->reason, "maildir delivery failed: "); -- deliver_status = -- (STR(why->status)[0] == '4' ? -- defer_append : bounce_append) -- (BOUNCE_FLAGS(state.request), -- BOUNCE_ATTR(state.msg_attr)); -- } else { -- dsb_simple(why, "2.0.0", "delivered to maildir"); -- deliver_status = sent(BOUNCE_FLAGS(state.request), -- SENT_ATTR(state.msg_attr)); -+ deliver_status = DEL_STAT_DEFER; -+ } -+ else if (mail_copy_status != 0) { -+ if (errno == EACCES) { -+ msg_warn("maildir access problem for UID/GID=%lu/%lu: %s", -+ (long) usr_attr.uid, (long) usr_attr.gid, STR(why->reason)); -+ msg_warn("perhaps you need to create the maildirs in advance"); -+ } -+ -+ /* Support per-recipient bounce messages. */ -+ const char *limit_message; -+ int errnored = errno; /* Seems like mail_addr_find resets errno ... */ -+ -+ if (*var_virt_maildir_limit_message_maps != 0 && (limit_message = mail_addr_find(virtual_maildir_limit_message_maps, state.msg_attr.user, (char **) NULL)) != 0) { -+ errno = errnored; -+ if (errno == EFBIG) { -+ dsb_simple(why, "5.2.2", limit_message); -+ } -+ if (errno == EDQUOT) { -+ dsb_simple(why, "4.2.2", limit_message); -+ } -+ } -+ else { -+ errno = errnored; -+ if (errno == EFBIG) { -+ dsb_simple(why, "5.2.2", var_virt_maildir_limit_message); -+ } -+ if (errno == EDQUOT) { -+ dsb_simple(why, "4.2.2", var_virt_maildir_limit_message); -+ } -+ } -+ -+ vstring_sprintf_prepend(why->reason, "maildir delivery failed: "); -+ deliver_status = -+ (STR(why->status)[0] == '4' ? defer_append : bounce_append) -+ (BOUNCE_FLAGS(state.request), BOUNCE_ATTR(state.msg_attr)); - } -+ else { -+ dsb_simple(why, "2.0.0", "delivered to maildir"); -+ deliver_status = sent(BOUNCE_FLAGS(state.request), SENT_ATTR(state.msg_attr)); -+ } -+ - vstring_free(buf); -+ - myfree(newdir); - myfree(tmpdir); - myfree(curdir); -+ -+ if (sizefilename) -+ myfree(sizefilename); -+ if (mdffilename) -+ myfree(mdffilename); -+ - myfree(tmpfile); - if (newfile) -- myfree(newfile); -+ myfree(newfile); -+ if (bkpnewfile) -+ myfree(bkpnewfile); -+ - return (deliver_status); - } -diff -Nru postfix-2.5.1/src/virtual/virtual.c postfix-2.5.1-vda-ng/src/virtual/virtual.c ---- postfix-2.5.1/src/virtual/virtual.c 2008-01-08 21:35:08.000000000 +0100 -+++ postfix-2.5.1-vda-ng/src/virtual/virtual.c 2008-03-15 15:12:30.906943990 +0100 -@@ -330,12 +330,28 @@ - int var_virt_mailbox_limit; - char *var_mail_spool_dir; /* XXX dependency fix */ - -+char *var_virt_mailbox_limit_maps; -+bool var_virt_mailbox_limit_inbox; -+bool var_virt_mailbox_limit_override; -+bool var_virt_maildir_extended; -+bool var_virt_overquota_bounce; -+char *var_virt_maildir_limit_message; -+char *var_virt_maildir_limit_message_maps; -+char *var_virt_maildir_suffix; -+bool var_virt_trash_count; -+char *var_virt_trash_name; -+bool var_virt_maildir_filter; -+char *var_virt_maildir_filter_maps; -+ - /* - * Mappings. - */ - MAPS *virtual_mailbox_maps; - MAPS *virtual_uid_maps; - MAPS *virtual_gid_maps; -+MAPS *virtual_mailbox_limit_maps; -+MAPS *virtual_maildir_limit_message_maps; -+MAPS *virtual_maildir_filter_maps; - - /* - * Bit masks. -@@ -445,15 +461,24 @@ - */ - virtual_mailbox_maps = - maps_create(VAR_VIRT_MAILBOX_MAPS, var_virt_mailbox_maps, -- DICT_FLAG_LOCK | DICT_FLAG_PARANOID); -- -+ DICT_FLAG_LOCK); - virtual_uid_maps = - maps_create(VAR_VIRT_UID_MAPS, var_virt_uid_maps, -- DICT_FLAG_LOCK | DICT_FLAG_PARANOID); -- -+ DICT_FLAG_LOCK); - virtual_gid_maps = - maps_create(VAR_VIRT_GID_MAPS, var_virt_gid_maps, -- DICT_FLAG_LOCK | DICT_FLAG_PARANOID); -+ DICT_FLAG_LOCK); -+ virtual_mailbox_limit_maps = -+ maps_create(VAR_VIRT_MAILBOX_LIMIT_MAPS, var_virt_mailbox_limit_maps, -+ DICT_FLAG_LOCK); -+ -+ virtual_maildir_limit_message_maps = -+ maps_create(VAR_VIRT_MAILDIR_LIMIT_MESSAGE_MAPS, var_virt_maildir_limit_message_maps, -+ DICT_FLAG_LOCK); -+ -+ virtual_maildir_filter_maps = -+ maps_create(VAR_VIRT_MAILDIR_FILTER_MAPS, var_virt_maildir_filter_maps, -+ DICT_FLAG_LOCK); - - virtual_mbox_lock_mask = mbox_lock_mask(var_virt_mailbox_lock); - } -@@ -490,20 +515,37 @@ - - int main(int argc, char **argv) - { -- static const CONFIG_INT_TABLE int_table[] = { -- VAR_VIRT_MINUID, DEF_VIRT_MINUID, &var_virt_minimum_uid, 1, 0, -- VAR_VIRT_MAILBOX_LIMIT, DEF_VIRT_MAILBOX_LIMIT, &var_virt_mailbox_limit, 0, 0, -- 0, -- }; -- static const CONFIG_STR_TABLE str_table[] = { -- VAR_MAIL_SPOOL_DIR, DEF_MAIL_SPOOL_DIR, &var_mail_spool_dir, 0, 0, -- VAR_VIRT_MAILBOX_MAPS, DEF_VIRT_MAILBOX_MAPS, &var_virt_mailbox_maps, 0, 0, -- VAR_VIRT_UID_MAPS, DEF_VIRT_UID_MAPS, &var_virt_uid_maps, 0, 0, -- VAR_VIRT_GID_MAPS, DEF_VIRT_GID_MAPS, &var_virt_gid_maps, 0, 0, -- VAR_VIRT_MAILBOX_BASE, DEF_VIRT_MAILBOX_BASE, &var_virt_mailbox_base, 1, 0, -- VAR_VIRT_MAILBOX_LOCK, DEF_VIRT_MAILBOX_LOCK, &var_virt_mailbox_lock, 1, 0, -- 0, -- }; -+ static const CONFIG_INT_TABLE int_table[] = { -+ VAR_VIRT_MINUID, DEF_VIRT_MINUID, &var_virt_minimum_uid, 1, 0, -+ VAR_VIRT_MAILBOX_LIMIT, DEF_VIRT_MAILBOX_LIMIT, &var_virt_mailbox_limit, 0, 0, -+ 0, -+ }; -+ -+ static const CONFIG_BOOL_TABLE bool_table[] = { -+ VAR_VIRT_MAILBOX_LIMIT_INBOX, DEF_VIRT_MAILBOX_LIMIT_INBOX, &var_virt_mailbox_limit_inbox, -+ VAR_VIRT_MAILBOX_LIMIT_OVERRIDE, DEF_VIRT_MAILBOX_LIMIT_OVERRIDE, &var_virt_mailbox_limit_override, -+ VAR_VIRT_MAILDIR_EXTENDED, DEF_VIRT_MAILDIR_EXTENDED, &var_virt_maildir_extended, -+ VAR_VIRT_OVERQUOTA_BOUNCE, DEF_VIRT_OVERQUOTA_BOUNCE, &var_virt_overquota_bounce, -+ VAR_VIRT_TRASH_COUNT, DEF_VIRT_TRASH_COUNT, &var_virt_trash_count, -+ VAR_VIRT_MAILDIR_FILTER, DEF_VIRT_MAILDIR_FILTER, &var_virt_maildir_filter, -+ 0, -+ }; -+ -+ static const CONFIG_STR_TABLE str_table[] = { -+ VAR_MAIL_SPOOL_DIR, DEF_MAIL_SPOOL_DIR, &var_mail_spool_dir, 0, 0, -+ VAR_VIRT_MAILBOX_MAPS, DEF_VIRT_MAILBOX_MAPS, &var_virt_mailbox_maps, 0, 0, -+ VAR_VIRT_UID_MAPS, DEF_VIRT_UID_MAPS, &var_virt_uid_maps, 0, 0, -+ VAR_VIRT_GID_MAPS, DEF_VIRT_GID_MAPS, &var_virt_gid_maps, 0, 0, -+ VAR_VIRT_MAILBOX_LIMIT_MAPS, DEF_VIRT_MAILBOX_LIMIT_MAPS, &var_virt_mailbox_limit_maps, 0, 0, -+ VAR_VIRT_MAILBOX_BASE, DEF_VIRT_MAILBOX_BASE, &var_virt_mailbox_base, 1, 0, -+ VAR_VIRT_MAILBOX_LOCK, DEF_VIRT_MAILBOX_LOCK, &var_virt_mailbox_lock, 1, 0, -+ VAR_VIRT_MAILDIR_LIMIT_MESSAGE, DEF_VIRT_MAILDIR_LIMIT_MESSAGE, &var_virt_maildir_limit_message, 1, 0, -+ VAR_VIRT_MAILDIR_LIMIT_MESSAGE_MAPS, DEF_VIRT_MAILDIR_LIMIT_MESSAGE_MAPS, &var_virt_maildir_limit_message_maps, 0, 0, -+ VAR_VIRT_MAILDIR_SUFFIX, DEF_VIRT_MAILDIR_SUFFIX, &var_virt_maildir_suffix, 0, 0, -+ VAR_VIRT_TRASH_NAME, DEF_VIRT_TRASH_NAME, &var_virt_trash_name, 0, 0, -+ VAR_VIRT_MAILDIR_FILTER_MAPS, DEF_VIRT_MAILDIR_FILTER_MAPS, &var_virt_maildir_filter_maps, 0, 0, -+ 0, -+ }; - - /* - * Fingerprint executables and core dumps. -@@ -516,6 +558,7 @@ - MAIL_SERVER_PRE_INIT, pre_init, - MAIL_SERVER_POST_INIT, post_init, - MAIL_SERVER_PRE_ACCEPT, pre_accept, -+ MAIL_SERVER_BOOL_TABLE, bool_table, - MAIL_SERVER_PRIVILEGED, - 0); - } -diff -Nru postfix-2.5.1/src/virtual/virtual.h postfix-2.5.1-vda-ng/src/virtual/virtual.h ---- postfix-2.5.1/src/virtual/virtual.h 2006-01-08 00:59:47.000000000 +0100 -+++ postfix-2.5.1-vda-ng/src/virtual/virtual.h 2008-03-15 15:06:02.103665796 +0100 -@@ -34,6 +34,9 @@ - extern MAPS *virtual_mailbox_maps; - extern MAPS *virtual_uid_maps; - extern MAPS *virtual_gid_maps; -+extern MAPS *virtual_mailbox_limit_maps; -+extern MAPS *virtual_maildir_limit_message_maps; -+extern MAPS *virtual_maildir_filter_maps; - - /* - * User attributes: these control the privileges for delivery to external diff --git a/versioncp/commontest b/versioncp/commontest deleted file mode 100755 index 78c4f1f..0000000 --- a/versioncp/commontest +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -echo "Trying the most common places for a package to be ..." - -# Try them ... -pwd="`pwd`" -sfvers="`${pwd}/upstscripts/sourceforge $1`" -fmvers="`${pwd}/upstscripts/freshmeat $1`" -bevers="`${pwd}/upstscripts/berlios $1`" - -if [[ -n "${sfvers}" ]] ; then - echo "Package $1 found on SourceForge with version ${sfvers}" -fi - -if [[ -n "${fmvers}" ]] ; then - echo "Package $1 found on FreshMeat with version ${fmvers}" -fi -if [[ -n "${bevers}" ]] ; then - echo "Package $1 found on Berlios with version ${bevers}" -fi - -if [[ -z "${sfvers}" ]] && [[ -z "${fmvers}" ]] && [[ -z "${bevers}" ]] ; then - echo "Not found anywhere ..." -fi diff --git a/versioncp/dump.sql b/versioncp/dump.sql deleted file mode 100644 index e46b931..0000000 --- a/versioncp/dump.sql +++ /dev/null @@ -1,21 +0,0 @@ -DROP TABLE IF EXISTS `overlays`; - -CREATE TABLE `overlays` -( - `overname` VARCHAR(255) default '' NOT NULL, - `overtype` VARCHAR(255) default '' NOT NULL, - `overbranch` VARCHAR(255) default '' NOT NULL -) Type=MyISAM; - -DROP TABLE IF EXISTS `packages`; - -CREATE TABLE `packages` -( - `name` VARCHAR(255) default '' NOT NULL, - `versover` VARCHAR(255) default '' NOT NULL, - `versport` VARCHAR(255) default '' NOT NULL, - `versupst` VARCHAR(255) default '' NOT NULL, - `upstscript` VARCHAR(255) default '' NOT NULL, - `projtype` VARCHAR(255) default '' NOT NULL, - `projname` VARCHAR(255) default '' NOT NULL -) Type=MyISAM; diff --git a/versioncp/main.css b/versioncp/main.css deleted file mode 100644 index eb832d6..0000000 --- a/versioncp/main.css +++ /dev/null @@ -1,47 +0,0 @@ -.updated { - background-color : #18EF18; - border-color : #B7B7B7; - border-style : solid; - border-width : 1px; - text-align : center; -} - -.outdated { - background-color : #F81C1C; - border-color : #B7B7B7; - border-style : solid; - border-width : 1px; - text-align : center; -} - -.reference { - background-color : #F2F3F6; - border-color : #B7B7B7; - border-style : solid; - border-width : 1px; - text-align : center; -} - -.package { - background-color : #EBECF5; - border-color : #B7B7B7; - border-style : solid; - border-width : 1px; - text-align : left; -} - -.deadinfo { - background-color : #312E2E; - border-color : #B7B7B7; - border-style : solid; - border-width : 1px; - text-align : center; -} - -.brokenupst { - background-color : #4D4A4A; - border-color : #B7B7B7; - border-style : solid; - border-width : 1px; - text-align : center; -} diff --git a/versioncp/show_versions.php b/versioncp/show_versions.php deleted file mode 100644 index 325d32b..0000000 --- a/versioncp/show_versions.php +++ /dev/null @@ -1,312 +0,0 @@ - - - - - - Version Displayer - - -' . "\n"; - echo '

Type: ' . $_GET['type'] . '


' . "\n"; -} -else -{ - echo 'Please select which type of data you want to see.
' . "\n"; - echo 'Supported are "proj" and "dev" types, for the two
' . "\n"; - echo 'categories of overlays that we support.
' . "\n"; - echo '
' . "\n"; - echo '
' . "\n"; - echo '' . "\n"; - echo '' . "\n"; - echo '
' . "\n"; - echo '' . "\n"; - echo '' . "\n"; - exit; -} - -# Check that a name is set - -if(isset($_GET['name']) - && $_GET['name'] != '') -{ - $names_db = mysql_query('SELECT `overname` FROM `overlays` WHERE `overtype`= "' . $_GET['type'] . '"', $db); - - while($names = mysql_fetch_array($names_db)) - { - if($_GET['name'] === $names['overname']) - { - echo '

Name: ' . $_GET['name'] . '


' . "\n"; - $exitinvalid = '0'; - break; - } - else - { - $exitinvalid = '1'; - } - } - - if($exitinvalid === '1') - { - echo 'Invalid name supplied!
' . "\n"; - echo '' . "\n"; - echo '' . "\n"; - exit; - } -} -else -{ - $names_db = mysql_query('SELECT `overname` FROM `overlays` WHERE `overtype`= "' . $_GET['type'] . '"', $db); - echo 'Please select the name of the data you want to see.
' . "\n"; - echo '
' . "\n"; - echo '
' . "\n"; - echo '' . "\n"; - echo '' . "\n"; - echo '' . "\n"; - echo '
' . "\n"; - echo '' . "\n"; - echo '' . "\n"; - exit; -} - -?> - - - - - - - - B > C compare - - if($pkgs['versport'] != '-' - && $pkgs['versover'] != '-' - && $pkgs['versupst'] != '-') - { - # Let's consider upstream as being the reference here, so always up-to-date - - $upstclass = ' class="updated" title="from upstream script ( ' . $pkgs['upstscript'] . ' )"'; - - # First let's check the upstream <-> overlay relation - - switch(version_compare($pkgs['versupst'], $pkgs['versover'])) - { - case '-1': - $overclass = ' class="updated"'; - break; - case '0': - $overclass = ' class="updated"'; - break; - case '1': - $overclass = ' class="outdated"'; - break; - } - - # Then let's check the overlay <-> portage relation - - switch(version_compare($pkgs['versover'], $pkgs['versport'])) - { - case '-1': - $portclass = ' class="updated"'; - break; - case '0': - $portclass = ' class="updated"'; - break; - case '1': - $portclass = ' class="outdated"'; - break; - } - } - - # Case 2: A def, B undef, C undef - A - - if($pkgs['versport'] != '-' - && $pkgs['versover'] == '-' - && $pkgs['versupst'] == '-') - { - # Only in Portage, so it's automatically ok - - $portclass = ' class="updated"'; - } - - # Case 3: A def, B def, C undef - A > B compare - - if($pkgs['versport'] != '-' - && $pkgs['versover'] != '-' - && $pkgs['versupst'] == '-') - { - # Let's check the overlay <-> portage relation - - switch(version_compare($pkgs['versover'], $pkgs['versport'])) - { - case '-1': - $overclass = ' class="outdated"'; - $portclass = ' class="updated"'; - break; - case '0': - $overclass = ' class="updated"'; - $portclass = ' class="updated"'; - break; - case '1': - $overclass = ' class="updated"'; - $portclass = ' class="outdated"'; - break; - } - } - - # Case 4: A def, B undef, C def - A > C compare - - if($pkgs['versport'] != '-' - && $pkgs['versover'] == '-' - && $pkgs['versupst'] != '-') - { - # Let's consider upstream as being the reference here, so always up-to-date - - $upstclass = ' class="updated" title="from upstream script ( ' . $pkgs['upstscript'] . ' )"'; - - # Let's check the upstream <-> portage relation - - switch(version_compare($pkgs['versupst'], $pkgs['versport'])) - { - case '-1': - $portclass = ' class="updated"'; - break; - case '0': - $portclass = ' class="updated"'; - break; - case '1': - $portclass = ' class="outdated"'; - break; - } - } - - # Case 5: A undef, B undef, C undef - nothing - - if($pkgs['versport'] == '-' - && $pkgs['versover'] == '-' - && $pkgs['versupst'] == '-') - { - # We have absolutely no info on this package, mark as dead - - $upstclass = ' class="deadinfo" title="no info available on this package at all"'; - $overclass = ' class="deadinfo" title="no info available on this package at all"'; - $portclass = ' class="deadinfo" title="no info available on this package at all"'; - } - - # Case 6: A undef, B def, C def - B > C compare - - if($pkgs['versport'] == '-' - && $pkgs['versover'] != '-' - && $pkgs['versupst'] != '-') - { - # Let's consider upstream as being the reference here, so always up-to-date - - $upstclass = ' class="updated" title="from upstream script ( ' . $pkgs['upstscript'] . ' )"'; - - # Let's check the upstream <-> overlay relation - - switch(version_compare($pkgs['versupst'], $pkgs['versover'])) - { - case '-1': - $overclass = ' class="updated"'; - break; - case '0': - $overclass = ' class="updated"'; - break; - case '1': - $overclass = ' class="outdated"'; - break; - } - } - - # Case 7: A undef, B undef, C def - C - - if($pkgs['versport'] == '-' - && $pkgs['versover'] == '-' - && $pkgs['versupst'] != '-') - { - # Only Upstream, so it's automatically ok - - $upstclass = ' class="updated" title="from upstream script ( ' . $pkgs['upstscript'] . ' )"'; - } - - # Case 8: A undef, B def, C undef - B - - if($pkgs['versport'] == '-' - && $pkgs['versover'] != '-' - && $pkgs['versupst'] == '-') - { - # Only in Overlay, so it's automatically ok - - $overclass = ' class="updated"'; - } - - echo '' . "\n"; - echo ' ' . "\n"; - echo ' ' . $pkgs['versport'] . ' ' . "\n"; - echo ' ' . $pkgs['versover'] . ' ' . "\n"; - echo ' ' . $pkgs['versupst'] . ' ' . "\n"; - echo '' . "\n"; -} - -?> -
Package Name Latest in Portage Latest in Overlay Latest Upstream
' . $pkgs['name'] . '
- - \ No newline at end of file diff --git a/versioncp/svnupdater b/versioncp/svnupdater deleted file mode 100644 index d82479c..0000000 --- a/versioncp/svnupdater +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/bash - -overlayname="gentoo-php-overlay" -listofpkgs="app-admin/php-toolkit app-doc/php-docs dev-db/freetds dev-lang/php dev-php dev-php4 dev-php5" -listofeclasses="confutils.eclass depend.php.eclass php*.eclass" -echo "Starting with ${overlayname} ..." - -cd /svnupdaters/${overlayname}/svnoverlay/portage/ && svn up - -for pkg in ${listofpkgs} ; do - mkdir -p /svnupdaters/${overlayname}/portage-new/${pkg}/ - cp -Rf /usr/portage/${pkg}/* /svnupdaters/${overlayname}/portage-new/${pkg}/ -done - -for eclass in ${listofeclasses} ; do - mkdir -p /svnupdaters/${overlayname}/portage-new/eclass/ - cp -Rf /usr/portage/eclass/${eclass} /svnupdaters/${overlayname}/portage-new/eclass/ -done - -find /svnupdaters/${overlayname}/svnoverlay/portage/ -type f -print > /svnupdaters/${overlayname}/old -find /svnupdaters/${overlayname}/svnoverlay/portage/ -type d -print > /svnupdaters/${overlayname}/old-dirs -find /svnupdaters/${overlayname}/portage-new/ -type f -print > /svnupdaters/${overlayname}/new -find /svnupdaters/${overlayname}/portage-new/ -type d -print > /svnupdaters/${overlayname}/new-dirs - -sed -e "s|.*/.svn/.*||g" -i /svnupdaters/${overlayname}/old -sed -e "s|.*/.svn.*||g" -i /svnupdaters/${overlayname}/old-dirs -sed -e "s|^/svnupdaters/${overlayname}/svnoverlay/portage/||g" -i /svnupdaters/${overlayname}/old -sed -e "s|^/svnupdaters/${overlayname}/svnoverlay/portage/||g" -i /svnupdaters/${overlayname}/old-dirs -cat /svnupdaters/${overlayname}/old | sort | uniq > /svnupdaters/${overlayname}/old-fixed -cat /svnupdaters/${overlayname}/old-dirs | sort | uniq > /svnupdaters/${overlayname}/old-fixed-dirs -sed -e "s|^/svnupdaters/${overlayname}/portage-new/||g" -i /svnupdaters/${overlayname}/new -sed -e "s|^/svnupdaters/${overlayname}/portage-new/||g" -i /svnupdaters/${overlayname}/new-dirs -cat /svnupdaters/${overlayname}/new | sort | uniq > /svnupdaters/${overlayname}/new-fixed -cat /svnupdaters/${overlayname}/new-dirs | sort | uniq > /svnupdaters/${overlayname}/new-fixed-dirs - -diff -au /svnupdaters/${overlayname}/old-fixed /svnupdaters/${overlayname}/new-fixed > /svnupdaters/${overlayname}/diff -diff -au /svnupdaters/${overlayname}/old-fixed-dirs /svnupdaters/${overlayname}/new-fixed-dirs > /svnupdaters/${overlayname}/diff-dirs - -sed -e "s|^---.*||" -i /svnupdaters/${overlayname}/diff -sed -e "s|^+++.*||" -i /svnupdaters/${overlayname}/diff -sed -e "s|^---.*||" -i /svnupdaters/${overlayname}/diff-dirs -sed -e "s|^+++.*||" -i /svnupdaters/${overlayname}/diff-dirs - -grep -i "^-" /svnupdaters/${overlayname}/diff > /svnupdaters/${overlayname}/pkgdel -grep -i "^+" /svnupdaters/${overlayname}/diff > /svnupdaters/${overlayname}/pkgadd -grep -i "^-" /svnupdaters/${overlayname}/diff-dirs > /svnupdaters/${overlayname}/pkgdel-dirs -grep -i "^+" /svnupdaters/${overlayname}/diff-dirs > /svnupdaters/${overlayname}/pkgadd-dirs - -sed -e "s|^-||g" -i /svnupdaters/${overlayname}/pkgdel -sed -e '/^$/d' -i /svnupdaters/${overlayname}/pkgdel -sed -e "s|^+||g" -i /svnupdaters/${overlayname}/pkgadd -sed -e '/^$/d' -i /svnupdaters/${overlayname}/pkgadd -sed -e "s|^-||g" -i /svnupdaters/${overlayname}/pkgdel-dirs -sed -e '/^$/d' -i /svnupdaters/${overlayname}/pkgdel-dirs -sed -e "s|^+||g" -i /svnupdaters/${overlayname}/pkgadd-dirs -sed -e '/^$/d' -i /svnupdaters/${overlayname}/pkgadd-dirs - -cp -Rf /svnupdaters/${overlayname}/portage-new/* /svnupdaters/${overlayname}/svnoverlay/portage/ - -cd /svnupdaters/${overlayname}/svnoverlay/portage/ - -while read line ; do - svn del ${line} -done < /svnupdaters/${overlayname}/pkgdel - -while read line ; do - svn del ${line} -done < /svnupdaters/${overlayname}/pkgdel-dirs - -while read line ; do - svn add ${line} -done < /svnupdaters/${overlayname}/pkgadd-dirs - -while read line ; do - svn add ${line} -done < /svnupdaters/${overlayname}/pkgadd - -svn commit -m 'Automatic SVN update of portage/ branch.' - -rm -f /svnupdaters/${overlayname}/old -rm -f /svnupdaters/${overlayname}/old-fixed -rm -f /svnupdaters/${overlayname}/new -rm -f /svnupdaters/${overlayname}/new-fixed -rm -f /svnupdaters/${overlayname}/diff -rm -f /svnupdaters/${overlayname}/pkgdel -rm -f /svnupdaters/${overlayname}/pkgadd -rm -f /svnupdaters/${overlayname}/old-dirs -rm -f /svnupdaters/${overlayname}/old-fixed-dirs -rm -f /svnupdaters/${overlayname}/new-dirs -rm -f /svnupdaters/${overlayname}/new-fixed-dirs -rm -f /svnupdaters/${overlayname}/diff-dirs -rm -f /svnupdaters/${overlayname}/pkgdel-dirs -rm -f /svnupdaters/${overlayname}/pkgadd-dirs -rm -Rf /svnupdaters/${overlayname}/portage-new/* - -echo "Run completed ..." diff --git a/versioncp/update_versions.php b/versioncp/update_versions.php deleted file mode 100644 index 10feedf..0000000 --- a/versioncp/update_versions.php +++ /dev/null @@ -1,494 +0,0 @@ - \ No newline at end of file diff --git a/versioncp/upstscripts/berlios b/versioncp/upstscripts/berlios deleted file mode 100755 index 8ed386b..0000000 --- a/versioncp/upstscripts/berlios +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -# Strip cat, we only need the pkg name -berpkg="`echo ${1} | sed -e "s|^.*/||g"`" - -# Take care of outputting the version number -pwd="`pwd`" -if ! test -d "${pwd}/${berpkg}-tmp" ; then - mkdir "${pwd}/${berpkg}-tmp" -fi -cd "${pwd}/${berpkg}-tmp" -wget --quiet --tries=1 --timeout=3 "http://developer.berlios.de/projects/${berpkg}/" -O indexfile -projnum=`grep -i 'project/filelist.php?group_id' indexfile | sed -e "s|^.*.*||g"` -wget --quiet --tries=1 --timeout=3 "http://developer.berlios.de/export/rss20_bsnewreleases.php?group_id=${projnum}" -O rssfeed -grep -i "${berpkg} " rssfeed | head -n 1 | sed -e "s|^.*<title>${berpkg} ||gI" | sed -e "s|.*||g" | sed -e "s|^[A-Za-z _-]*||g" | sed -e "s|-[cCe-oE-OqQs-zS-Z]\{1\}.*||g" -rm -Rf "${pwd}/${berpkg}-tmp" diff --git a/versioncp/upstscripts/ezcomponents b/versioncp/upstscripts/ezcomponents deleted file mode 100755 index 7f888fe..0000000 --- a/versioncp/upstscripts/ezcomponents +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -# Strip cat, we only need the pkg name -ezcpkg="`echo ${1} | sed -e "s|^.*/||g"`" - -# Take care of some strange package naming -ezcpkg="${ezcpkg/ezc-/}" - -# Take care of outputting the version number -pwd="`pwd`" -if ! test -d "${pwd}/${ezcpkg}-tmp" ; then - mkdir "${pwd}/${ezcpkg}-tmp" -fi -cd "${pwd}/${ezcpkg}-tmp" -wget --quiet --tries=1 --timeout=3 "http://ez.no/doc/components/overview/latest" -grep -i ">${ezcpkg}" latest | sed -e "s|
  • ${ezcpkg} (||g" | sed -e "s|)
    • .*||g" -rm -Rf "${pwd}/${ezcpkg}-tmp" diff --git a/versioncp/upstscripts/freshmeat b/versioncp/upstscripts/freshmeat deleted file mode 100755 index b7f6a0c..0000000 --- a/versioncp/upstscripts/freshmeat +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -# Strip cat, we only need the pkg name -fmpkg="`echo ${1} | sed -e "s|^.*/||g"`" - -# Take care of outputting the version number -pwd="`pwd`" -if ! test -d "${pwd}/${fmpkg}-tmp" ; then - mkdir "${pwd}/${fmpkg}-tmp" -fi -cd "${pwd}/${fmpkg}-tmp" -wget --quiet --tries=1 --timeout=3 "http://freshmeat.net/projects-xml/${fmpkg}/${fmpkg}.xml" -grep -i 'latest_release_version' ${fmpkg}.xml | sed -e "s|^.*||g" | sed -e "s|.*||g" | sed -e "s|^[A-Za-z _-]*||g" | sed -e "s|-[cCe-oE-OqQs-zS-Z]\{1\}.*||g" -rm -Rf "${pwd}/${fmpkg}-tmp" diff --git a/versioncp/upstscripts/php-pear b/versioncp/upstscripts/php-pear deleted file mode 100755 index 6152e10..0000000 --- a/versioncp/upstscripts/php-pear +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -# Strip cat, we only need the pkg name -pearpkg="`echo ${1} | sed -e "s|^.*/||g"`" - -# Take care of some strange package naming -pearpkg="${pearpkg/PEAR-/}" - -# Take care of outputting the version number -pwd="`pwd`" -if ! test -d "${pwd}/${pearpkg}-tmp" ; then - mkdir "${pwd}/${pearpkg}-tmp" -fi -cd "${pwd}/${pearpkg}-tmp" -wget --quiet --tries=1 --timeout=3 "http://pear.php.net/feeds/pkg_${pearpkg}.rss" -grep -i title pkg_${pearpkg}.rss | sed -e "s|||g" | sed -e "s|||g" | head -n 2 | tail -n 1 | awk '{print $NF}' -rm -Rf "${pwd}/${pearpkg}-tmp" diff --git a/versioncp/upstscripts/php-pecl b/versioncp/upstscripts/php-pecl deleted file mode 100755 index b0c1c0a..0000000 --- a/versioncp/upstscripts/php-pecl +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -# Strip cat, we only need the pkg name -peclpkg="`echo ${1} | sed -e "s|^.*/||g"`" - -# Take care of some strange package naming -peclpkg="${peclpkg/pecl-http/pecl_http}" -peclpkg="${peclpkg/pecl-/}" -peclpkg="${peclpkg/pdo-/pdo_}" - -# Take care of outputting the version number -pwd="`pwd`" -if ! test -d "${pwd}/${peclpkg}-tmp" ; then - mkdir "${pwd}/${peclpkg}-tmp" -fi -cd "${pwd}/${peclpkg}-tmp" -wget --quiet --tries=1 --timeout=3 "http://pecl.php.net/feeds/pkg_${peclpkg}.rss" -grep -i title pkg_${peclpkg}.rss | sed -e "s|||g" | sed -e "s|||g" | head -n 2 | tail -n 1 | awk '{print $NF}' -rm -Rf "${pwd}/${peclpkg}-tmp" diff --git a/versioncp/upstscripts/sourceforge b/versioncp/upstscripts/sourceforge deleted file mode 100755 index 2145464..0000000 --- a/versioncp/upstscripts/sourceforge +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -# Strip cat, we only need the pkg name -sfpkg="`echo ${1} | sed -e "s|^.*/||g"`" - -# Take care of outputting the version number -pwd="`pwd`" -if ! test -d "${pwd}/${sfpkg}-tmp" ; then - mkdir "${pwd}/${sfpkg}-tmp" -fi -cd "${pwd}/${sfpkg}-tmp" -wget --quiet --tries=1 --timeout=3 "http://sourceforge.net/projects/${sfpkg}/" -O indexfile -projnum=`grep -i 'project/showfiles.php?group_id.*Files' indexfile | sed -e "s|^
  • .*||g"` -wget --quiet --tries=1 --timeout=3 "http://sourceforge.net/export/rss2_projfiles.php?group_id=${projnum}" -O rssfeed -grep -i "${sfpkg} " rssfeed | head -n 1 | sed -e "s|^.*<title>${sfpkg} ||gI" | sed -e "s| released .*.*||g" | sed -e "s|^[A-Za-z _-]*||g" | sed -e "s|-[cCe-oE-OqQs-zS-Z]\{1\}.*||g" -rm -Rf "${pwd}/${sfpkg}-tmp" -- cgit v1.2.3-65-gdbad