diff --git a/ansible/roles/cassandra/defaults/main.yml b/ansible/roles/cassandra/defaults/main.yml index 33c02c17bf..8f1f0f7951 100644 --- a/ansible/roles/cassandra/defaults/main.yml +++ b/ansible/roles/cassandra/defaults/main.yml @@ -1,5 +1,5 @@ user_home: "/home/{{ ansible_ssh_user }}/" -cassandra_repo: 'deb http://www.apache.org/dist/cassandra/debian 311x main' -cassandra_repo_key: 'https://www.apache.org/dist/cassandra/KEYS' +cassandra_repo: 'deb https://debian.cassandra.apache.org 311x main' +cassandra_repo_key: 'https://downloads.apache.org/cassandra/KEYS' resource_crunch: "yes" # make this value yes if heap size should be quarter of the Server Memory when you are deploying multiple databases, else make this value no to have 50% of the value as per the best practice of cassandra cassandra_home_directory: "/var/lib/cassandra" diff --git a/ansible/roles/post-install/defaults/main.yml b/ansible/roles/post-install/defaults/main.yml index 9c9e626402..adef571366 100644 --- a/ansible/roles/post-install/defaults/main.yml +++ b/ansible/roles/post-install/defaults/main.yml @@ -1635,9 +1635,9 @@ custodian_org_data: - { "id": "{{ sunbird_default_channel }}", "field": "{{ sunbird_default_channel }}", "value": "https://{{ domain_name }}/faq" } default_user_details: - - { "firstName": "creator", "lastName": "", "email": "creator@yopmail.com", "password":"Pass@123" } - - { "firstName": "reviewer", "lastName": "", "email": "reviewer@yopmail.com", "password":"Pass@123" } - - { "firstName": "publisher", "lastName": "", "email": "publisher@yopmail.com", "password":"Pass@123" } + - { "firstName": "creator4", "lastName": "", "email": "creator4@yopmail.com", "password":"Pass@123" } + - { "firstName": "reviewer4", "lastName": "", "email": "reviewer4@yopmail.com", "password":"Pass@123" } + - { "firstName": "publisher4", "lastName": "", "email": "publisher4@yopmail.com", "password":"Pass@123" } # These variables will get overridden on run time state_id: "" diff --git a/ansible/roles/post-install/tasks/main.yml b/ansible/roles/post-install/tasks/main.yml index 121e4d0653..949252c68b 100644 --- a/ansible/roles/post-install/tasks/main.yml +++ b/ansible/roles/post-install/tasks/main.yml @@ -16,55 +16,55 @@ - debug: var: keycloak_access_token -- name: Creating root org - block: - - uri: - url: "https://{{ domain_name }}/api/org/v1/create" - method: POST - headers: - x-authenticated-user-token: "{{ keycloak_access_token }}" - Authorization: "Bearer {{ core_vault_sunbird_api_auth_token }}" - body_format: json - body: |- - { - "request": { - "orgName": "Sunbird", - "channel": "{{ sunbird_default_channel }}", - "description": "Default Channel", - "isTenant": true, - "organisationType":"board" - } - } - register: custodian_org_output - - debug: - var: custodian_org_output - - set_fact: - sunbird_custodian_org_id: "{{ custodian_org_output.json.result.organisationId }}" - - debug: - var: sunbird_custodian_org_id +#- name: Creating root org +# block: +# - uri: +# url: "https://{{ domain_name }}/api/org/v1/create" +# method: POST +# headers: +# x-authenticated-user-token: "{{ keycloak_access_token }}" +# Authorization: "Bearer {{ core_vault_sunbird_api_auth_token }}" +# body_format: json +# body: |- +# { +# "request": { +# "orgName": "Sunbird", +# "channel": "{{ sunbird_default_channel }}", +# "description": "Default Channel", +# "isTenant": true, +# "organisationType":"board" +# } +# } +# register: custodian_org_output +# - debug: +# var: custodian_org_output +# - set_fact: +# sunbird_custodian_org_id: "{{ custodian_org_output.json.result.organisationId }}" +# - debug: +# var: sunbird_custodian_org_id # Else login won't work -- name: Creating NTP org for login - block: - - uri: - url: "https://{{ domain_name }}/api/org/v1/create" - method: POST - headers: - x-authenticated-user-token: "{{ keycloak_access_token }}" - Authorization: "Bearer {{ core_vault_sunbird_api_auth_token }}" - body_format: json - body: |- - { - "request": { - "orgName":"NTP", - "description":"NTP Organisation for Sunbird", - "isRootOrg": true, - "channel": "ntp", - "organisationType": "board", - "isTenant": true - } - } +#- name: Creating NTP org for login +# block: +# - uri: +# url: "https://{{ domain_name }}/api/org/v1/create" +# method: POST +# headers: +# x-authenticated-user-token: "{{ keycloak_access_token }}" +# Authorization: "Bearer {{ core_vault_sunbird_api_auth_token }}" +# body_format: json +# body: |- + # { + # "request": { + # "orgName":"NTP", + # "description":"NTP Organisation for Sunbird", + # "isRootOrg": true, + # "channel": "ntp", + # "organisationType": "board", + # "isTenant": true + # } + # } -# - import_tasks: knowledge_platform_tasks.yaml -# - import_tasks: user_org.yaml -# - import_tasks: forms.yaml +#- import_tasks: knowledge_platform_tasks.yaml +#- import_tasks: user_org.yaml +#- import_tasks: forms.yaml diff --git a/ansible/roles/post-install/tasks/user_org.yaml b/ansible/roles/post-install/tasks/user_org.yaml index caee5ebaa7..413b996502 100644 --- a/ansible/roles/post-install/tasks/user_org.yaml +++ b/ansible/roles/post-install/tasks/user_org.yaml @@ -57,11 +57,6 @@ "operation":"add", "scope": [{ "organisationId": "{{ sunbird_custodian_org_id }}" }] }, - { - "role": "REPORT_ADMIN", - "operation":"add", - "scope": [{ "organisationId": "{{ sunbird_custodian_org_id }}" }] - }, { "role": "CONTENT_REVIEWER", "operation":"add", @@ -82,11 +77,6 @@ "operation":"add", "scope": [{ "organisationId": "{{ sunbird_custodian_org_id }}" }] }, - { - "role": "ORG_MANAGEMENT", - "operation":"add", - "scope": [{ "organisationId": "{{ sunbird_custodian_org_id }}" }] - }, { "role": "TEACHER_BADGE_ISSUER", "operation":"add", @@ -97,26 +87,11 @@ "operation":"add", "scope": [{ "organisationId": "{{ sunbird_custodian_org_id }}" }] }, - { - "role": "CONTENT_CURATION", - "operation":"add", - "scope": [{ "organisationId": "{{ sunbird_custodian_org_id }}" }] - }, - { - "role": "SYSTEM_ADMINISTRATION", - "operation":"add", - "scope": [{ "organisationId": "{{ sunbird_custodian_org_id }}" }] - }, { "role": "ANNOUNCEMENT_SENDER", "operation":"add", "scope": [{ "organisationId": "{{ sunbird_custodian_org_id }}" }] }, - { - "role": "PROGRAM_MANAGER", - "operation":"add", - "scope": [{ "organisationId": "{{ sunbird_custodian_org_id }}" }] - }, { "role": "REPORT_VIEWER", "operation":"add", @@ -127,21 +102,6 @@ "operation":"add", "scope": [{ "organisationId": "{{ sunbird_custodian_org_id }}" }] }, - { - "role": "CONTENT_REVIEW", - "operation":"add", - "scope": [{ "organisationId": "{{ sunbird_custodian_org_id }}" }] - }, - { - "role": "CONTENT_CREATION", - "operation":"add", - "scope": [{ "organisationId": "{{ sunbird_custodian_org_id }}" }] - }, - { - "role": "MEMBERSHIP_MANAGEMENT", - "operation":"add", - "scope": [{ "organisationId": "{{ sunbird_custodian_org_id }}" }] - }, { "role": "COURSE_CREATOR", "operation":"add", diff --git a/ansible/roles/stack-sunbird/templates/search-service_application.conf b/ansible/roles/stack-sunbird/templates/search-service_application.conf index f976dc8706..5f35f88ca9 100644 --- a/ansible/roles/stack-sunbird/templates/search-service_application.conf +++ b/ansible/roles/stack-sunbird/templates/search-service_application.conf @@ -332,7 +332,7 @@ installation.id="{{sunbird_installation}}" # ElasticSearch Configuration ekstepPlatformApiUserId="search-service" search.es_conn_info="{{ search_index_host }}" -search.fields.query=["name^100","title^100","lemma^100","code^100","domain","subject","description^10","keywords^100","ageGroup^10","filter^10","theme^10","genre^10","objects^25","contentType^100","language^200","teachingMode^25","skills^10","learningObjective^10","curriculum^100","gradeLevel^100","developer^100","attributions^10","identifier^100","IL_UNIQUE_ID^100","owner^50","board^100","relatedBoards^100","creator^100", "dialcodes^100","text","words","releaseNotes"] +search.fields.query=["name^100", "identifier^100", "purpose^60", "keywords^60", "source^50.0", "owner^50", "creator^20", "language^20.0", "contentType^10", "description^5.0"] search.fields.date=["lastUpdatedOn","createdOn","versionDate","lastSubmittedOn","lastPublishedOn"] search.fields.mode_collection=["identifier","name","objectType","contentType","mimeType","size","childNodes","board","subject","medium","gradeLevel","appIcon","resourceType","origin","originData"] search.batch.size=500 @@ -347,3 +347,6 @@ compositesearch.index.name="{{ compositesearch_index_name }}" content.tagging.backward_enable=false content.tagging.property=["subject","medium"] search.payload.log_enable=true + +search.fields.enable.fuzzy.when.noresult=true +search.fields.enable.secureSettings=true diff --git a/ansible/roles/stack-sunbird/templates/sunbird_notification-service.env b/ansible/roles/stack-sunbird/templates/sunbird_notification-service.env index 6189bdafa5..02a7bc02a7 100644 --- a/ansible/roles/stack-sunbird/templates/sunbird_notification-service.env +++ b/ansible/roles/stack-sunbird/templates/sunbird_notification-service.env @@ -35,3 +35,6 @@ LEARNER_SERVICE_PORT=http://learner-service:9000 sunbird_us_system_setting_url=/api/data/v1/system/settings/list sunbird_us_org_read_url=/v1/org/read notification_category_type_config=certificateUpdate +sunbird_mail_server_use_tls="true" + + diff --git a/ansible/roles/stack-sunbird/templates/sunbird_telemetry-service.env b/ansible/roles/stack-sunbird/templates/sunbird_telemetry-service.env index 1fe41c7039..6d7dc93783 100644 --- a/ansible/roles/stack-sunbird/templates/sunbird_telemetry-service.env +++ b/ansible/roles/stack-sunbird/templates/sunbird_telemetry-service.env @@ -4,7 +4,7 @@ telemetry_local_storage_enabled=true telemetry_local_storage_type={{sunbird_telemetry_dispatchers}} telemetry_kafka_broker_list={{sunbird_telemetry_kafka_servers}} telemetry_kafka_topic={{sunbird_telemetry_kafka_topic}} -telemetry_kafka_compression=snappy +telemetry_kafka_compression=none # Below is the config to enable Telemetry Proxy. To send telemetry data to ekstep telemetry_proxy_enabled=false diff --git a/kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml b/kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml index b8aaa5bd92..734c491958 100644 --- a/kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml +++ b/kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml @@ -7,7 +7,7 @@ monitoring_stack: - elasticsearch-exporter - logger - blackbox-exporter - - additional-scrape-configs + # - additional-scrape-configs - alertrules - kafka-topic-exporter - prometheus-redis-exporter diff --git a/kubernetes/pipelines/post-install/Jenkinsfile b/kubernetes/pipelines/post-install/Jenkinsfile index deda3ff045..c67cc7a21b 100644 --- a/kubernetes/pipelines/post-install/Jenkinsfile +++ b/kubernetes/pipelines/post-install/Jenkinsfile @@ -24,7 +24,7 @@ node() { jobName = sh(returnStdout: true, script: "echo $JOB_NAME").split('/')[-1].trim().toLowerCase() currentWs = sh(returnStdout: true, script: 'pwd').trim() ansiblePlaybook = "$currentWs/ansible/post-install.yaml" - ansibleExtraArgs = "--vault-password-file /var/lib/jenkins/secrets/vault-pass --tags ${params.tag} -v" + ansibleExtraArgs = "--vault-password-file /var/lib/jenkins/secrets/vault-pass -v" values.put('currentWs', currentWs) values.put('env', envDir) values.put('module', module) diff --git a/pipelines/upload/artifacts/Jenkinsfile b/pipelines/upload/artifacts/Jenkinsfile index 5eb2559be7..88e88308ff 100644 --- a/pipelines/upload/artifacts/Jenkinsfile +++ b/pipelines/upload/artifacts/Jenkinsfile @@ -34,7 +34,7 @@ node() { throw err } finally { - slack_notify(currentBuild.result) - email_notify() + // slack_notify(currentBuild.result) + // email_notify() } } diff --git a/pipelines/upload/docker/Jenkinsfile b/pipelines/upload/docker/Jenkinsfile index d401a86560..41d4bc0b40 100644 --- a/pipelines/upload/docker/Jenkinsfile +++ b/pipelines/upload/docker/Jenkinsfile @@ -1,5 +1,5 @@ @Library('deploy-conf') _ -node(){ +node('build-slave'){ try { stage('checkout public repo') { folder = new File("$WORKSPACE/.git") @@ -37,7 +37,7 @@ node(){ throw err } finally { - slack_notify(currentBuild.result) - email_notify() + // slack_notify(currentBuild.result) + // email_notify() } }