diff --git a/config/configuration.sample.yml b/config/configuration.sample.yml index 19bd3242d2..05b94d7c68 100644 --- a/config/configuration.sample.yml +++ b/config/configuration.sample.yml @@ -7,6 +7,7 @@ main: languages: [] key: '' api_require_ssl: true + api_disabled: true database: host: 127.0.0.1 port: 3306 diff --git a/lib/Alchemy/Phrasea/Command/Setup/ConfigurationEditor.php b/lib/Alchemy/Phrasea/Command/Setup/ConfigurationEditor.php index 3427101767..c534a51be9 100644 --- a/lib/Alchemy/Phrasea/Command/Setup/ConfigurationEditor.php +++ b/lib/Alchemy/Phrasea/Command/Setup/ConfigurationEditor.php @@ -83,10 +83,10 @@ class ConfigurationEditor extends Command $configurationRoot = $configurationStore->getConfig(); $configurationCurrent = & $configurationRoot; - $output->writeln('Writing configuration entry ' . $parameter); + $output->writeln('Writing value to configuration entry ' . $parameter); foreach ($parameterNodes as $paramName) { - if (! isset($mergeConfiguration[$paramName])) { + if (! isset($configurationCurrent[$paramName])) { $configurationCurrent[$paramName] = array(); } diff --git a/lib/conf.d/configuration.yml b/lib/conf.d/configuration.yml index 27eb933247..36d248db03 100644 --- a/lib/conf.d/configuration.yml +++ b/lib/conf.d/configuration.yml @@ -6,6 +6,7 @@ main: maintenance: false key: '' api_require_ssl: true + api_disabled: true database: host: 'sql-host' port: 3306 diff --git a/resources/ansible/roles/app/tasks/main.yml b/resources/ansible/roles/app/tasks/main.yml index f9271980a3..9c0d497bd6 100644 --- a/resources/ansible/roles/app/tasks/main.yml +++ b/resources/ansible/roles/app/tasks/main.yml @@ -41,3 +41,18 @@ with_items: '{{ host_addresses }}' args: chdir: /vagrant/ + +- name: Disable API SSL requirement + shell: bin/setup system:config set main.api_require_ssl false + args: + chdir: /vagrant/ + +- name: Enable API routes + shell: bin/setup system:config set main.api_disabled false + args: + chdir: /vagrant/ + +- name: Create ElasticSearch indexes + shell: bin/console s:i:c + args: + chdir: /vagrant/