Merge branch 'master' into production

send/affiliation_mapping

@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="affiliation_mapping"
+export SERVICE_NAME="affiliation_mapping"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/affiliation_mapping_mu

@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="affiliation_mapping_mu"
+export SERVICE_NAME="affiliation_mapping_mu"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/afs

@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="afs"
+export SERVICE_NAME="afs"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/afs_group

@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="afs_group"
+export SERVICE_NAME="afs_group"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/apache_basic_auth

@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="apache_basic_auth"
+export SERVICE_NAME="apache_basic_auth"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/arcgis_licenses_mu

@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="arcgis_licenses_mu"
+export SERVICE_NAME="arcgis_licenses_mu"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/arcgis_mu

@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="arcgis_mu"
+export SERVICE_NAME="arcgis_mu"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/ceitec_proteomics

@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="ceitec_proteomics"
+export SERVICE_NAME="ceitec_proteomics"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/drupal_elixir

@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="drupal_elixir"
+export SERVICE_NAME="drupal_elixir"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/du_info_export

@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="du_info_export"
+export SERVICE_NAME="du_info_export"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/du_users_export

@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="du_users_export"
+export SERVICE_NAME="du_users_export"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/eduroam_block

@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="eduroam_block"
+export SERVICE_NAME="eduroam_block"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/eduroam_radius

@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="eduroam_radius"
+export SERVICE_NAME="eduroam_radius"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/fbmi_doors

@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="fbmi_doors"
+export SERVICE_NAME="fbmi_doors"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/fs_home

@@ -1,5 +1,4 @@
-#!/bin/bash 
+#!/bin/bash
+export SERVICE_NAME="fs_home"
 
-SERVICE_NAME="fs_home"
-
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/fs_home_mu

@@ -1,5 +1,4 @@
-#!/bin/bash 
+#!/bin/bash
+export SERVICE_NAME="fs_home_mu"
 
-SERVICE_NAME="fs_home_mu"
-
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/fs_project

@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="fs_project"
+export SERVICE_NAME="fs_project"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/fs_quotas

@@ -1,5 +1,4 @@
-#!/bin/bash 
+#!/bin/bash
+export SERVICE_NAME="fs_quotas"
 
-SERVICE_NAME="fs_quotas"
-
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/fs_replicas

@@ -1,5 +1,4 @@
-#!/bin/bash 
+#!/bin/bash
+export SERVICE_NAME="fs_replicas"
 
-SERVICE_NAME="fs_replicas"
-
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/fs_scratch

@@ -1,4 +1,4 @@
-#!/bin/bash 
-SERVICE_NAME="fs_scratch"
+#!/bin/bash
+export SERVICE_NAME="fs_scratch"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/fs_scratch_local

@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="fs_scratch_local"
+export SERVICE_NAME="fs_scratch_local"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/generic_send.py

@@ -4,7 +4,7 @@
 import tempfile
 import re
 
-timeout = "5400"  # 90s * 60 sec = 1.5h
+timeout = "7200"  # 120 * 60 sec = 2h
 timeout_kill = "60"  # 60 sec to kill after timeout
 
 perun_cert = "/etc/perun/ssl/perun-send.pem"

send/group

@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="group"
+export SERVICE_NAME="group"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/group_mu

@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="group_mu"
+export SERVICE_NAME="group_mu"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/group_nfs4

@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="group_nfs4"
+export SERVICE_NAME="group_nfs4"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/hadoop_hbase

@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="hadoop_hbase"
+export SERVICE_NAME="hadoop_hbase"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/hadoop_hdfs

@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="hadoop_hdfs"
+export SERVICE_NAME="hadoop_hdfs"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/k5login

@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="k5login"
+export SERVICE_NAME="k5login"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/k5login_generic

@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="k5login_generic"
+export SERVICE_NAME="k5login_generic"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/k5login_root

@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="k5login_root"
+export SERVICE_NAME="k5login_root"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/kerberos_renewal_principals

@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="kerberos_renewal_principals"
+export SERVICE_NAME="kerberos_renewal_principals"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/ldap

@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="ldap"
+export SERVICE_NAME="ldap"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/ldap_vsb_vi

@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="ldap_vsb_vi"
+export SERVICE_NAME="ldap_vsb_vi"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/mailaliases

@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="mailaliases"
+export SERVICE_NAME="mailaliases"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/mailaliases_generic

@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="mailaliases_generic"
+export SERVICE_NAME="mailaliases_generic"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/mailman

