Skip to content

Commit

Permalink
qto-200620232816 fix nginx provisioning bugs
Browse files Browse the repository at this point in the history
Former-commit-id: 0c560da
  • Loading branch information
YordanGeorgiev committed Jun 20, 2020
1 parent 3422672 commit b596a97
Show file tree
Hide file tree
Showing 3 changed files with 150 additions and 150 deletions.
98 changes: 49 additions & 49 deletions cnf/env/dev.env.json
Original file line number Diff line number Diff line change
@@ -1,71 +1,71 @@
{
"env" : {
"db" : {
"postgres_db_useradmin_pw" : "qplXimN2v2Zo",
"postgres_db_useradmin" : "usrdevqtoadmin",
"app_user_pwd" : "LFdCcWAoNPQp",
"project_databases" : "dev_qto, dev_devel_pro",
"postgres_db_user_pw" : "5day2FYAxILj",
"root_pwd" : "c7RN8xzWpW9h",
"AdminEmail" : "c3XXlqNmAqg4",
"postgres_db_user" : "usrdevqtoapp",
"postgres_usr_pw" : "h62TrOklNPuC",
"postgres_db_host" : "127.0.0.1",
"postgres_db_name" : "dev_qto",
"postgres_os_usr_pw" : "NbJhpIpIkz9O",
"postgres_db_port" : "15432"
},
"ssh" : {
"ssh_server" : "dev.qto.fi",
"launch_dir" : "/home/ubuntu/dat/tmp",
"ssh_user" : "ubuntu",
"ssh_key_pair_file" : "~/.ssh/key-pair-qto-amzn.pem"
},
"ENV_TYPE" : "dev",
"aws" : {
"AWS_SECRET_ACCESS_KEY" : "b6mK28kLdmJq",
"AWS_DEFAULT_REGION" : "eu-west-1",
"pem_key_fpath" : "~/.ssh/id_rsa.aws-ec2.qto.dev",
"AdminEmail" : "yordan.georgiev@gmail.com",
"AWS_ACCESS_KEY_ID" : "0bqvobg5uR6K",
"pem_key_fpath_pub" : "~/.ssh/id_rsa.aws-ec2.qto.dev.pub",
"availability_zone" : "eu-west-1c",
"ssh_server" : "dev.qto.fi",
"ssh_key_pair_file" : "~/.ssh/key-pair-qto-amzn.pem",
"bucket" : "qto.fi"
},
"app" : {
"https_port" : "441",
"mojo_morbo_port" : "3001",
"mojo_hypnotoad_port" : "8078",
"postgres_db_name" : "dev_qto",
"ws_protocol" : "ws",
"nginx_port" : "78",
"inactivity_timeout" : "60",
"ht_protocol" : "http",
"num_of_workers" : "2",
"web_host" : "host-name",
"port" : "8078"
"launch_dir" : "/home/ubuntu/dat/tmp"
},
"redis" : {
"port" : "16379",
"server" : "127.0.0.1"
},
"db" : {
"postgres_db_port" : "15432",
"postgres_db_useradmin" : "usrdevqtoadmin",
"postgres_db_name" : "dev_qto",
"root_pwd" : "c7RN8xzWpW9h",
"project_databases" : "dev_qto, dev_devel_pro",
"app_user_pwd" : "tTXlNsZztvhi",
"postgres_db_useradmin_pw" : "hT8yQ1dUKOml",
"postgres_os_usr_pw" : "gPwaAsDasZy5",
"postgres_db_user" : "usrdevqtoapp",
"postgres_usr_pw" : "3TCxpwfgAlIP",
"postgres_db_user_pw" : "yMNpU1D5zBKB",
"AdminEmail" : "LHkQZwwmWszz",
"postgres_db_host" : "127.0.0.1"
},
"log" : {
"LogToFile" : 1,
"PrintWarningMsgs" : 1,
"LogTimeToTextSeparator" : ":::",
"PrintInfoMsgs" : 1,
"TimeFormat" : "YYYY-MM-DD hh:mm:ss",
"LogFile" : "$LogDir/$ProductName.%YYYY%.%MM%.%DD%.log",
"LogDir" : "$ProductInstanceDir/dat/log",
"PrintTraceMsgs" : 1,
"PrintDebugMsgs" : 1,
"PrintInfoMsgs" : 1,
"PrintConsoleMsgs" : 1,
"LogTimeToTextSeparator" : ":::",
"LogToFile" : 1,
"PrintErrorMsgs" : 1,
"TimeFormat" : "YYYY-MM-DD hh:mm:ss",
"PrintTraceMsgs" : 1,
"LogFile" : "$LogDir/$ProductName.%YYYY%.%MM%.%DD%.log"
"PrintWarningMsgs" : 1
},
"git" : {
"private_key_file" : "~/.ssh/id_rsa.ysg",
"git_clone_url" : "git@github.com:YordanGeorgiev/qto.git"
},
"ENV_TYPE" : "dev",
"app" : {
"ht_protocol" : "http",
"mojo_hypnotoad_port" : "8078",
"ws_protocol" : "ws",
"num_of_workers" : "2",
"web_host" : "host-name",
"postgres_db_name" : "dev_qto",
"mojo_morbo_port" : "3001",
"port" : "8078",
"nginx_port" : "78",
"https_port" : "441",
"inactivity_timeout" : "60"
},
"aws" : {
"AWS_ACCESS_KEY_ID" : "SkxV4LuD1jFQ",
"availability_zone" : "eu-west-1c",
"AdminEmail" : "yordan.georgiev@gmail.com",
"pem_key_fpath_pub" : "~/.ssh/id_rsa.aws-ec2.qto.dev.pub",
"bucket" : "qto.fi",
"pem_key_fpath" : "~/.ssh/id_rsa.aws-ec2.qto.dev",
"AWS_DEFAULT_REGION" : "eu-west-1",
"ssh_key_pair_file" : "~/.ssh/key-pair-qto-amzn.pem",
"AWS_SECRET_ACCESS_KEY" : "KtunaaBRDHCM"
}
}
}
98 changes: 49 additions & 49 deletions cnf/env/prd.env.json
Original file line number Diff line number Diff line change
@@ -1,68 +1,68 @@
{
"env" : {
"aws" : {
"AWS_DEFAULT_REGION" : "eu-west-1",
"AWS_SECRET_ACCESS_KEY" : "9LiYfNjkQ6mL",
"AWS_ACCESS_KEY_ID" : "zrWVxssbVIYN",
"pem_key_fpath" : "~/.ssh/id_rsa.aws-ec2.qto.prd",
"ssh_key_pair_file" : "~/.ssh/key-pair-qto-amzn.pem",
"AdminEmail" : "yordan.georgiev@gmail.com",
"availability_zone" : "eu-west-1c",
"bucket" : "qto.fi"
},
"ENV_TYPE" : "prd",
"ssh" : {
"ssh_server" : "qto.fi",
"launch_dir" : "/home/ubuntu/dat/tmp",
"ssh_user" : "ubuntu"
},
"git" : {
"git_clone_url" : "git@github.com:YordanGeorgiev/qto.git",
"private_key_file" : "~/.ssh/id_rsa.ysg"
},
"log" : {
"PrintTraceMsgs" : 0,
"LogToFile" : 1,
"PrintConsoleMsgs" : 1,
"PrintInfoMsgs" : 1,
"LogDir" : "$ProductInstanceDir/dat/log",
"LogTimeToTextSeparator" : ":::",
"LogFile" : "$LogDir/$ProductName.%YYYY%.%MM%.%DD%.log",
"PrintTraceMsgs" : 0,
"TimeFormat" : "YYYY-MM-DD hh:mm:ss",
"PrintErrorMsgs" : 1,
"LogToFile" : 1,
"PrintDebugMsgs" : 0,
"LogFile" : "$LogDir/$ProductName.%YYYY%.%MM%.%DD%.log",
"PrintWarningMsgs" : 1,
"PrintInfoMsgs" : 1,
"PrintConsoleMsgs" : 1,
"PrintErrorMsgs" : 1
"LogTimeToTextSeparator" : ":::"
},
"db" : {
"postgres_db_user" : "usrprdqtoapp",
"root_pwd" : "c7RN8xzWpW9h",
"postgres_os_usr_pw" : "kfoOFRWG4cC9",
"postgres_db_host" : "127.0.0.1",
"postgres_usr_pw" : "coCocFqGjYm3",
"postgres_db_useradmin" : "usrprdqtoadmin",
"postgres_db_user_pw" : "rgLs6QnbhWbE",
"AdminEmail" : "MJeAVCoW4MzG",
"postgres_db_name" : "prd_qto",
"app_user_pwd" : "3SGKLX0kxbHA",
"postgres_db_port" : "15432",
"postgres_db_useradmin_pw" : "6xRKmapcEsBE",
"project_databases" : "prd_csitea , prd_ysg"
},
"redis" : {
"port" : "6379",
"server" : "127.0.0.1"
},
"app" : {
"nginx_port" : "80",
"mojo_hypnotoad_port" : "8080",
"mojo_morbo_port" : "3003",
"num_of_workers" : "5",
"postgres_db_name" : "prd_qto",
"port" : "8080",
"https_port" : "443",
"web_host" : "host-name",
"port" : "8080",
"postgres_db_name" : "prd_qto",
"mojo_hypnotoad_port" : "8080",
"ws_protocol" : "wss",
"https_port" : "443",
"ht_protocol" : "http"
"ht_protocol" : "http",
"num_of_workers" : "5"
},
"redis" : {
"server" : "127.0.0.1",
"port" : "6379"
"git" : {
"private_key_file" : "~/.ssh/id_rsa.ysg",
"git_clone_url" : "git@github.com:YordanGeorgiev/qto.git"
},
"db" : {
"postgres_db_useradmin" : "usrprdqtoadmin",
"root_pwd" : "c7RN8xzWpW9h",
"postgres_db_port" : "15432",
"AdminEmail" : "FFcO6DOvXaam",
"project_databases" : "prd_csitea , prd_ysg",
"postgres_db_name" : "prd_qto",
"postgres_usr_pw" : "GUSiPt1tD1vb",
"postgres_os_usr_pw" : "7sKWilvHDoyO",
"postgres_db_useradmin_pw" : "ACxwNnWp8QKx",
"postgres_db_user" : "usrprdqtoapp",
"postgres_db_host" : "127.0.0.1",
"app_user_pwd" : "aSH13sgO4ykL",
"postgres_db_user_pw" : "n86vYPXAfQCn"
"ssh" : {
"ssh_server" : "qto.fi",
"ssh_user" : "ubuntu",
"launch_dir" : "/home/ubuntu/dat/tmp"
},
"aws" : {
"AWS_SECRET_ACCESS_KEY" : "5riYz18BFqlz",
"availability_zone" : "eu-west-1c",
"AWS_DEFAULT_REGION" : "eu-west-1",
"AdminEmail" : "yordan.georgiev@gmail.com",
"pem_key_fpath" : "~/.ssh/id_rsa.aws-ec2.qto.prd",
"bucket" : "qto.fi",
"ssh_key_pair_file" : "~/.ssh/key-pair-qto-amzn.pem",
"AWS_ACCESS_KEY_ID" : "9AuaXLa0Zlbo"
}
}
}
104 changes: 52 additions & 52 deletions cnf/env/tst.env.json
Original file line number Diff line number Diff line change
@@ -1,70 +1,70 @@
{
"env" : {
"redis" : {
"server" : "127.0.0.1",
"port" : "16379"
},
"ENV_TYPE" : "tst",
"log" : {
"PrintTraceMsgs" : 1,
"PrintConsoleMsgs" : 1,
"PrintWarningMsgs" : 1,
"LogTimeToTextSeparator" : ":::",
"LogFile" : "$LogDir/$ProductName.%YYYY%.%MM%.%DD%.log",
"LogDir" : "$ProductInstanceDir/dat/log",
"TimeFormat" : "YYYY-MM-DD hh:mm:ss",
"PrintErrorMsgs" : 1,
"PrintInfoMsgs" : 1,
"PrintDebugMsgs" : 1,
"LogToFile" : 1
},
"app" : {
"inactivity_timeout" : "60",
"ht_protocol" : "http",
"port" : "8082",
"mojo_morbo_port" : "3002",
"ws_protocol" : "ws",
"num_of_workers" : "5",
"https_port" : "442",
"nginx_port" : "82",
"web_host" : "host-name",
"mojo_hypnotoad_port" : "8082",
"postgres_db_name" : "tst_qto"
},
"aws" : {
"AdminEmail" : "yordan.georgiev@gmail.com",
"AWS_ACCESS_KEY_ID" : "oRleACCU4Ido",
"AWS_DEFAULT_REGION" : "eu-west-1",
"AWS_ACCESS_KEY_ID" : "S8LJrupuY9bu",
"ssh_key_pair_file" : "~/.ssh/key-pair-qto-amzn.pem",
"AWS_SECRET_ACCESS_KEY" : "5TFXbTsW5I2L",
"bucket" : "qto.fi",
"availability_zone" : "eu-west-1c",
"AdminEmail" : "yordan.georgiev@gmail.com",
"pem_key_fpath" : "~/.ssh/id_rsa.aws-ec2.qto.tst"
"bucket" : "qto.fi",
"AWS_SECRET_ACCESS_KEY" : "MoJBJ2cKuYI8",
"pem_key_fpath" : "~/.ssh/id_rsa.aws-ec2.qto.tst",
"ssh_key_pair_file" : "~/.ssh/key-pair-qto-amzn.pem"
},
"ENV_TYPE" : "tst",
"db" : {
"app_user_pwd" : "LxVxRmv2Z6uR",
"postgres_db_useradmin_pw" : "aA8nS52aKLZx",
"postgres_usr_pw" : "kJ1Kb6GwoZbU",
"AdminEmail" : "ZRX9oeYk6WEP",
"postgres_db_name" : "tst_qto",
"app_user_pwd" : "w8idLnwTuXJW",
"postgres_db_host" : "127.0.0.1",
"project_databases" : "tst_qto, tst_vaultit, tst_jor",
"postgres_db_user" : "usrtstqtoapp",
"postgres_db_useradmin" : "usrtstqtoadmin",
"postgres_db_port" : "15432",
"postgres_db_user_pw" : "nlrC2EnvATVs",
"project_databases" : "tst_qto, tst_vaultit, tst_jor",
"postgres_db_host" : "127.0.0.1",
"root_pwd" : "c7RN8xzWpW9h",
"postgres_os_usr_pw" : "U0j1afQJAys5"
"postgres_db_useradmin" : "usrtstqtoadmin",
"postgres_db_name" : "tst_qto",
"postgres_os_usr_pw" : "r45xr9YjiGHq",
"postgres_db_user_pw" : "rS9JQSnSWtHC",
"postgres_usr_pw" : "GiVsPQMEk4MP",
"AdminEmail" : "cq8zaCkDWPMl",
"postgres_db_useradmin_pw" : "wLhQzeOcQyfV"
},
"redis" : {
"port" : "16379",
"server" : "127.0.0.1"
},
"git" : {
"private_key_file" : "~/.ssh/id_rsa.ysg",
"git_clone_url" : "git@github.com:YordanGeorgiev/qto.git"
"git_clone_url" : "git@github.com:YordanGeorgiev/qto.git",
"private_key_file" : "~/.ssh/id_rsa.ysg"
},
"app" : {
"mojo_morbo_port" : "3002",
"https_port" : "442",
"postgres_db_name" : "tst_qto",
"nginx_port" : "82",
"ht_protocol" : "http",
"web_host" : "host-name",
"ws_protocol" : "ws",
"port" : "8082",
"num_of_workers" : "5",
"mojo_hypnotoad_port" : "8082",
"inactivity_timeout" : "60"
},
"log" : {
"TimeFormat" : "YYYY-MM-DD hh:mm:ss",
"PrintConsoleMsgs" : 1,
"LogFile" : "$LogDir/$ProductName.%YYYY%.%MM%.%DD%.log",
"LogTimeToTextSeparator" : ":::",
"PrintInfoMsgs" : 1,
"PrintWarningMsgs" : 1,
"LogToFile" : 1,
"PrintTraceMsgs" : 1,
"PrintDebugMsgs" : 1,
"PrintErrorMsgs" : 1,
"LogDir" : "$ProductInstanceDir/dat/log"
},
"ssh" : {
"launch_dir" : "/home/ubuntu/dat/tmp",
"ssh_server" : "tst.qto.fi",
"ssh_key_pair_file" : "~/.ssh/key-pair-qto-amzn.pem",
"ssh_user" : "ubuntu"
"ssh_user" : "ubuntu",
"ssh_server" : "tst.qto.fi",
"launch_dir" : "/home/ubuntu/dat/tmp"
}
},
"multi_lines_comment" : "to indicate new line use \\n, to indicate 3 spaces \\t"
Expand Down

0 comments on commit b596a97

Please sign in to comment.