File tree Expand file tree Collapse file tree 2 files changed +4
-2
lines changed Expand file tree Collapse file tree 2 files changed +4
-2
lines changed Original file line number Diff line number Diff line change 22
33import os
44import logging
5+ import getpass
56import mamonsu .lib .platform as platform
67
78
89class PgsqlConfig (object ):
910
1011 @staticmethod
1112 def default_user ():
12- user = os .environ .get ('PGUSER' ) or 'postgres'
13+ user = os .environ .get ('PGUSER' ) or getpass . getuser () or 'postgres'
1314 return user
1415
1516 @staticmethod
@@ -39,7 +40,7 @@ def default_app():
3940
4041 @staticmethod
4142 def default_db ():
42- database = os .environ .get ('PGDATABASE' ) or os .environ .get ('PGUSER' )
43+ database = os .environ .get ('PGDATABASE' ) or os .environ .get ('PGUSER' ) or getpass . getuser ()
4344 database = database or 'postgres'
4445 return database
4546
Original file line number Diff line number Diff line change @@ -59,6 +59,7 @@ def __init__(self):
5959 bootstrap_group .add_option (
6060 '-M' , '--mamonsu-username' ,
6161 dest = 'mamonsu_username' ,
62+ default = self .default_user (),
6263 help = 'database non-privileged user for mamonsu' )
6364 parser .add_option_group (group )
6465 parser .add_option_group (bootstrap_group )
You can’t perform that action at this time.
0 commit comments