WIP: allow default settings to be defined in an override file.

WIP: allow default settings to be defined in an override file.

Author: pstaabp

.gitignore

@@ -31,6 +31,7 @@ conf/webwork3*.yml
 conf/apache2/webwork3-apache2.conf
 conf/apache2/webwork3.service
 conf/apache2/renderer.service
+conf/course_settings.yml
 
 # Devel::Cover
 cover_db/

conf/course_settings.yml conf/course_settings.dist.ymlconf/course_settings.yml renamed to conf/course_settings.dist.yml

@@ -72,6 +72,7 @@ sub checkTimeZone ($c) {
 	} catch {
 		$c->render(json => { valid_timezone => false });
 	};
+	return;
 }
 
 1;

lib/WeBWorK3/Controller/Settings.pm

@@ -180,7 +180,9 @@ for my $setting (@$global_settings) {
 
 # Ensure that booleans in the YAML file are loaded correctly.
 local $YAML::XS::Boolean = "JSON::PP";
-my $global_settings_from_file = LoadFile("$main::ww3_dir/conf/course_settings.yml");
+my $settings_file = "$main::ww3_dir/conf/course_settings.yml";
+$settings_file = "$main::ww3_dir/conf/course_settings.dist.yml" unless -r $settings_file;
+my $global_settings_from_file = LoadFile($settings_file);
 
 # sort each of these for comparison
 my @global_settings           = sort { $a->{setting_name} cmp $b->{setting_name} } @$global_settings;

t/db/002_course_settings.t

@@ -85,7 +85,10 @@ sub addCourses {
 
 sub addSettings {
 	say 'adding default settings' if $verbose;
+
 	my $settings_file = "$main::ww3_dir/conf/course_settings.yml";
+	$settings_file = "$main::ww3_dir/conf/course_settings.dist.yml" unless -r $settings_file;
+	say $settings_file;
 	die "The default settings file: '$settings_file' does not exist or is not readable"
 		unless -r $settings_file;
 	my $course_settings = LoadFile($settings_file);

t/db/build_db.pl

@@ -37,7 +37,9 @@ describe('Test the settings store', () => {
 		setActivePinia(pinia);
 
 		// Load the default settings
-		const file = fs.readFileSync('conf/course_settings.yml', 'utf8');
+		let settings_file = 'conf/course_settings.yml';
+		if (!fs.existsSync(settings_file)) settings_file = 'conf/course_settings.dist.yml';
+		const file = fs.readFileSync(settings_file, 'utf8');
 		default_settings = parse(file) as ParseableGlobalSetting[];
 
 		// Fetch the course settings from the CSV file