Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move database and external program settings #2338

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from

Conversation

pstaabp
Copy link
Member

@pstaabp pstaabp commented Feb 24, 2024

This PR

  • moves database and external program settings in both site.conf and defaults.config to webwork2.mojolicious.yml
  • moves code from database.conf.dist to WeBWorK::DB::Utils
  • loads these settings into the CourseEnvironment.

These settings will be loaded after simple.conf and course.conf so instructors will not be able to override these settings.

Copy link
Member

@drgrice1 drgrice1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs a lot of work to be acceptable.

conf/README.md Outdated Show resolved Hide resolved
lib/WeBWorK/CourseEnvironment.pm Outdated Show resolved Hide resolved
conf/webwork2.mojolicious.dist.yml Outdated Show resolved Hide resolved
lib/WeBWorK/DB/Utils.pm Outdated Show resolved Hide resolved
conf/defaults.config Show resolved Hide resolved
conf/site.conf.dist Outdated Show resolved Hide resolved
conf/defaults.config Outdated Show resolved Hide resolved
conf/defaults.config Outdated Show resolved Hide resolved
@pstaabp pstaabp force-pushed the remove-database-conf branch 2 times, most recently from 1dfc58e to efc71d0 Compare March 2, 2024 12:31
@pstaabp
Copy link
Member Author

pstaabp commented Mar 2, 2024

This removes all references to dbLayoutName and cases where the dbLayouts hash is used. With this, there is only the standard dbLayout, which is now defined in WeBWorK::DB::Layout.

Also, removed the older style unarchive database archive file. It was unclear when this was last in the codebase, probably > 10 years.

@pstaabp pstaabp force-pushed the remove-database-conf branch 2 times, most recently from 783dbb2 to 2103368 Compare March 22, 2024 11:01
@Alex-Jordan
Copy link
Contributor

Note conflicts here now from a recent merge.

pstaabp added 3 commits March 23, 2024 07:47
This moves database and external program settings to webwork2.mojolicious.yml, moves code from database.conf.dist to
WeBWorK::DB::Utils and load these settings into the CourseEnvironment.
This removes all references to dbLayoutName and cases where the dbLayouts hash is used.

With this, there is only the standard dbLayout, which is now defined in `WeBWorK::DB::Layout`.
@pstaabp pstaabp force-pushed the remove-database-conf branch from 2103368 to 58fa953 Compare March 23, 2024 11:48
@pstaabp
Copy link
Member Author

pstaabp commented Mar 23, 2024

Fixed now.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants