Просмотр исходного кода

upgrading package: drupal 4.7.6 -> 5.1

Thomas Lotterer 18 лет назад
Родитель
Сommit
da128abb11
4 измененных файлов с 623 добавлено и 580 удалено
  1. 0 1
      drupal/drupal-apache.conf
  2. 15 25
      drupal/drupal-setup.sh
  3. 12 0
      drupal/drupal.patch
  4. 596 554
      drupal/drupal.spec

+ 0 - 1
drupal/drupal-apache.conf

@@ -5,7 +5,6 @@
 ServerRoot             @l_prefix@
 ServerAdmin            root@@l_hostname@.@l_domainname@
 ServerName             @l_hostname@.@l_domainname@
-ServerTokens           Prod
 User                   @l_rusr@
 Group                  @l_rgrp@
 Listen                 127.0.0.1:80

+ 15 - 25
drupal/drupal-setup.sh

@@ -12,34 +12,24 @@ password=`grep "^password" @l_prefix@/etc/mysql/my.pwd |\
 #   create the MySQL database for Drupal
 @l_prefix@/bin/mysqladmin --user=$username --password=$password create drupal
 @l_prefix@/bin/mysql --user=$username --password=$password mysql <<EOF
-GRANT ALL ON drupal.* TO drupal@localhost IDENTIFIED BY 'drupal';
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES \
+      ON drupal.* \
+      TO drupal@localhost IDENTIFIED BY 'drupal';
 FLUSH PRIVILEGES;
 EOF
 
-#   create the default Drupal database schema
-@l_prefix@/bin/mysql --user=$username --password=$password drupal \
-    <@l_prefix@/share/drupal/database/database.mysql
+#   configure settings.php accordingly
+@l_prefix@/lib/openpkg/shtool subst --quiet \
+    -e 's|^\( *\$db_url\) *=.*$|\1 = "mysql://drupal:drupal@localhost/drupal";|' \
+    @l_prefix@/share/drupal/sites/default/settings.php
 
-#   import Drupal modules extra database schema (requires manual sorting)
-for m in  \
-    bookmarks/bookmarks.mysql \
-    daily/daily.mysql \
-    event/event.mysql \
-    freelinking/freelinking.mysql \
-    nodewords/nodewords.mysql \
-    shoutbox/shoutbox.mysql \
-    subscriptions/subscriptions.mysql \
-    taxonomy_block/taxonomy_block.mysql \
-    trackback/trackback.mysql \
-    wordfilter/wordfilter.mysql \
-; do
-    @l_prefix@/bin/mysql --user=$username --password=$password drupal \
-                         <@l_prefix@/share/drupal/modules/extra/$m \
-    || echo "$0:ERROR: setup $m failed"
-done
+#   check php script memory limit
+d=`sed <@l_prefix@/etc/apache/apache-php.ini -e 's/ *;.*$//' | awk -F= '/^memory_limit/ { print $2 }' | sed -e 's/M//'`
+[ $d -lt 16 ] && echo "please consider increasing memory_limit to 16M or more in @l_prefix@/etc/apache/apache-php.ini"
 
-#  configure /etc/drupal/default/settings.php accordingly
-@l_prefix@/lib/openpkg/shtool subst \
-    -e '/^\$db_url =/s;mysql://username:password@localhost/databasename;mysql://drupal:drupal@localhost/drupal;' \
-    @l_prefix@/etc/drupal/sites/default/settings.php
+#   further instructions for the user
+d=`awk <@l_prefix@/etc/drupal/drupal-apache.conf '/^Listen/ { print $2 }'`
+echo "configure IP address in \"@l_prefix@/etc/drupal/drupal-apache.conf\""
+echo "run \"@l_prefix@/bin/openpkg rc drupal start\""
+echo "visit http://$d/install.php"
 

+ 12 - 0
drupal/drupal.patch

@@ -0,0 +1,12 @@
+Index: modules/system/system.install
+--- modules/system/system.install.orig	2007-01-11 00:22:34 +0100
++++ modules/system/system.install	2007-07-05 18:35:56 +0200
+@@ -1108,6 +1108,7 @@
+   db_query("INSERT INTO {menu} (mid, pid, path, title, description, weight, type) VALUES (2, 0, '', 'Primary links', '', 0, 115)");
+   db_query("INSERT INTO {variable} VALUES ('menu_primary_menu', 'i:2;')");
+   db_query("INSERT INTO {variable} VALUES ('menu_secondary_menu', 'i:2;')");
++  db_query("INSERT INTO {variable} VALUES ('site_footer', 's:56:\"powered by <a href=\\\"http://www.openpkg.org/\\\">OpenPKG</a>\";')");
+ }
+ 
+ // Updates for core
+

Разница между файлами не показана из-за своего большого размера
+ 596 - 554
drupal/drupal.spec