Merge pull request #603 from deepshikha2k5/dev

enviornment variable lms page

pages/developer-docs/configuring_sunbird/env_variables_lms.md

@@ -15,7 +15,7 @@ The following is a list of environment variables and their default values, as re
 |-------|---------------|------------|---------|---------------|------
 | 1     | sunbird_mail_server_from_email  | Represents the default communication email address | Used to send notifications to the users  | no default | Sunbird-LMS
 | 2     | sunbird_env_logo_url | Represents the public access image url|  Used to display logo|  no default  | Sunbird-LMS 
-| 3     | sunird_web_url | Represents the URL of the home page | Used to share in an email, such that the users can login | no default  | Sunbird-LMS 
+| 3     | sunbird_web_url | Represents the URL of the home page | Used to share in an email, such that the users can login | no default  | Sunbird-LMS 
 | 4     | sunbird_app_url | Represents the URL of the Sunbird app in the Play store | Used to share in an email, such that users are able to download the app | no default | Sunbird-LMS 
 | 5     | sunbird_msg_sender | Represents the name of the SMS sender | Used to display the name that appears on the user's screen when an SMS is sent from the system | no default | Sunbird-LMS 
 | 6     | sunbird_installation_email | Represents the email address used to send badger system notifications | Used to notify users when they install the badger system | no default | Sunbird-LMS 
@@ -30,7 +30,6 @@ The following is a list of environment variables and their default values, as re
 | 15    | telemetry_kafka_broker_list | Represents the IP address and ports of Kafka. The list is provided in the following format - <IP>:<port>,<IP>:<port> | Used to provide Kafka connection details  | The installer needs to provide appropriate details of the IP address and port   | Sunbird-telemetry-service 
 | 16    | telemetry_kafka_topic  | Represents the name of the Kafka topic. Recommended topic name format is <env>.telemetry.ingestion  |   Used to provide Kafka topic details   |           | Sunbird-telemetry-service 
 | 17   | sunbird_user_bulk_upload_size  | Represents the limit for bulk upload of user details. For example, setting up a value to 1001 restricts the number of users that can be created at a time to 1001. The recommended limit is 1000 users per bulk user upload request. It is also recommended not to configure this value above 2001. | Used to specify the limit on the number of lines (including header lines) in a CSV file used for bulk upload. |     1001      | Sunbird-LMS 
-<<<<<<< HEAD
 | 18 | sunbird_installation_display_name  | Represents the display name of the installation | Used to display the instance name              |     sunbird    | Sunbird-LMS	
 | 19 | telemetry_proxy_enabled  | Denotes if transferring telemetry data to the configured proxy is enabled or disabled.<br> **Note:** If the telemetry proxy is enabled then telemetry proxy URL and authentication key configuration is mandatory to transfer telemetry events. | Used to allow transfer of telemetry data to another telemetry proxy, i.e. to the existing data analytics platform telemetry API |     false    | Telemetry-Service 
 | 20 | telemetry_proxy_url  | Represents the URL of telemetry proxy API  | Used to store telemetry data in configured telemetry proxy |   | Telemetry-Service |
@@ -40,14 +39,3 @@ The following is a list of environment variables and their default values, as re
 | 24 | sunbird_open_saber_bridge_enable  | This variable is required during installation time, to indicate whether adopter needs open-saber or not| Values: True, to indicate if open-saber is required and false to indicate its not required. In case its true then the user must provide  sunbird_registry_service_baseurl env value| To enable or disable open-saber call set it to false  | Learner-Service  
 | 25 | sunbird_analytics_api_base_url  | This variable is required to configure if the analytics store call happens locally (inside the Sunbird instance) or globally  |To make analytics api call(Default value is provided for dev server on production, it should point to ekstep production url) | https://dev.ekstep.in/api/data/v3  | Learner-Service 
 | 26 | sunbird_search_service_api_base_url  | This variable is required to configure if the content store call happens locally (inside the Sunbird instance) or globally |To make content search call(Default value is provided for dev server on production, it should point to ekstep production url) | https://dev.ekstep.in/api/search  | Learner-Service   
-=======
-| 18 | sunbird_installation_display_name  | Represents the display name of the installation | Used to display the instance name              |     sunbird    | Sunbird-LMS 
-| 19 | telemetry_proxy_enabled  | Denotes if transferring telemetry data to the configured proxy is enabled or disabled.<br> **Note:** If the telemetry proxy is enabled then telemetry proxy URL and authentication key configuration is mandatory to transfer telemetry events. | Used to allow transfer of telemetry data to another telemetry proxy, i.e. to the existing data analytics platform telemetry API |     false    | Telemetry-Service 
-| 20 | telemetry_proxy_url  | Represents the URL of telemetry proxy API  | Used to store telemetry data in configured telemetry proxy |   | Telemetry-Service 
-| 21 | telemetry_proxy_auth_key  | Represents the telemetry proxy API key | Used to store telemetry data in configured telemetry proxy. |   | Telemetry-Service 
-| 22 | sunbird_app_name  | Represents app name of the adopter | Used for sending welcome message to the user(When the app name is set, the welcome message is displayed as: (Name), welcome to (environ). You can login using your mobile number. Use (url) to login using browser, or download the (sunbird_app_name) app from Playstore. When the name is not set, the message is: (Name) welcome to (environ). You can login using your mobile number. Login at (url) |  | Learner-Service | 
-| 23 | sunbird_registry_service_baseurl  | This variable is required to connect with Open-saber serve to store user attribute. If the value is not set then the user's additional attribute is not stored within open-saber | To make open-saber call |   | Learner-Service | 
-| 24 | sunbird_open_saber_bridge_enable  | This variable is required during installation time, to indicate whether adopter needs open-saber | Values: True, to indicate if open-saber is required and false to indicate if not required. In case its true then the user must provide  sunbird_registry_service_baseurl env value. To enable or disable open-saber call, set to false | False |Learner-Service 
-| 25 | sunbird_analytics_api_base_url  | This variable is required to configure if the analytics store call happens locally (inside the Sunbird instance) or globally  |To make analytics api call | https://dev.ekstep.in/api/data/v3  | Learner-Service 
-| 26 | sunbird_search_service_api_base_url  | This variable is required to configure if the content store call happens locally (inside the Sunbird instance) or globally |To make content search call | https://dev.ekstep.in/api/search  | Learner-Service 
->>>>>>> 9ef63cab1a8d061d2228acca8e77268761a04e8a