diff --git a/.ansible/inventory b/.ansible-items/inventory similarity index 100% rename from .ansible/inventory rename to .ansible-items/inventory diff --git a/.ansible/playbook.yml b/.ansible-items/playbook.yml similarity index 100% rename from .ansible/playbook.yml rename to .ansible-items/playbook.yml diff --git a/.ansible/requirements.yml b/.ansible-items/requirements.yml similarity index 100% rename from .ansible/requirements.yml rename to .ansible-items/requirements.yml diff --git a/.ansible/templates/.php-env.j2 b/.ansible-items/templates/.php-env.j2 similarity index 100% rename from .ansible/templates/.php-env.j2 rename to .ansible-items/templates/.php-env.j2 diff --git a/.ansible/templates/app.blade.php.j2 b/.ansible-items/templates/app.blade.php.j2 similarity index 100% rename from .ansible/templates/app.blade.php.j2 rename to .ansible-items/templates/app.blade.php.j2 diff --git a/.drone-kubernetes.yml b/.drone-kubernetes.yml index 16a1125..85f712f 100644 --- a/.drone-kubernetes.yml +++ b/.drone-kubernetes.yml @@ -30,9 +30,9 @@ steps: DEPLOYMENT_USER: from_secret: deploy_username commands: - - sed -i 's/{{ SPT_HOSTNAME }}/'"$SPT_HOSTNAME"'/g' ./frontend/.env - - sed -i 's/{{ DEPLOY_HOST }}/'"$DEPLOY_HOST"'/g' ./.ansible/inventory - - sed -i 's/{{ DEPLOYMENT_USER }}/'"$DEPLOYMENT_USER"'/g' ./.ansible/inventory + - sed -i 's/{{ SPT_HOSTNAME }}/'"$SPT_HOSTNAME"'/g' ./items/frontend/.env + - sed -i 's/{{ DEPLOY_HOST }}/'"$DEPLOY_HOST"'/g' ./.ansible-items/inventory + - sed -i 's/{{ DEPLOYMENT_USER }}/'"$DEPLOYMENT_USER"'/g' ./.ansible-items/inventory - name: build frontend image: node:lts-alpine3.14 @@ -40,25 +40,25 @@ steps: - node -v - npm -v - yarn --version - - yarn --cwd ./frontend install - - yarn --cwd ./frontend build --pure-lockfile - - rm -rf ./api/public/static/* - - mv ./frontend/build/* ./api/public - - rm ./api/public/index.html + - yarn --cwd ./items/frontend install + - yarn --cwd ./items/frontend build --pure-lockfile + - rm -rf ./items/api/public/static/* + - mv ./items/frontend/build/* ./items/api/public + - rm ./items/api/public/index.html - name: check ansible syntax image: plugins/ansible:3 settings: - playbook: ./.ansible/playbook.yml - inventory: ./.ansible/inventory - galaxy: ./.ansible/requirements.yml + playbook: ./.ansible-items/playbook.yml + inventory: ./.ansible-items/inventory + galaxy: ./.ansible-items/requirements.yml syntax_check: true - name: apply ansible playbook image: plugins/ansible:3 settings: - playbook: ./.ansible/playbook.yml - inventory: ./.ansible/inventory - galaxy: ./.ansible/requirements.yml + playbook: ./.ansible-items/playbook.yml + inventory: ./.ansible-items/inventory + galaxy: ./.ansible-items/requirements.yml private_key: from_secret: deploy_ssh_key environment: diff --git a/README.md b/README.md index c1c1255..e0eaf5a 100644 --- a/README.md +++ b/README.md @@ -7,4 +7,4 @@ items.sp-tarkov.com have been made by Shirito and Revingly This repository contain the following websites content: * www.sp-tarkov.com * codepaste.sp-tarkov.com -* items.sp-tarkov.com \ No newline at end of file +* [items.sp-tarkov.com](https://items.sp-tarkov.com) (see [developer documentation](./items/README.md)) \ No newline at end of file