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:   16-Feb-2008 12:31:34
  Branch: HEAD                             Handle: 2008021611313201

  Modified files:
    openpkg-src/drupal      drupal-apache.conf drupal.spec

  Log:
    align with joomla package

  Summary:
    Revision    Changes     Path
    1.7         +6  -0      openpkg-src/drupal/drupal-apache.conf
    1.108       +4  -4      openpkg-src/drupal/drupal.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/drupal/drupal-apache.conf
  ============================================================================
  $ cvs diff -u -r1.6 -r1.7 drupal-apache.conf
  --- openpkg-src/drupal/drupal-apache.conf     16 Feb 2008 11:26:03 -0000      
1.6
  +++ openpkg-src/drupal/drupal-apache.conf     16 Feb 2008 11:31:32 -0000      
1.7
  @@ -84,8 +84,12 @@
   php_admin_flag    session.cache_limiter none
   php_admin_flag    error_reporting       E_ALL   
   php_admin_value   memory_limit          16M
  +php_admin_value   include_path          .:@l_prefix@/share/drupal
   
   #   configure Drupal
  +RewriteEngine     on
  +RewriteRule       ^/$ /drupal/ [R,L]
  +Alias             /drupal @l_prefix@/share/drupal
   DocumentRoot      @l_prefix@/share/drupal
   DirectoryIndex    index.php
   ErrorDocument     404 /index.php
  @@ -95,5 +99,7 @@
       AllowOverride All
       Order         allow,deny
       Allow         from all
  +    RewriteEngine On
  +    RewriteBase   /drupal
   </Directory>
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/drupal/drupal.spec
  ============================================================================
  $ cvs diff -u -r1.107 -r1.108 drupal.spec
  --- openpkg-src/drupal/drupal.spec    16 Feb 2008 11:26:03 -0000      1.107
  +++ openpkg-src/drupal/drupal.spec    16 Feb 2008 11:31:33 -0000      1.108
  @@ -592,17 +592,15 @@
             echo "   initialize the Drupal database like this:"
             echo "     \$ $RPM_INSTALL_PREFIX/bin/openpkg rc mysql start"
             echo "     \$ $RPM_INSTALL_PREFIX/sbin/drupal-setup"
  -          echo ""
             echo "2. Now Drupal by running"
             echo "     \$ $RPM_INSTALL_PREFIX/bin/openpkg rc drupal start"
             echo "   and connect with a browser to:"
  -          echo "     http://127.0.0.1:8080/install.php";
  +          echo "     http://127.0.0.1:8080/drupal/install.php";
             echo "   Follow the instructions. On the page \"Database 
configuration\""
             echo "   use database name \"drupal\", database username 
\"drupal\" and"
             echo "   database password \"drupal\". Also create an account and 
login."
             echo "   The first account will automatically become the main 
administrator"
             echo "   account with total control over your Drupal site."
  -          echo ""
             echo "3. By default, Drupal is run by the OpenPKG cron jobs only 
every"
             echo "   15 minutes. To run Drupal every 5 minutes for more 
granular"
             echo "   data gathering, set this variable:"
  @@ -611,13 +609,15 @@
             echo "   and insert a new cronjob for user %{l_rusr}"
             echo "     # system crontab:"
             echo "     */5 * * * * %{l_rusr} 
$RPM_INSTALL_PREFIX/sbin/drupal-cron"
  -          echo ""
             echo "4. By default, Drupal runs its own Apache server on IPv4 
address"
             echo "   127.0.0.1, TCP port 80. Please change this by editing the"
             echo "   \"Listen 127.0.0.1:80\" directive in"
             echo "   $RPM_INSTALL_PREFIX/etc/drupal/drupal-apache.conf"
             echo "   Also do not forget to adjust the \$base_url variable in:"
             echo "   $RPM_INSTALL_PREFIX/etc/drupal/default/settings.php"
  +          echo "5. access Drupal via:"
  +          echo "   http://localhost:8080/drupal/      (website view)"
  +          echo "   http://localhost:8080/drupal/admin (website admin)"
           ) | %{l_rpmtool} msg -b -t notice
       fi
       if [ $1 -eq 2 ]; then
  @@ .
______________________________________________________________________
OpenPKG                                             http://openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to