Merge branch 'rel-10_1' into rel-11_0

RotherOSS · Aug 2, 2024 · 59bff37 · 59bff37
2 parents 5484cb8 + 89251ba
commit 59bff37
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/.bash_completion b/.bash_completion
@@ -1,6 +1,6 @@
 # --
 # Copyright (C) 2001-2020 OTRS AG, https://otrs.com/
-# Copyright (C) 2019-2024 Rother OSS GmbH, https://otobo.de/
+# Copyright (C) 2019-2024 Rother OSS GmbH, https://otobo.io/
 # --
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU AFFERO General Public License as published by

diff --git a/.screenrc b/.screenrc
@@ -1,5 +1,5 @@
 # --
-# Copyright (C) 2019-2024 Rother OSS GmbH, https://otobo.de/
+# Copyright (C) 2019-2024 Rother OSS GmbH, https://otobo.io/
 # --
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU AFFERO General Public License as published by

diff --git a/bin/docker/quick_setup.pl b/bin/docker/quick_setup.pl
@@ -140,7 +140,7 @@ sub Main {
     my $AddCustomerUser       = 0;                         # must be explicitly enabled
     my $AddCalendar           = 0;                         # must be explicitly enabled
     my $HttpType              = 'https';                   # the SysConfig setting HttpType
-    my $FQDN                  = 'yourhost.example.com';    # the SysConfig setting HttpType
+    my $FQDN                  = 'yourhost.example.com';    # the SysConfig setting FQDN
     my $ActivateSyncWithS3    = 0;                         # activate S3 in the SysConfig, still experimental
 
     GetOptions(
@@ -245,7 +245,8 @@ sub Main {
 
     {
         my ( $Success, $Message ) = SetRootAtLocalhostPassword(
-            HTTPPort => $HTTPPort
+            HTTPPort => $HTTPPort,
+            FQDN     => $FQDN,
         );
 
         say $Message if defined $Message;
@@ -321,7 +322,8 @@ sub Main {
 
     if ($AddUser) {
         my ( $Success, $Message ) = AddUser(
-            HTTPPort => $HTTPPort
+            HTTPPort => $HTTPPort,
+            FQDN     => $FQDN,
         );
 
         say $Message if defined $Message;
@@ -331,7 +333,8 @@ sub Main {
 
     if ($AddAdminUser) {
         my ( $Success, $Message ) = AddAdminUser(
-            HTTPPort => $HTTPPort
+            HTTPPort => $HTTPPort,
+            FQDN     => $FQDN,
         );
 
         say $Message if defined $Message;
@@ -341,7 +344,8 @@ sub Main {
 
     if ($AddCustomerUser) {
         my ( $Success, $Message ) = AddCustomerUser(
-            HTTPPort => $HTTPPort
+            HTTPPort => $HTTPPort,
+            FQDN     => $FQDN,
         );
 
         say $Message if defined $Message;
@@ -631,7 +635,7 @@ sub SetRootAtLocalhostPassword {
     return 0, 'Password for root@localhost could not be set' unless $Success;
 
     # Protocol http is fine, as there is an automatic redirect
-    return 1, "Agent: http://localhost:$Param{HTTPPort}/otobo/index.pl user: root\@localhost pw: $Password";
+    return 1, "Agent: http://$Param{FQDN}:$Param{HTTPPort}/otobo/index.pl user: root\@localhost pw: $Password";
 }
 
 # update sysconfig settings in the database and deploy these settings
@@ -823,7 +827,7 @@ sub AddUser {
     }
 
     # looks good
-    return 1, "Sample user: http://localhost:$Param{HTTPPort}/otobo/index.pl user: $Login pw: $Login";
+    return 1, "Sample user: http://$Param{FQDN}:$Param{HTTPPort}/otobo/index.pl user: $Login pw: $Login";
 }
 
 sub AddAdminUser {
@@ -895,7 +899,7 @@ sub AddAdminUser {
     );
 
     # looks good
-    return 1, "Admin user: http://localhost:$Param{HTTPPort}/otobo/index.pl user: $Login pw: $Login";
+    return 1, "Admin user: http://$Param{FQDN}:$Param{HTTPPort}/otobo/index.pl user: $Login pw: $Login";
 }
 
 sub AddCustomerUser {
@@ -958,7 +962,7 @@ sub AddCustomerUser {
     return 0, "Could not set the password for $Login" unless $PasswordSetSuccess;
 
     # looks good
-    return 1, "Customer: http://localhost:$Param{HTTPPort}/otobo/customer.pl user: $Login pw: $Login";
+    return 1, "Customer: http://$Param{FQDN}:$Param{HTTPPort}/otobo/customer.pl user: $Login pw: $Login";
 }
 
 sub AddCalendar {