make -jjjj and -jjjjj path configurable

linuxmuster · Aug 11, 2022 · 4af1ad7 · 4af1ad7
1 parent da4ded2
commit 4af1ad7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/sophomorix-samba/config-devel/sophomorix.ini b/sophomorix-samba/config-devel/sophomorix.ini
@@ -68,6 +68,7 @@
         GPO_PRINTERS_TEMPLATE_PRE = /usr/share/sophomorix/devel/gpo/Printers.xml.template.pre
         GPO_PRINTERS_TEMPLATE_POST = /usr/share/sophomorix/devel/gpo/Printers.xml.template.post
         GPO_PRINTERS_TARGET_DIR = /var/lib/sophomorix/gpo/school
+        JSON_OUTPUT_PATH = /tmp
 
 [USERLOG]
 	USER_LOGDIR = /var/log/sophomorix/userlog

diff --git a/sophomorix-samba/modules/SophomorixBase.pm b/sophomorix-samba/modules/SophomorixBase.pm
@@ -406,23 +406,23 @@ sub json_dump {
         &print_title("DUMP: $jsoncomment");
         print {$ref_sophomorix_config->{'INI'}{'VARS'}{'JSON_PRINTOUT'}} Dumper( $hash_ref );
     } elsif ($json==4){
-        # pretty output
+        # pretty output in file
         $hash_ref->{'JSONINFO'}=$jsoninfo;
         $hash_ref->{'JSONCOMMENT'}=$jsoncomment;
         my $json_obj = JSON->new->allow_nonref;
         my $utf8_pretty_printed = $json_obj->pretty->encode( $hash_ref );
-        my $output="/root/output.json";
+        my $output=$ref_sophomorix_config->{'INI'}{'PATHS'}{'JSON_OUTPUT_PATH'}."/output.json";
 	print "output to file $output\n";
         open(my $fh, ">", $output);
         print $fh $utf8_pretty_printed;
         close($fh);
     } elsif ($json==5){
-        # pretty output
+        # compact output in file
         $hash_ref->{'JSONINFO'}=$jsoninfo;
         $hash_ref->{'JSONCOMMENT'}=$jsoncomment;
         my $json_obj = JSON->new->allow_nonref;
         my $utf8_json_line   = $json_obj->encode( $hash_ref  );
-        my $output="/root/output.json";
+        my $output=$ref_sophomorix_config->{'INI'}{'PATHS'}{'JSON_OUTPUT_PATH'}."/output.json";
 	print "output to file $output\n";
         open(my $fh, ">", $output);
         print $fh $utf8_json_line;
@@ -6156,6 +6156,9 @@ sub create_plain_password {
             }
 	    #print "Password to test: $password\n";
         }
+	if (not $password=~m/[a-z]/){
+	    print "Password contains no small letters\n";
+	}
     }
     #print "Password OK: $password\n";
     return $password;