Skip to content

Commit

Permalink
Renaming all .yml files to .yaml
Browse files Browse the repository at this point in the history
rh-pre-commit.version: 2.0.3
rh-pre-commit.check-secrets: ENABLED
  • Loading branch information
computate committed Mar 9, 2024
1 parent f1c9344 commit 27150a5
Show file tree
Hide file tree
Showing 15 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ release.properties
dependency-reduced-pom.xml
buildNumber.properties
.mvn/timing.properties
config/*.yml
config/*.yaml
config/*.password
*.crt
*.key
Expand Down
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ git clone [email protected]:computate-org/computate_project.git ~/.ansible/roles/co
## Run the Ansible Galaxy roles to install the complete project locally.

```bash
ansible-playbook ~/.ansible/roles/computate.computate_project/install.yml -e SITE_NAME=smartvillage-platform -e ENABLE_CODE_GENERATION_SERVICE=true
ansible-playbook ~/.ansible/roles/computate.computate_project/install.yaml -e SITE_NAME=smartvillage-platform -e ENABLE_CODE_GENERATION_SERVICE=true
```

## Running the project build and test suite
Expand Down Expand Up @@ -140,7 +140,7 @@ ansible-vault edit ~/.local/src/smartvillage-platform-ansible/vault/$USER-local
You can then run the project install automation again with the secrets in the vault, it will ask for the password.

```bash
ansible-playbook ~/.ansible/roles/computate.computate_project/install.yml -e SITE_NAME=smartvillage-platform -e ENABLE_CODE_GENERATION_SERVICE=true -e @~/.local/src/smartvillage-platform-ansible/vault/$USER-local --vault-id @prompt
ansible-playbook ~/.ansible/roles/computate.computate_project/install.yaml -e SITE_NAME=smartvillage-platform -e ENABLE_CODE_GENERATION_SERVICE=true -e @~/.local/src/smartvillage-platform-ansible/vault/$USER-local --vault-id @prompt
```

# Configure Eclipse IDE
Expand Down Expand Up @@ -212,7 +212,7 @@ Add these update sites and install these useful plugins:

Setup the following variables to setup the Vert.x verticle.

* CONFIG_PATH: ~/.local/src/smartvillage-platform/config/smartvillage-platform.yml
* CONFIG_PATH: ~/.local/src/smartvillage-platform/config/smartvillage-platform.yaml
* RUN_OPENAPI3_GENERATOR: true
* RUN_SQL_GENERATOR: true
* RUN_FIWARE_GENERATOR: true
Expand All @@ -239,7 +239,7 @@ Setup the following VM arguments to disable caching for easier web development:

Setup the following variables to setup the Vert.x verticle.

* CONFIG_PATH: ~/.local/src/smartvillage-platform/config/smartvillage-platform.yml
* CONFIG_PATH: ~/.local/src/smartvillage-platform/config/smartvillage-platform.yaml
* VERTXWEB_ENVIRONMENT: dev

Click [ Apply ] and [ Debug ] to debug the application.
Expand Down Expand Up @@ -315,13 +315,13 @@ AUTH_TOKEN_URI: "/auth/realms/SMARTVILLAGE/protocol/openid-connect/token"
```bash

ansible-playbook --vault-id @prompt -e @~/.local/src/smartvillage-platform-ansible/vault/$USER-staging/vault ~/.ansible/roles/computate.computate_postgres_openshift/install.yml -e SITE_NAME=smartvillage-platform
ansible-playbook --vault-id @prompt -e @~/.local/src/smartvillage-platform-ansible/vault/$USER-staging/vault ~/.ansible/roles/computate.computate_postgres_openshift/install.yaml -e SITE_NAME=smartvillage-platform

ansible-playbook --vault-id @prompt -e @~/.local/src/smartvillage-platform-ansible/vault/$USER-staging/vault ~/.ansible/roles/computate.computate_zookeeper_openshift/install.yml -e SITE_NAME=smartvillage-platform
ansible-playbook --vault-id @prompt -e @~/.local/src/smartvillage-platform-ansible/vault/$USER-staging/vault ~/.ansible/roles/computate.computate_zookeeper_openshift/install.yaml -e SITE_NAME=smartvillage-platform

ansible-playbook --vault-id @prompt -e @~/.local/src/smartvillage-platform-ansible/vault/$USER-staging/vault ~/.ansible/roles/computate.computate_solr_openshift/install.yml -e SITE_NAME=smartvillage-platform
ansible-playbook --vault-id @prompt -e @~/.local/src/smartvillage-platform-ansible/vault/$USER-staging/vault ~/.ansible/roles/computate.computate_solr_openshift/install.yaml -e SITE_NAME=smartvillage-platform

ansible-playbook --vault-id @prompt -e @~/.local/src/smartvillage-platform-ansible/vault/$USER-staging/vault ~/.ansible/roles/computate.computate_project_openshift/install.yml -e SITE_NAME=smartvillage-platform
ansible-playbook --vault-id @prompt -e @~/.local/src/smartvillage-platform-ansible/vault/$USER-staging/vault ~/.ansible/roles/computate.computate_project_openshift/install.yaml -e SITE_NAME=smartvillage-platform
```

## How to run the application as a Podman container
Expand Down Expand Up @@ -349,7 +349,7 @@ podman push computateorg/smartvillage-platform:latest quay.io/computateorg/smart
## How the base classes for this project were created

```bash
ansible-playbook -e @~/.local/src/smartvillage-platform/local/ansible_install_vars.yml ~/.local/src/computate-org/vertx_project.yml
ansible-playbook -e @~/.local/src/smartvillage-platform/local/ansible_install_vars.yaml ~/.local/src/computate-org/vertx_project.yaml
```

# Load a new map traffic data into SUMO
Expand Down
8 changes: 4 additions & 4 deletions bin/regenerate_classes.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ systemctl --user stop watch-smartvillage-platform

toilet -t -f smblock Run Base Automation
echo Install all of the base application code that is generic to most projects
echo ansible-playbook ~/.local/src/computate-org/vertx_project.yml -e @~/.local/src/smartvillage-platform/local/ansible_install_vars.yml
echo ansible-playbook ~/.local/src/computate-org/vertx_project.yaml -e @~/.local/src/smartvillage-platform/local/ansible_install_vars.yaml
read -p "" < /dev/tty
ansible-playbook ~/.local/src/computate-org/vertx_project.yml -e @~/.local/src/smartvillage-platform/local/ansible_install_vars.yml
ansible-playbook ~/.local/src/computate-org/vertx_project.yaml -e @~/.local/src/smartvillage-platform/local/ansible_install_vars.yaml

curl -s 'http://localhost:8983/solr/computate/select?fq=classSort_indexed_int%3A%5B*%20TO%20*%5D&fq=siteNom_indexed_string%3Asmartvillage-platform&fq=partEstClasse_indexed_boolean%3Atrue&q=*%3A*&sort=classSort_indexed_int%20asc&rows=100' \
| jq -c '.response.docs[]' \
Expand Down Expand Up @@ -86,9 +86,9 @@ done

toilet -t -f smblock Run Install Automation
echo Install the whole application with one simple ansible script, including database setup, search engine setup and configuration.
echo '(cd ~/.local/src/smartvillage-platform && ansible-playbook ~/.ansible/roles/computate.computate_project/install.yml -e @~/.local/src/smartvillage-platform/vault/$USER-vault --vault-password-file ~/.local/src/smartvillage-platform/vault/key -e SITE_NAME=smartvillage-platform -e ENABLE_CODE_GENERATION_SERVICE=true)'
echo '(cd ~/.local/src/smartvillage-platform && ansible-playbook ~/.ansible/roles/computate.computate_project/install.yaml -e @~/.local/src/smartvillage-platform/vault/$USER-vault --vault-password-file ~/.local/src/smartvillage-platform/vault/key -e SITE_NAME=smartvillage-platform -e ENABLE_CODE_GENERATION_SERVICE=true)'
read -p "" < /dev/tty
(cd ~/.local/src/smartvillage-platform && ansible-playbook ~/.ansible/roles/computate.computate_project/install.yml -e @~/.local/src/smartvillage-platform/vault/$USER-vault --vault-password-file ~/.local/src/smartvillage-platform/vault/key -e SITE_NAME=smartvillage-platform -e ENABLE_CODE_GENERATION_SERVICE=true)
(cd ~/.local/src/smartvillage-platform && ansible-playbook ~/.ansible/roles/computate.computate_project/install.yaml -e @~/.local/src/smartvillage-platform/vault/$USER-vault --vault-password-file ~/.local/src/smartvillage-platform/vault/key -e SITE_NAME=smartvillage-platform -e ENABLE_CODE_GENERATION_SERVICE=true)

toilet -t -f smblock Watch Service
echo Watch the watch-smartvillage-platform service logs as it generates the API and UI code
Expand Down
2 changes: 1 addition & 1 deletion local/defaults.yml → local/defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ CLASS_SIMPLE_NAME_MainVerticle: "MainVerticle"
RUN_OPENAPI3_GENERATOR: true
RUN_SQL_GENERATOR: true
RUN_ARTICLE_GENERATOR: false
I18N_PATHS: ["{{ SITE_PREFIX }}/computate/src/main/resources/org/computate/i18n/i18n_enUS.yml"]
I18N_PATHS: ["{{ SITE_PREFIX }}/computate/src/main/resources/org/computate/i18n/i18n_enUS.yaml"]
DYNAMIC_PAGE_PATHS: ["{{ SITE_PREFIX }}/smartvillage-platform/page"]

LANGUAGE_NAME: "enUS"
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion roles/smartvillage_new_release/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
NEXT_VERSION not specified.
Current smartvillage version is {{ PREV_VERSION }}.
Run the playbook again with the NEXT VERSION set:
ansible-playbook smartvillage_new_release.yml -e NEXT_VERSION={{ PREV_VERSION_PREFIX }}{{ (PREV_VERSION_SUFFIX | int) + 1 }}
ansible-playbook smartvillage_new_release.yaml -e NEXT_VERSION={{ PREV_VERSION_PREFIX }}{{ (PREV_VERSION_SUFFIX | int) + 1 }}
when: NEXT_VERSION is not defined

- name: |
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ public Future<Void> importDataSitePages() {
dynamicPagePaths.forEach(dynamicPagePath -> {
try {
try(Stream<Path> stream = Files.walk(Paths.get(dynamicPagePath))) {
stream.filter(Files::isRegularFile).filter(p -> p.getFileName().toString().endsWith(".yml")).forEach(path -> {
stream.filter(Files::isRegularFile).filter(p -> p.getFileName().toString().endsWith(".yaml")).forEach(path -> {
pagePaths.add(path.toAbsolutePath().toString());
});
}
Expand Down
File renamed without changes.
Empty file removed src/main/resources/article.yml
Empty file.
Empty file removed src/main/resources/indexed.yml
Empty file.
Empty file removed src/main/resources/models.yml
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ public static Future<JsonObject> configureConfig() {
try {
ConfigRetrieverOptions retrieverOptions = new ConfigRetrieverOptions();

retrieverOptions.addStore(new ConfigStoreOptions().setType("file").setFormat("yaml").setConfig(new JsonObject().put("path", "application.yml")));
retrieverOptions.addStore(new ConfigStoreOptions().setType("file").setFormat("yaml").setConfig(new JsonObject().put("path", "application.yaml")));

ConfigRetriever configRetriever = ConfigRetriever.create(vertx, retrieverOptions);
configRetriever.getConfig().onSuccess(config -> {
Expand Down

0 comments on commit 27150a5

Please sign in to comment.