From 0087ad1e0824b4b1c49ce1468bfbb2e492ac7992 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Wed, 29 Oct 2014 10:22:36 -0400 Subject: Add test to check a real database (pgsql) works Change config template to e able to set up ipsilon with an extrenal database. For the easy install the database server must have 3 datbases configured, and named exactly: admincondif, userprefs, transactions If different names are required manual instalation will be necessary. Database URLs (including credentials) can be set using the new option named --database-url Signed-off-by: Simo Sorce Reviewed-by: Patrick Uiterwijk --- ipsilon/install/ipsilon-server-install | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'ipsilon') diff --git a/ipsilon/install/ipsilon-server-install b/ipsilon/install/ipsilon-server-install index 598a025..c6d656d 100755 --- a/ipsilon/install/ipsilon-server-install +++ b/ipsilon/install/ipsilon-server-install @@ -104,6 +104,12 @@ def install(plugins, args): 'sysuser': args['system_user'], 'ipsilondir': BINDIR, 'staticdir': STATICDIR, + 'admindb': args['database_url'] % { + 'datadir': args['data_dir'], 'dbname': 'adminconfig'}, + 'usersdb': args['database_url'] % { + 'datadir': args['data_dir'], 'dbname': 'userprefs'}, + 'transdb': args['database_url'] % { + 'datadir': args['data_dir'], 'dbname': 'transactions'}, 'secure': "False" if args['secure'] == "no" else "True", 'debugging': "True" if args['server_debugging'] else "False"} if args['secure'] == 'no': @@ -191,7 +197,7 @@ def find_plugins(): def parse_config_profile(args): - config = ConfigParser.ConfigParser() + config = ConfigParser.RawConfigParser() files = config.read(args['config_profile']) if len(files) == 0: raise ConfigurationError('Config Profile file %s not found!' % @@ -231,6 +237,9 @@ def parse_args(plugins): help="User account used to run the server") parser.add_argument('--admin-user', default='admin', help="User account that is assigned admin privileges") + parser.add_argument('--database-url', + default='sqlite:///%(datadir)s/%(dbname)s.sqlite', + help="The (templatized) database URL to use") parser.add_argument('--secure', choices=['yes', 'no'], default='yes', help="Turn on all security checks") parser.add_argument('--config-profile', default=None, -- cgit