[Pkg-tcltk-commits] r1012 - in openacs/trunk/debian: . po
geox-guest at alioth.debian.org
geox-guest at alioth.debian.org
Tue Dec 29 15:54:17 UTC 2009
Author: geox-guest
Date: 2009-12-29 15:54:17 +0000 (Tue, 29 Dec 2009)
New Revision: 1012
Modified:
openacs/trunk/debian/README.Debian
openacs/trunk/debian/changelog
openacs/trunk/debian/config
openacs/trunk/debian/po/templates.pot
openacs/trunk/debian/templates
Log:
Fixed some template bugs
Modified: openacs/trunk/debian/README.Debian
===================================================================
--- openacs/trunk/debian/README.Debian 2009-12-29 15:53:52 UTC (rev 1011)
+++ openacs/trunk/debian/README.Debian 2009-12-29 15:54:17 UTC (rev 1012)
@@ -1,10 +1,22 @@
OpenACS for Debian
------------------
-The full documentation is at:
+- Grant OpenACS user access on PostgreSQL
+-----------------------------------------
- * http://openacs.org/doc/current/
- * http://openacs.org/xowiki/
+To grant access manually, you have to edit the
+/etc/postgresql/8.X/main/pg_hba.conf file, adding a line
+with the database, user and method to connect (for example, method
+can be 'trust' if no password is used, or 'md5' otherwise):
+# TYPE DATABASE USER CIDR-ADDRESS METHOD
+local openacs user trust
- -- Hector Romojaro <hromojaro at dia.uned.es> Fri, 27 Jun 2008 19:56:58 +0200
+- Full OpenACS documentation:
+-----------------------------
+
+* http://openacs.org/doc/current/
+* http://openacs.org/xowiki/
+
+
+ -- Hector Romojaro <hromojaro at dia.uned.es> Tue, 29 Dec 2009 12:16:39 +0100
Modified: openacs/trunk/debian/changelog
===================================================================
--- openacs/trunk/debian/changelog 2009-12-29 15:53:52 UTC (rev 1011)
+++ openacs/trunk/debian/changelog 2009-12-29 15:54:17 UTC (rev 1012)
@@ -3,8 +3,14 @@
* Changed aolserver4-daemon dependency to >= 4.5.1-11
* Added watch file.
* Added get-orig-source on debian/rules.
+ * Template bugs
+ - Fixed typo.
+ - Fixed wrong text.
+ - Use PostgreSQL instead of postgresql.
+ - Removed dotlrn/notconfigured and dotlrn/pg_grant_access_manual*
+ and added manual database access instructions to README.Debian.
- -- Hector Romojaro <hromojaro at dia.uned.es> Tue, 22 Dec 2009 00:22:15 +0100
+ -- Hector Romojaro <hromojaro at dia.uned.es> Tue, 29 Dec 2009 16:23:42 +0100
openacs (5.5.1-1) unstable; urgency=low
Modified: openacs/trunk/debian/config
===================================================================
--- openacs/trunk/debian/config 2009-12-29 15:53:52 UTC (rev 1011)
+++ openacs/trunk/debian/config 2009-12-29 15:54:17 UTC (rev 1012)
@@ -106,14 +106,9 @@
if [ A"$RET" != A"$CONFIRM" ]; then
STATE=9
else
- # Check if host is localhost and password is not null,
- # to change the postgresql access permissions properly.
+ # Check if host is localhost to change
+ # the postgresql access permissions properly.
if [ "$pg_host" = "localhost" ]; then
- if [ A"$RET" != "A" ]; then
- pg_pass_blank="false"
- else
- pg_pass_blank="true"
- fi
STATE=10
else
STATE=11
@@ -133,14 +128,6 @@
10) db_input critical openacs/pg_grant_access || true
db_go
- db_get openacs/pg_grant_access || true
- if [ "$RET" = false ]; then
- if [ "$pg_pass_blank" = "true" ]; then
- db_input critical openacs/pg_grant_access_manual_blank_pass || true
- else
- db_input critical openacs/pg_grant_access_manual || true
- fi
- fi
STATE=11
;;
@@ -152,8 +139,3 @@
esac
done
-if [ "$STATE" = 0 ]; then
- db_input critical openacs/notconfigured || true
- db_go
- exit 1
-fi
Modified: openacs/trunk/debian/po/templates.pot
===================================================================
--- openacs/trunk/debian/po/templates.pot 2009-12-29 15:53:52 UTC (rev 1011)
+++ openacs/trunk/debian/po/templates.pot 2009-12-29 15:54:17 UTC (rev 1012)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: openacs @packages.debian.org\n"
-"POT-Creation-Date: 2009-10-16 01:24+0200\n"
+"POT-Creation-Date: 2009-12-29 16:28+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -108,7 +108,7 @@
#. Type: password
#. Description
#: ../templates:8001
-msgid "Database user password confirmation:"
+msgid "Database owner password confirmation:"
msgstr ""
#. Type: password
@@ -120,40 +120,26 @@
#. Type: note
#. Description
#: ../templates:9001
-msgid "Warning - OpenACS is not configured"
+msgid "Warning - OpenACS database tables not created"
msgstr ""
#. Type: note
#. Description
#: ../templates:9001
msgid ""
-"Please note that you have not completed the OpenACS configuration. For "
-"completing it, please use \"dpkg-reconfigure openacs\" later."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:10001
-msgid "Warning - OpenACS database tables not created"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:10001
-msgid ""
"The OpenACS install script will create the database, but the tables are to "
"be created with a script. Please launch it right after the install:"
msgstr ""
#. Type: note
#. Description
-#: ../templates:10001
+#: ../templates:9001
msgid "http://127.0.0.1:8000/"
msgstr ""
#. Type: note
#. Description
-#: ../templates:10001
+#: ../templates:9001
msgid ""
"After configure, you can change IP and port to listen on /etc/aolserver4/"
"conf.d/openacs.sh."
@@ -161,49 +147,14 @@
#. Type: boolean
#. Description
-#: ../templates:11001
-msgid "Do you want debconf to grant openacs user access on postgresql?"
+#: ../templates:10001
+msgid "Do you want debconf to grant OpenACS user access on PostgreSQL?"
msgstr ""
#. Type: boolean
#. Description
-#: ../templates:11001
+#: ../templates:10001
msgid ""
-"Debconf can modify the postgresql configuration to allow access to the "
-"openacs user by modifying the pg_hba.conf file."
+"Debconf can modify the PostgreSQL configuration to allow access to the "
+"OpenACS user by modifying the pg_hba.conf file."
msgstr ""
-
-#. Type: note
-#. Description
-#. Type: note
-#. Description
-#: ../templates:12001 ../templates:13001
-msgid "Grant openacs user access on postgresql"
-msgstr ""
-
-#. Type: note
-#. Description
-#. Type: note
-#. Description
-#: ../templates:12001 ../templates:13001
-msgid ""
-"To grant access manually, you have to edit the /etc/postgresql/8.X/main/"
-"pg_hba.conf file, adding a line like this (replace \"user\" for your openacs "
-"user):"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:12001
-msgid ""
-" # TYPE DATABASE USER CIDR-ADDRESS METHOD\n"
-" local openacs user trust."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:13001
-msgid ""
-" # TYPE DATABASE USER CIDR-ADDRESS METHOD\n"
-" local openacs user md5."
-msgstr ""
Modified: openacs/trunk/debian/templates
===================================================================
--- openacs/trunk/debian/templates 2009-12-29 15:53:52 UTC (rev 1011)
+++ openacs/trunk/debian/templates 2009-12-29 15:54:17 UTC (rev 1012)
@@ -41,15 +41,9 @@
Template: openacs/dbu_confirm
Type: password
-_Description: Database user password confirmation:
+_Description: Database owner password confirmation:
Please confirm the password of the OpenACS database owner.
-Template: openacs/notconfigured
-Type: note
-_Description: Warning - OpenACS is not configured
- Please note that you have not completed the OpenACS configuration. For
- completing it, please use "dpkg-reconfigure openacs" later.
-
Template: openacs/create_tables
Type: note
_Description: Warning - OpenACS database tables not created
@@ -64,27 +58,6 @@
Template: openacs/pg_grant_access
Type: boolean
-_Description: Do you want debconf to grant openacs user access on postgresql?
- Debconf can modify the postgresql configuration to allow access
- to the openacs user by modifying the pg_hba.conf file.
-
-Template: openacs/pg_grant_access_manual_blank_pass
-Type: note
-_Description: Grant openacs user access on postgresql
- To grant access manually, you have to edit the
- /etc/postgresql/8.X/main/pg_hba.conf file, adding a line
- like this (replace "user" for your openacs user):
- .
- # TYPE DATABASE USER CIDR-ADDRESS METHOD
- local openacs user trust.
-
-Template: openacs/pg_grant_access_manual
-Type: note
-_Description: Grant openacs user access on postgresql
- To grant access manually, you have to edit the
- /etc/postgresql/8.X/main/pg_hba.conf file, adding a line
- like this (replace "user" for your openacs user):
- .
- # TYPE DATABASE USER CIDR-ADDRESS METHOD
- local openacs user md5.
-
+_Description: Do you want debconf to grant OpenACS user access on PostgreSQL?
+ Debconf can modify the PostgreSQL configuration to allow access
+ to the OpenACS user by modifying the pg_hba.conf file.
More information about the Pkg-tcltk-commits
mailing list