OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 25-Jun-2007 20:20:03
Branch: HEAD Handle: 2007062519200200
Modified files:
openpkg-src/joomla joomla-apache.conf joomla-setup.sh joomla.spec
Log:
improve installation
Summary:
Revision Changes Path
1.2 +11 -5 openpkg-src/joomla/joomla-apache.conf
1.2 +2 -2 openpkg-src/joomla/joomla-setup.sh
1.2 +13 -1 openpkg-src/joomla/joomla.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/joomla/joomla-apache.conf
============================================================================
$ cvs diff -u -r1.1 -r1.2 joomla-apache.conf
--- openpkg-src/joomla/joomla-apache.conf 25 Jun 2007 17:10:28 -0000
1.1
+++ openpkg-src/joomla/joomla-apache.conf 25 Jun 2007 18:20:02 -0000
1.2
@@ -87,18 +87,24 @@
php_admin_value max_input_time 60
php_admin_value memory_limit 8M
php_admin_value post_max_size 8M
-php_admin_value include_path .:@l_prefix@/lib/joomla
+php_admin_value include_path .:@l_prefix@/lib/joomla/runtime
# configure Joomla!
RewriteEngine on
RewriteRule ^/$ /joomla/ [R,L]
-Alias /joomla @l_prefix@/lib/joomla
-DocumentRoot @l_prefix@/lib/joomla
+Alias /joomla @l_prefix@/lib/joomla/runtime
+DocumentRoot @l_prefix@/lib/joomla/runtime
DirectoryIndex index.php
-<Directory "@l_prefix@/lib/joomla">
- Options Indexes ExecCGI
+<Directory "@l_prefix@/lib/joomla/runtime">
+ Options Indexes ExecCGI FollowSymLinks
AllowOverride None
Order allow,deny
Allow from all
+ RewriteEngine On
+ RewriteCond %{REQUEST_URI} ^(/component/option,com) [NC,OR]
+ RewriteCond %{REQUEST_URI} (/|\.htm|\.php|\.html|/[^.]*)$ [NC]
+ RewriteCond %{REQUEST_FILENAME} !-f
+ RewriteCond %{REQUEST_FILENAME} !-d
+ RewriteRule (.*) index.php
</Directory>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/joomla/joomla-setup.sh
============================================================================
$ cvs diff -u -r1.1 -r1.2 joomla-setup.sh
--- openpkg-src/joomla/joomla-setup.sh 25 Jun 2007 17:10:28 -0000
1.1
+++ openpkg-src/joomla/joomla-setup.sh 25 Jun 2007 18:20:02 -0000
1.2
@@ -26,8 +26,8 @@
# activate installer
rm -f @l_prefix@/lib/joomla/runtime/configuration.php
- rm -f @l_prefix@/lib/joomla/runtime/installation >/dev/null 2>&1 ||
true
- ln -s ../installation @l_prefix@/lib/joomla/runtime/installation
+ rm -rf @l_prefix@/lib/joomla/runtime/installation >/dev/null 2>&1 ||
true
+ cp -rp @l_prefix@/lib/joomla/installation
@l_prefix@/lib/joomla/runtime/
;;
cleanup )
# deactivate installer
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/joomla/joomla.spec
============================================================================
$ cvs diff -u -r1.1 -r1.2 joomla.spec
--- openpkg-src/joomla/joomla.spec 25 Jun 2007 17:10:28 -0000 1.1
+++ openpkg-src/joomla/joomla.spec 25 Jun 2007 18:20:02 -0000 1.2
@@ -58,6 +58,7 @@
PreReq: apache-php::with_xml = yes
PreReq: apache-php::with_gd = yes
PreReq: apache-php::with_mm = yes
+PreReq: MTA
AutoReq: no
AutoReqProv: no
@@ -92,11 +93,17 @@
mv "libraries/simplepie/compatibility_test/COMPATIBILITY README.txt" \
"libraries/simplepie/compatibility_test/COMPATIBILITY-README.txt"
+ # adjust default configuration
+ %{l_shtool} subst \
+ -e 's;/usr/sbin/sendmail;%{l_prefix}/sbin/sendmail;' \
+ installation/template/tmpl/configuration.html
+
# install main program files
find . -name ".#*" -print | xargs rm -f
find . -name "*.orig" -print | xargs rm -f
cp -rp * $RPM_BUILD_ROOT%{l_prefix}/lib/joomla/runtime/
rm -f
$RPM_BUILD_ROOT%{l_prefix}/lib/joomla/runtime/configuration.php-dist
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/joomla/runtime/htaccess.txt
# post-adjustment: move risky installation area out of runtime area
# (will be dynmically linked in again later)
@@ -148,8 +155,13 @@
echo " \$ $RPM_INSTALL_PREFIX/sbin/joomla-setup install"
echo "3. start the Joomla! Apache webserver:"
echo " \$ $RPM_INSTALL_PREFIX/bin/openpkg rc joomla start"
- echo "4. setup Joomla! through the Web installer:"
+ echo "4. setup Joomla! through the Web installer..."
echo " http://localhost:8080/joomla/";
+ echo " ..and on page \"4: Database\" use:"
+ echo " - Host Name: \"localhost\""
+ echo " - User Name: \"joomla\""
+ echo " - Password: \"joomla\""
+ echo " - Database Name: \"joomla\""
echo "5. fixup installation afterwards:"
echo " \$ $RPM_INSTALL_PREFIX/sbin/joomla-setup cleanup"
echo "6. access Joomla! via:"
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
