Merge branch 'master' into hpfeeds-cmd

CHANGELOG.md

@@ -6,6 +6,11 @@
   - hpfeeds config is saved in `/data/ews/conf/hpfeeds.cfg`
   - Update script restores hpfeeds config
 
+## 20190513
+- **Added Ansible T-Pot Deployment on Open Telekom Cloud**
+  - Reusable Ansible Playbooks for all cloud providers
+  - Example Showcase with our Open Telekom Cloud
+
 ## 20190511
 - **Add hptest script**
   - Quickly test if the honeypots are working with `hptest.sh <[ip,host]>` based on nmap.
@@ -39,8 +44,3 @@
   - If T-Pot, opposed to the requirements, does not have full internet access netselect-apt fails to determine the fastest mirror as it needs ICMP and UDP outgoing. Should netselect-apt fail the default mirrors will be used.
 - **Improve install speed with apt-fast**
   - Migrating from a stable base install to Debian (Sid) requires downloading lots of packages. Depending on your geo location the download speed was already improved by introducing netselect-apt to determine the fastest mirror. With apt-fast the downloads will be even faster by downloading packages not only in parallel but also with multiple connections per package.
-
-## 20190421
-- **Added Ansible T-Pot Deployment on Open Telekom Cloud**
-  - Reusable Ansible Playbooks for all cloud providers
-  - Example Showcase with our Open Telekom Cloud

cloud/open-telekom-cloud/deploy_ansible_otc_t-pot.sh

@@ -109,7 +109,9 @@ if [ $? -eq 0 ]; then
 
 else
 
-    if grep 'Flavor' otc_tools.log > /dev/null; then
+    if grep '401 Unauthorized' otc_tools.log > /dev/null; then
+        echo "### API username or password is incorrect"
+    elif grep 'Flavor' otc_tools.log > /dev/null; then
         echo "### Specified ECS Flavor not found"
     elif grep 'No image found by name' otc_tools.log > /dev/null; then
         echo "### Specified Image not found"