From 3d55d16f8df863acf38bf2671efdc82bde88e5fc Mon Sep 17 00:00:00 2001 From: Sebastian Haderecker Date: Thu, 9 May 2019 21:40:32 +0000 Subject: [PATCH] Move to subfolder & adapt paths --- cloud/{ => open-telekom-cloud}/.ecs_settings.sh | 0 cloud/{ => open-telekom-cloud}/.gitignore | 0 cloud/{ => open-telekom-cloud}/.hpfeeds_settings.sh | 0 cloud/{ => open-telekom-cloud}/.otc_env.sh | 0 cloud/{ => open-telekom-cloud}/README.md | 4 ++-- .../ansible/custom_ews.yaml | 0 cloud/{ => open-telekom-cloud}/ansible/install.yaml | 0 cloud/{ => open-telekom-cloud}/ansible/reboot.yaml | 0 .../ansible/roles/custom_ews/tasks/main.yaml | 0 .../ansible/roles/custom_ews/templates/ews.cfg | 0 .../ansible/roles/install/tasks/main.yaml | 2 +- .../deploy_ansible_otc_t-pot.sh | 0 .../{ => open-telekom-cloud}/doc/otc_1_project.gif | Bin cloud/{ => open-telekom-cloud}/doc/otc_2_user.gif | Bin cloud/{ => open-telekom-cloud}/doc/otc_3_login.gif | Bin .../doc/otc_4_import_key.gif | Bin .../doc/otc_5_vpc_subnet.gif | Bin .../doc/otc_6_sec_group.gif | Bin .../doc/putty_agent_forwarding.png | Bin 19 files changed, 3 insertions(+), 3 deletions(-) rename cloud/{ => open-telekom-cloud}/.ecs_settings.sh (100%) rename cloud/{ => open-telekom-cloud}/.gitignore (100%) rename cloud/{ => open-telekom-cloud}/.hpfeeds_settings.sh (100%) rename cloud/{ => open-telekom-cloud}/.otc_env.sh (100%) rename cloud/{ => open-telekom-cloud}/README.md (96%) rename cloud/{ => open-telekom-cloud}/ansible/custom_ews.yaml (100%) rename cloud/{ => open-telekom-cloud}/ansible/install.yaml (100%) rename cloud/{ => open-telekom-cloud}/ansible/reboot.yaml (100%) rename cloud/{ => open-telekom-cloud}/ansible/roles/custom_ews/tasks/main.yaml (100%) rename cloud/{ => open-telekom-cloud}/ansible/roles/custom_ews/templates/ews.cfg (100%) rename cloud/{ => open-telekom-cloud}/ansible/roles/install/tasks/main.yaml (95%) rename cloud/{ => open-telekom-cloud}/deploy_ansible_otc_t-pot.sh (100%) rename cloud/{ => open-telekom-cloud}/doc/otc_1_project.gif (100%) rename cloud/{ => open-telekom-cloud}/doc/otc_2_user.gif (100%) rename cloud/{ => open-telekom-cloud}/doc/otc_3_login.gif (100%) rename cloud/{ => open-telekom-cloud}/doc/otc_4_import_key.gif (100%) rename cloud/{ => open-telekom-cloud}/doc/otc_5_vpc_subnet.gif (100%) rename cloud/{ => open-telekom-cloud}/doc/otc_6_sec_group.gif (100%) rename cloud/{ => open-telekom-cloud}/doc/putty_agent_forwarding.png (100%) diff --git a/cloud/.ecs_settings.sh b/cloud/open-telekom-cloud/.ecs_settings.sh similarity index 100% rename from cloud/.ecs_settings.sh rename to cloud/open-telekom-cloud/.ecs_settings.sh diff --git a/cloud/.gitignore b/cloud/open-telekom-cloud/.gitignore similarity index 100% rename from cloud/.gitignore rename to cloud/open-telekom-cloud/.gitignore diff --git a/cloud/.hpfeeds_settings.sh b/cloud/open-telekom-cloud/.hpfeeds_settings.sh similarity index 100% rename from cloud/.hpfeeds_settings.sh rename to cloud/open-telekom-cloud/.hpfeeds_settings.sh diff --git a/cloud/.otc_env.sh b/cloud/open-telekom-cloud/.otc_env.sh similarity index 100% rename from cloud/.otc_env.sh rename to cloud/open-telekom-cloud/.otc_env.sh diff --git a/cloud/README.md b/cloud/open-telekom-cloud/README.md similarity index 96% rename from cloud/README.md rename to cloud/open-telekom-cloud/README.md index 03df32cd..ea7423d4 100644 --- a/cloud/README.md +++ b/cloud/open-telekom-cloud/README.md @@ -156,7 +156,7 @@ az=eu-de-03 ## Configure `tpot.conf.dist` -The file is located in [`iso/installer/tpot.conf.dist`](../iso/installer/tpot.conf.dist). +The file is located in [`iso/installer/tpot.conf.dist`](../../iso/installer/tpot.conf.dist). Here you can choose: - between the various T-Pot editions - a username for the web interface @@ -176,7 +176,7 @@ To enable this feature, set `custom_ews=true` in `.ecs_settings.sh`; See here: Here you can create a custom config file for `ewsposter`. e.g. when you have your own credentials for delivering data to our [Sicherheitstacho](https://sicherheitstacho.eu/start/main). -You can find the `ews.cfg` template file here: [`cloud/ansible/roles/custom_ews/templates/ews.cfg`](../cloud/ansible/roles/custom_ews/templates/ews.cfg) and adapt it for your needs. +You can find the `ews.cfg` template file here: [`ansible/roles/custom_ews/templates/ews.cfg`](ansible/roles/custom_ews/templates/ews.cfg) and adapt it for your needs. For setting custom credentials, these settings would be relevant for you (the rest of the file can stay as is): ``` diff --git a/cloud/ansible/custom_ews.yaml b/cloud/open-telekom-cloud/ansible/custom_ews.yaml similarity index 100% rename from cloud/ansible/custom_ews.yaml rename to cloud/open-telekom-cloud/ansible/custom_ews.yaml diff --git a/cloud/ansible/install.yaml b/cloud/open-telekom-cloud/ansible/install.yaml similarity index 100% rename from cloud/ansible/install.yaml rename to cloud/open-telekom-cloud/ansible/install.yaml diff --git a/cloud/ansible/reboot.yaml b/cloud/open-telekom-cloud/ansible/reboot.yaml similarity index 100% rename from cloud/ansible/reboot.yaml rename to cloud/open-telekom-cloud/ansible/reboot.yaml diff --git a/cloud/ansible/roles/custom_ews/tasks/main.yaml b/cloud/open-telekom-cloud/ansible/roles/custom_ews/tasks/main.yaml similarity index 100% rename from cloud/ansible/roles/custom_ews/tasks/main.yaml rename to cloud/open-telekom-cloud/ansible/roles/custom_ews/tasks/main.yaml diff --git a/cloud/ansible/roles/custom_ews/templates/ews.cfg b/cloud/open-telekom-cloud/ansible/roles/custom_ews/templates/ews.cfg similarity index 100% rename from cloud/ansible/roles/custom_ews/templates/ews.cfg rename to cloud/open-telekom-cloud/ansible/roles/custom_ews/templates/ews.cfg diff --git a/cloud/ansible/roles/install/tasks/main.yaml b/cloud/open-telekom-cloud/ansible/roles/install/tasks/main.yaml similarity index 95% rename from cloud/ansible/roles/install/tasks/main.yaml rename to cloud/open-telekom-cloud/ansible/roles/install/tasks/main.yaml index 16fda0b8..9e4fd51a 100644 --- a/cloud/ansible/roles/install/tasks/main.yaml +++ b/cloud/open-telekom-cloud/ansible/roles/install/tasks/main.yaml @@ -26,7 +26,7 @@ - name: Copy t-pot configuration file template: - src: ../../../../../iso/installer/tpot.conf.dist + src: ../../../../../../iso/installer/tpot.conf.dist dest: /root/tpot.conf owner: root group: root diff --git a/cloud/deploy_ansible_otc_t-pot.sh b/cloud/open-telekom-cloud/deploy_ansible_otc_t-pot.sh similarity index 100% rename from cloud/deploy_ansible_otc_t-pot.sh rename to cloud/open-telekom-cloud/deploy_ansible_otc_t-pot.sh diff --git a/cloud/doc/otc_1_project.gif b/cloud/open-telekom-cloud/doc/otc_1_project.gif similarity index 100% rename from cloud/doc/otc_1_project.gif rename to cloud/open-telekom-cloud/doc/otc_1_project.gif diff --git a/cloud/doc/otc_2_user.gif b/cloud/open-telekom-cloud/doc/otc_2_user.gif similarity index 100% rename from cloud/doc/otc_2_user.gif rename to cloud/open-telekom-cloud/doc/otc_2_user.gif diff --git a/cloud/doc/otc_3_login.gif b/cloud/open-telekom-cloud/doc/otc_3_login.gif similarity index 100% rename from cloud/doc/otc_3_login.gif rename to cloud/open-telekom-cloud/doc/otc_3_login.gif diff --git a/cloud/doc/otc_4_import_key.gif b/cloud/open-telekom-cloud/doc/otc_4_import_key.gif similarity index 100% rename from cloud/doc/otc_4_import_key.gif rename to cloud/open-telekom-cloud/doc/otc_4_import_key.gif diff --git a/cloud/doc/otc_5_vpc_subnet.gif b/cloud/open-telekom-cloud/doc/otc_5_vpc_subnet.gif similarity index 100% rename from cloud/doc/otc_5_vpc_subnet.gif rename to cloud/open-telekom-cloud/doc/otc_5_vpc_subnet.gif diff --git a/cloud/doc/otc_6_sec_group.gif b/cloud/open-telekom-cloud/doc/otc_6_sec_group.gif similarity index 100% rename from cloud/doc/otc_6_sec_group.gif rename to cloud/open-telekom-cloud/doc/otc_6_sec_group.gif diff --git a/cloud/doc/putty_agent_forwarding.png b/cloud/open-telekom-cloud/doc/putty_agent_forwarding.png similarity index 100% rename from cloud/doc/putty_agent_forwarding.png rename to cloud/open-telekom-cloud/doc/putty_agent_forwarding.png