From 09c5edeaee6c377f75faf38190e38c248db6c74f Mon Sep 17 00:00:00 2001 From: wangchunsheng Date: Wed, 28 Nov 2012 05:28:21 +0000 Subject: [PATCH] * upgrade the package for new xampp version. --- build/linux/buildxmapp.sh | 72 +++++++++----------------------------- build/linux/httpd.conf | 72 ++++++++++++++++++++++++++++++++++++++ build/linux/phpmyadmin.php | 8 +++++ build/linux/zentao.conf | 11 +++--- 4 files changed, 101 insertions(+), 62 deletions(-) create mode 100644 build/linux/httpd.conf create mode 100644 build/linux/phpmyadmin.php diff --git a/build/linux/buildxmapp.sh b/build/linux/buildxmapp.sh index 68bee2b85f..5d40d33a75 100755 --- a/build/linux/buildxmapp.sh +++ b/build/linux/buildxmapp.sh @@ -7,9 +7,9 @@ rm -fr error rm -fr icons rm -fr logs/* rm -fr htdocs/* -rm -fr phpmyadmin rm -fr cgi-bin rm -fr libexec +rm -fr php rm -fr tmp/* chmod -R 777 tmp @@ -36,51 +36,7 @@ rm -fr etc/extra/httpd-multilang-errordoc.conf rm -fr etc/lampp/startssl # process httpd conf -grep -v '#' etc/httpd.conf | \ -grep -v '^$' | \ -grep -v 'mod_actions.so' | \ -grep -v 'authn_dbm' | \ -grep -v 'authn_anon' | \ -grep -v 'authn_dbd' | \ -grep -v 'authn_default' | \ -grep -v 'authz_groupfile' | \ -grep -v 'authz_dbm' | \ -grep -v 'authz_owner' | \ -grep -v 'authnz_ldap' | \ -grep -v 'authz_default' | \ -grep -v 'auth_digest_module' | \ -grep -v 'cache.so' | \ -grep -v 'mod_bucketeer' | \ -grep -v 'mod_dumpio' | \ -grep -v 'mod_echo' | \ -grep -v 'mod_case*' | \ -grep -v 'mod_ext_filter*' | \ -grep -v 'mod_include' | \ -grep -v 'mod_filter' | \ -grep -v 'mod_charset_lite' | \ -grep -v 'mod_ldap' | \ -grep -v 'mod_log_config' | \ -grep -v 'mod_logio' | \ -grep -v 'mod_cern_meta' | \ -grep -v 'mod_headers' | \ -grep -v 'mod_ident' | \ -grep -v 'mod_usertrack' | \ -grep -v 'mod_unique_id' | \ -grep -v 'mod_proxy*' | \ -grep -v 'mod_dav*' | \ -grep -v 'mod_status' | \ -grep -v 'mod_asis' | \ -grep -v 'mod_info' | \ -grep -v 'mod_suexec' | \ -grep -v 'mod_cgi*' | \ -grep -v 'mod_negotiation' | \ -grep -v 'mod_imagemap' | \ -grep -v 'mod_speling' | \ -grep -v 'mod_userdir' | \ -grep -v 'mod_apreq2' | \ -grep -v 'mod_ssl' | \ -grep -v 'multilang-errordoc' > etc/httpd.conf.lite -mv etc/httpd.conf.lite etc/httpd.conf +cp ../httpd.conf etc/httpd.conf # process my.cnf grep -v '^innodb' etc/my.cnf| \ @@ -90,7 +46,7 @@ grep -v '^$' > etc/my.cnf.new mv etc/my.cnf.new etc/my.cnf # process php.ini -echo 'zend_extension = /opt/lampp/lib/php/extensions/no-debug-non-zts-20090626/ioncube_loader_lin_5.3.so' > etc/php.ini.new +echo 'zend_extension = /opt/lampp/lib/php/extensions/no-debug-non-zts-20100525/ioncube_loader_lin_5.4.so' > etc/php.ini.new grep -v '^;' etc/php.ini |\ grep -v '^$' |\ grep -v 'sqlite.so' |\ @@ -191,7 +147,6 @@ rm -fr var/proftpd* rm -fr var/mysql/cdcol rm -fr var/mysql/*.err rm -fr var/mysql/ib* -rm -fr var/mysql/phpmyadmin rm -fr var/mysql/test chmod -R 777 var/mysql @@ -219,7 +174,6 @@ rm -fr modules/mod_disk_cache.so rm -fr modules/mod_dumpio.so rm -fr modules/mod_ext_filter.so rm -fr modules/mod_file_cache.so -rm -fr modules/mod_filter.so rm -fr modules/mod_headers.so rm -fr modules/mod_ident.so rm -fr modules/mod_imagemap.so @@ -254,15 +208,21 @@ cp ../start88 . cp ../stop . cp ../../windows/xampp/index.php htdocs/ -# copy sqlbuddy. -mkdir admin -unzip $1/sqlbuddy.zip -mv sqlbuddy admin/ - # make the auth file mkdir auth touch auth/users -echo 'use htpasswd users username password to add a new user.' > auth/readme +echo 'use "../bin/htpasswd -b users username password" to add a new user.' > auth/readme + +# process the phpmyadmin +7z x $1/phpmyadmin.7z +mkdir admin +mv phpMyAdmin-3.5.4-all-languages admin/phpmyadmin +mv admin/phpmyadmin/locale admin/phpmyadmin/locale.bak +mkdir admin/phpmyadmin/locale +mv admin/phpmyadmin/locale.bak/en_GB admin/phpmyadmin/locale +mv admin/phpmyadmin/locale.bak/zh_* admin/phpmyadmin/locale +rm -fr admin/phpmyadmin/locale.bak +cp ../phpmyadmin.php admin/phpmyadmin/config.inc.php # copy the ioncube loader. -cp ../ioncube_loader_lin_5.3.so lib/php/extensions/no-debug-non-zts-20090626/ +cp ../ioncube_loader_lin_5.4.so lib/php/extensions/no-debug-non-zts-20100525/ diff --git a/build/linux/httpd.conf b/build/linux/httpd.conf new file mode 100644 index 0000000000..8f7df44c4c --- /dev/null +++ b/build/linux/httpd.conf @@ -0,0 +1,72 @@ +ServerRoot "/opt/lampp" +Listen 80 +LoadModule authn_file_module modules/mod_authn_file.so +LoadModule access_compat_module modules/mod_access_compat.so +LoadModule alias_module modules/mod_alias.so +LoadModule authn_core_module modules/mod_authn_core.so +LoadModule auth_basic_module modules/mod_auth_basic.so +LoadModule authz_core_module modules/mod_authz_core.so +LoadModule authz_host_module modules/mod_authz_host.so +LoadModule authz_user_module modules/mod_authz_user.so +LoadModule autoindex_module modules/mod_autoindex.so +LoadModule deflate_module modules/mod_deflate.so +LoadModule dir_module modules/mod_dir.so +LoadModule env_module modules/mod_env.so +LoadModule expires_module modules/mod_expires.so +LoadModule filter_module modules/mod_filter.so +LoadModule mime_module modules/mod_mime.so +LoadModule rewrite_module modules/mod_rewrite.so +LoadModule setenvif_module modules/mod_setenvif.so +LoadModule unixd_module modules/mod_unixd.so + +LoadModule php4_module modules/libphp4.so +LoadModule php5_module modules/libphp5.so + + +User nobody +Group nogroup + +ServerAdmin you@example.com +ServerName localhost + + AllowOverride none + Require all denied + +DocumentRoot "/opt/lampp/htdocs" + + Options Indexes FollowSymLinks ExecCGI Includes + AllowOverride All + Require all granted + + + DirectoryIndex index.html index.html.var index.php index.php3 index.php4 + + + Require all denied + +ErrorLog "logs/error_log" +LogLevel warn + + LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined + LogFormat "%h %l %u %t \"%r\" %>s %b" common + + LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio + + CustomLog "logs/access_log" common + + + ScriptAlias /cgi-bin/ "/opt/lampp/cgi-bin/" + + + TypesConfig etc/mime.types + AddType application/x-compress .Z + AddType application/x-gzip .gz .tgz + AddHandler cgi-script .cgi .pl + AddType text/html .shtml + AddOutputFilter INCLUDES .shtml + +EnableMMAP off +EnableSendfile off +Include etc/extra/httpd-autoindex.conf +Include etc/extra/httpd-default.conf +Include etc/extra/httpd-xampp.conf diff --git a/build/linux/phpmyadmin.php b/build/linux/phpmyadmin.php new file mode 100644 index 0000000000..a09d1b6ce1 --- /dev/null +++ b/build/linux/phpmyadmin.php @@ -0,0 +1,8 @@ + Options Indexes FollowSymLinks ExecCGI Includes AllowOverride All + Require all granted # setting for admin -Alias /sqlbuddy "/opt/lampp/admin/sqlbuddy" - - #Order allow,deny - #Allow from 127.0.0.1 - AuthName 'zentao admin' +Alias /phpmyadmin "/opt/lampp/admin/phpmyadmin" + + AuthName 'zentao admin(see /opt/lampp/auth/readme)' AuthType Basic AuthUserFile /opt/lampp/auth/users require valid-user