@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="mailman"
+export SERVICE_NAME="mailman"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/mailman_cesnet

@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="mailman_cesnet"
+export SERVICE_NAME="mailman_cesnet"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/mailman_cesnet_user_mail

@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="mailman_cesnet_user_mail"
+export SERVICE_NAME="mailman_cesnet_user_mail"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/mailman_elixir

@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="mailman_elixir"
+export SERVICE_NAME="mailman_elixir"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/mailman_mu

@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="mailman_mu"
+export SERVICE_NAME="mailman_mu"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/mailman_owners

@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="mailman_owners"
+export SERVICE_NAME="mailman_owners"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/o365_mu_process.pl

@@ -251,7 +251,7 @@
 				#exception means a problem, return an error, do not add to the cache
 				if($exception) {
 					my $exceptionType = $resultUser->{'ExceptionType'};
-					print "WARNING - User with ID $key was not processed properly due to: " . $exceptionType . " -- " . $exception . "\n";
+					print STDERR "WARNING - User with ID $key was not processed properly due to: " . $exceptionType . " -- " . $exception . "\n";
 					$failedUsers++;
 					$returnCode = 1;
 				} else {
@@ -262,7 +262,7 @@
 				}
 			} else {
 				#if user was not processed at all, it is also an error, do not add to the cache
-				print "WARNING - User with ID $key was timeouted (not processed).\n";
+				print STDERR "WARNING - User with ID $key was timeouted (not processed).\n";
 				$failedUsers++;
 				$returnCode = 1;
 			}
@@ -297,7 +297,7 @@
 				#exception means a problem, return an error, do not add to the cache
 				if($exception) {
 					my $exceptionType = $resultGroup->{'ExceptionType'};
-					print "WARNING - Group with ID $key was not processed properly due to: " . $exceptionType . " -- " . $exception . "\n";
+					print STDERR "WARNING - Group with ID $key was not processed properly due to: " . $exceptionType . " -- " . $exception . "\n";
 					$failedGroups++;
 					$returnCode = 1;
 				} else {
@@ -308,7 +308,7 @@
 				}
 			} else {
 				#if user was not processed at all, it is also an error, do not add to the cache
-				print "WARNING - Group with ID $key was timeouted (not processed).\n";
+				print STDERR "WARNING - Group with ID $key was timeouted (not processed).\n";
 				$failedGroups++;
 				$returnCode = 1;
 			}
@@ -474,7 +474,7 @@ sub readDataAboutUsers {
 
 		#If UPN is from any reason empty, set global return code to 1 and skip this user
 		unless($UPN) {
-			print "WARNING - Can't find UPN for user in $pathToFile for line '$line'\n";
+			print STDERR "WARNING - Can't find UPN for user in $pathToFile for line '$line'\n";
 			$returnCode = 1;
 			next;
 		}
@@ -507,7 +507,7 @@ sub readDataAboutGroups {
 
 		#If groupADName is from any reason empty, set global return code to 1 and skip this group
 		unless($line) {
-			print "WARNING - Can't find AD name of group in $pathToFile for line '$line'\n";
+			print STDERR "WARNING - Can't find AD name of group in $pathToFile for line '$line'\n";
 			$returnCode = 1;
 			next;
 		}
@@ -676,7 +676,7 @@ sub callServerForUpdate {
 
 	#0 in $counter means timeout
 	unless($counter) {
-		print "WARNING - Batch operation for command '" . $command . "' timeouted. Only '" . $processedParametersCount . "' from '" . $parametersCount . "' were processed before the timeout from Perun site.\n";
+		print STDERR "WARNING - Batch operation for command '" . $command . "' timeouted. Only '" . $processedParametersCount . "' from '" . $parametersCount . "' were processed before the timeout from Perun site.\n";
 		$returnCode = 1;
 	}
 

send/oidc_with_groups_einfra

@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="oidc_with_groups_einfra"
+export SERVICE_NAME="oidc_with_groups_einfra"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/operations_portal_egi

@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="operations_portal_egi"
+export SERVICE_NAME="operations_portal_egi"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/passwd

@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="passwd"
+export SERVICE_NAME="passwd"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/passwd_mu

@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="passwd_mu"
+export SERVICE_NAME="passwd_mu"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"

send/passwd_nfs4

@@ -1,4 +1,4 @@
 #!/bin/bash
-SERVICE_NAME="passwd_nfs4"
+export SERVICE_NAME="passwd_nfs4"
 
-. generic_send
+python3 generic_send.py "$1" "$2" "$3"