diff --git a/agora-gui/templates/avConfig.js b/agora-gui/templates/avConfig.js index 9fb57146..b2196545 100644 --- a/agora-gui/templates/avConfig.js +++ b/agora-gui/templates/avConfig.js @@ -20,7 +20,7 @@ * in this same file, which you might want to edit and tune if needed. */ -var AV_CONFIG_VERSION = 'master'; +var AV_CONFIG_VERSION = '5.0.0'; var avConfigData = { // the base url path for ajax requests, for example for sending ballots or diff --git a/config.yml b/config.yml index d4b41591..6e3947ec 100644 --- a/config.yml +++ b/config.yml @@ -26,7 +26,7 @@ params: # global configuration config: backup_password: '' - version: 'master' + version: '5.0.0' # global config. Note: currently some other keys are used as global conf global_secret_key: '' @@ -639,7 +639,7 @@ config: # default configuration for calculate results on agora-gui-admin calculate_results_default: >- { - "version": "master", + "version": "5.0.0", "pipes": [ { "type": "agora_results.pipes.pdf.configure_pdf", @@ -675,7 +675,7 @@ config: layout: 'simple', num_successful_logins_allowed: 0, resultsConfig: { - version: 'master', + version: '5.0.0', pipes: [ { type: 'agora_results.pipes.results.do_tallies', diff --git a/doc/devel/agora.config.yml b/doc/devel/agora.config.yml index 071ccf53..5fa0ed00 100644 --- a/doc/devel/agora.config.yml +++ b/doc/devel/agora.config.yml @@ -25,7 +25,7 @@ params: # global configuration config: - version: 'master' + version: '5.0.0' backup_password: '' # global config. Note: currently some other keys are used as global conf @@ -652,7 +652,7 @@ config: # default configuration for calculate results on agora-gui-admin calculate_results_default: >- { - "version": "master", + "version": "5.0.0", "pipes": [ { "type": "agora_results.pipes.pdf.configure_pdf", @@ -688,7 +688,7 @@ config: layout: 'simple', num_successful_logins_allowed: 0, resultsConfig: { - version: 'master', + version: '5.0.0', pipes: [ { type: 'agora_results.pipes.results.do_tallies', diff --git a/doc/devel/auth1.config.yml b/doc/devel/auth1.config.yml index f90b3c4b..b72892ae 100644 --- a/doc/devel/auth1.config.yml +++ b/doc/devel/auth1.config.yml @@ -25,7 +25,7 @@ params: # global configuration config: - version: 'master' + version: '5.0.0' backup_password: '' # global config. Note: currently some other keys are used as global conf @@ -638,7 +638,7 @@ config: # default configuration for calculate results on agora-gui-admin calculate_results_default: >- { - "version": "master", + "version": "5.0.0", "pipes": [ { "type": "agora_results.pipes.pdf.configure_pdf", @@ -674,7 +674,7 @@ config: layout: 'simple', num_successful_logins_allowed: 0, resultsConfig: { - version: 'master', + version: '5.0.0', pipes: [ { type: 'agora_results.pipes.results.do_tallies', diff --git a/doc/devel/auth2.config.yml b/doc/devel/auth2.config.yml index ce10c9de..3dbbf456 100644 --- a/doc/devel/auth2.config.yml +++ b/doc/devel/auth2.config.yml @@ -25,7 +25,7 @@ params: # global configuration config: - version: 'master' + version: '5.0.0' backup_password: '' # global config. Note: currently some other keys are used as global conf @@ -638,7 +638,7 @@ config: # default configuration for calculate results on agora-gui-admin calculate_results_default: >- { - "version": "master", + "version": "5.0.0", "pipes": [ { "type": "agora_results.pipes.pdf.configure_pdf", @@ -674,7 +674,7 @@ config: layout: 'simple', num_successful_logins_allowed: 0, resultsConfig: { - version: 'master', + version: '5.0.0', pipes: [ { type: 'agora_results.pipes.results.do_tallies', diff --git a/doc/production/config.auth.yml b/doc/production/config.auth.yml index 2d989385..84a537d8 100644 --- a/doc/production/config.auth.yml +++ b/doc/production/config.auth.yml @@ -25,7 +25,7 @@ params: # global configuration config: - version: 'master' + version: '5.0.0' backup_password: '' # global config. Note: currently some other keys are used as global conf @@ -638,7 +638,7 @@ config: # default configuration for calculate results on agora-gui-admin calculate_results_default: >- { - "version": "master", + "version": "5.0.0", "pipes": [ { "type": "agora_results.pipes.pdf.configure_pdf", @@ -674,7 +674,7 @@ config: layout: 'simple', num_successful_logins_allowed: 0, resultsConfig: { - version: 'master', + version: '5.0.0', pipes: [ { type: 'agora_results.pipes.results.do_tallies', diff --git a/doc/production/config.master.yml b/doc/production/config.master.yml index 989a281a..8cc2acc0 100644 --- a/doc/production/config.master.yml +++ b/doc/production/config.master.yml @@ -25,7 +25,7 @@ params: # global configuration config: - version: 'master' + version: '5.0.0' backup_password: '' # global config. Note: currently some other keys are used as global conf @@ -638,7 +638,7 @@ config: # default configuration for calculate results on agora-gui-admin calculate_results_default: >- { - "version": "master", + "version": "5.0.0", "pipes": [ { "type": "agora_results.pipes.pdf.configure_pdf", @@ -674,7 +674,7 @@ config: layout: 'simple', num_successful_logins_allowed: 0, resultsConfig: { - version: 'master', + version: '5.0.0', pipes: [ { type: 'agora_results.pipes.results.do_tallies', diff --git a/helper-tools/config_prod_env.py b/helper-tools/config_prod_env.py index 38000979..051ec409 100755 --- a/helper-tools/config_prod_env.py +++ b/helper-tools/config_prod_env.py @@ -21,9 +21,9 @@ import argparse import re -INPUT_PROD_VERSION="4.0.0" -INPUT_PRE_VERSION="master" -OUTPUT_PROD_VERSION="master" +INPUT_PROD_VERSION="master" +INPUT_PRE_VERSION="5.0.0" +OUTPUT_PROD_VERSION="5.0.0" def store_keyvalue(prod_config, generated_config, keystore, pipe): ''' Updates the keyvalue store diff --git a/repos.yml b/repos.yml index 7975c14a..c8f1ff4a 100644 --- a/repos.yml +++ b/repos.yml @@ -17,53 +17,53 @@ repos: aelections: repo: https://github.com/agoravoting/agora_elections.git - version: 'master' + version: '5.0.0' force: yes results: repo: https://github.com/agoravoting/agora-results.git - version: 'master' + version: '5.0.0' force: yes tally: repo: https://github.com/agoravoting/agora-tally.git - version: 'master' + version: '5.0.0' force: yes authapi: repo: https://github.com/agoravoting/authapi.git - version: 'master' + version: '5.0.0' force: yes atools: repo: https://github.com/agoravoting/agora-tools.git - version: 'master' + version: '5.0.0' force: yes frestq: repo: https://github.com/agoravoting/frestq - version: 'master' + version: '5.0.0' force: yes eorchestra: repo: https://github.com/agoravoting/election-orchestra - version: 'master' + version: '5.0.0' force: yes vfork: repo: https://github.com/agoravoting/vfork - version: 'master' + version: '5.0.0' force: yes averifier: repo: https://github.com/agoravoting/agora-verifier.git - version: 'master' + version: '5.0.0' force: yes guicommon: repo: https://github.com/agoravoting/agora-gui-common.git - version: 'master' + version: '5.0.0' force: yes guiadmin: repo: https://github.com/agoravoting/agora-gui-admin.git - version: 'master' + version: '5.0.0' force: yes guibooth: repo: https://github.com/agoravoting/agora-gui-booth.git - version: 'master' + version: '5.0.0' force: yes guielections: repo: https://github.com/agoravoting/agora-gui-elections.git - version: 'master' + version: '5.0.0' force: yes