Merge branch 'upstream' into debian/sid

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/sisu/v0/cgi_pgsql.rb b/lib/sisu/v0/cgi_pgsql.rb
index b5012fdd..9a6486ff 100644
--- a/lib/sisu/v0/cgi_pgsql.rb
+++ b/lib/sisu/v0/cgi_pgsql.rb
@@ -111,8 +111,8 @@ module  SiSU_CGI_pgsql
         }
         tell=SiSU_Screen::Ansi.new(@opt.cmd,a)
         tell.warn
-        a="postgresql db used for present directory: #{@db.db_psql}"
-        b="\n\t(to create and populate postgresql database see 'man sisu' and in particular the -D flag)\n\t[the database to be used for this directory (#{@db.db_psql}) will have to be created manually if it does not exist,\n\tsee 'sisu --help sql'\n\tif you have permission to create databases:\n\t'sisu -d --createdb'\n\tor using postgresql tools directly:\n\t'createdb #{@db.db_psql}'\n\tfor a list of existing databases try 'psql --list']"
+        a="postgresql db used for present directory: #{@db.psql.db}"
+        b="\n\t(to create and populate postgresql database see 'man sisu' and in particular the -D flag)\n\t[the database to be used for this directory (#{@db.psql.db}) will have to be created manually if it does not exist,\n\tsee 'sisu --help sql'\n\tif you have permission to create databases:\n\t'sisu -d --createdb'\n\tor using postgresql tools directly:\n\t'createdb #{@db.psql.db}'\n\tfor a list of existing databases try 'psql --list']"
         tell=SiSU_Screen::Ansi.new(@opt.cmd,a,b)
         tell.txt_cyan
       else puts 'failed in attempt to write sisu_pgsql.cgi to present directory,  is directory writable?'
@@ -133,7 +133,7 @@ module  SiSU_CGI_pgsql
       @image_src="#{@env.url.webserv_cgi}/_sisu/image_sys"
       @hosturl_db="#{@env.url.webserv_base_cgi}"
       @hosturl_files="#{@env.url.webserv_files_from_db}"
-      @port="#{@db.port_psql}"
+      @port="#{@db.psql.port}"
       user=''  # '#{@env.user}'
       WOK_SQL
     end