Skip to content

Commit

Permalink
Merge pull request #267 from dreamfactorysoftware/add-python3-env
Browse files Browse the repository at this point in the history
Add python3 env variable
  • Loading branch information
yaroslavmo authored Sep 23, 2019
2 parents 089b4eb + 1c1b9f4 commit a0a64e3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .env-dist
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,8 @@ APP_KEY=
#DF_NODEJS_PATH=/usr/local/bin/node
## path to the installed python executable
#DF_PYTHON_PATH=/usr/local/bin/python
## path to the installed python3 executable
#DF_PYTHON3_PATH=/usr/local/bin/python3
## protocol to use for Node.js and Python when making internal calls back to DreamFactory, http or https
#DF_SCRIPTING_DEFAULT_PROTOCOL=http
## Characters limit for script to run inline. When this limit exceeds script will be written in file and executed.
Expand Down
3 changes: 3 additions & 0 deletions installer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ declare -A settings=(
["DF_SCRIPTING_DISABLE"]=""
["DF_NODEJS_PATH"]="/usr/local/bin/node"
["DF_PYTHON_PATH"]="/usr/local/bin/python"
["DF_PYTHON3_PATH"]="/usr/local/bin/python3"
# API
["DF_API_ROUTE_PREFIX"]="api"
["DF_STATUS_ROUTE_PREFIX"]=""
Expand Down Expand Up @@ -234,6 +235,7 @@ declare -A settings_msg=(
["DF_SCRIPTING_DISABLE"]="To disable all server-side scripting set this to 'all', or comma-delimited list of v8js, nodejs, python, and/or php to disable individually."
["DF_NODEJS_PATH"]="The system will try to detect the executable path, but in some environments it is best to set the path to the installed Node.js executable."
["DF_PYTHON_PATH"]="The system will try to detect the executable path, but in some environments it is best to set the path to the installed Python executable"
["DF_PYTHON3_PATH"]="The system will try to detect the executable path, but in some environments it is best to set the path to the installed Python3 executable"
# API
["DF_API_ROUTE_PREFIX"]="By default, API calls take the form of http://<server_name>/<api_route_prefix>/v<version_number>"
["DF_STATUS_ROUTE_PREFIX"]="By default, API calls take the form of http://<server_name>/[<status_route_prefix>/]status"
Expand Down Expand Up @@ -1082,6 +1084,7 @@ case $action in
menu_items=("DF_SCRIPTING_DISABLE")
[[ "${chosen_features[nodejs]}" ]] && menu_items=("${menu_items[@]}" "DF_NODEJS_PATH")
[[ "${chosen_features[python]}" ]] && menu_items=("${menu_items[@]}" "DF_PYTHON_PATH")
[[ "${chosen_features[python3]}" ]] && menu_items=("${menu_items[@]}" "DF_PYTHON_PATH3")
settings_menu_handle "Server-side Scripting Settings"
;;

Expand Down

0 comments on commit a0a64e3

Please sign in to comment.