diff --git a/sga/configuration.lua b/sga/configuration.lua index a53061e5a00c2403126f53d4647fbd677670ba21..b6562dcc3a08536cde1b61c00234c34c0cd953c4 100644 --- a/sga/configuration.lua +++ b/sga/configuration.lua @@ -28,7 +28,9 @@ function configuration.read(filename, sga_name) -- TODO: O que fazer nesse caso? Avisar que foi ignorado? config.sga_name = nil end - config, err = configuration.get(config.sga[sga_name], filename, config) + local config_data = config.sga[sga_name] + config.sga = nil + config, err = configuration.get(config_data, filename, config) if not config then return nil, "["..sga_name.."] "..err end diff --git a/sgad-multi.cfg.example b/sgad-multi.cfg.example new file mode 100644 index 0000000000000000000000000000000000000000..e364c4c12ddf78216cab0b207163379db33a257a --- /dev/null +++ b/sgad-multi.cfg.example @@ -0,0 +1,37 @@ +csbase_server = "http://localhost:40409" +platform = "Linux26g4" +-- sgad_bind_addr = "127.0.0.1" +sgad_host = "localhost" +sgad_port = 12345 +--sga_name = "chuva" +status_interval_s = 10 +exec_polling_interval_s = 5 +register_retry_s = 3 +project_root_dir = os.getenv("HOME").."/test/sga-environment/csgrid/projects" +algorithm_root_dir = os.getenv("HOME").."/test/sga-environment/csgrid/algorithms" +runtime_data_dir = (os.getenv("TMPDIR") or "/tmp").."/sgad" +sandbox_root_dir = "/tmp/sgad/sandbox" +driver = "sga.driver.posix" +resources = { + "java", + "lua" +} +extra_config = { + csbase_transfer_name = "ssh-datatransfer", + csbase_csfs_root_dir = "/tmp/csfs_sandbox", + ssh_host = "localhost", + ssh_port = 22, + ssh_user_name = "csgrid", + ssh_private_key_path = "/home/csgrid/.ssh/foo_id_rsa" +} + +sga.first = [[ +platform = "Linux44_64" +sandbox_root_dir = "/tmp/sgad/sandbox-first-chuva" +]] + +sga.second = [[ +sga_name = "second" +platform = "Linux64e5" +sandbox_root_dir = "/tmp/sgad/sandbox-second-chuva" +]]