move settings from site.conf to webwork2.mojolicious.yml

Author: pstaabp

Dockerfile

@@ -244,7 +244,7 @@ COPY docker-config/docker-entrypoint.sh /usr/local/bin/
 
 ENTRYPOINT ["docker-entrypoint.sh"]
 
-# Add enviroment variables to control some things during container startup
+# Add environment variables to control some things during container startup
 ENV SSL=0 \
 	PAPERSIZE=letter \
 	SYSTEM_TIMEZONE=UTC \

DockerfileStage2

@@ -106,7 +106,7 @@ COPY docker-config/docker-entrypoint.sh /usr/local/bin/
 
 ENTRYPOINT ["docker-entrypoint.sh"]
 
-# Add enviroment variables to control some things during container startup
+# Add environment variables to control some things during container startup
 ENV SSL=0 \
 	PAPERSIZE=letter \
 	SYSTEM_TIMEZONE=UTC \

conf/README.md

@@ -9,8 +9,6 @@ are made to `.dist` files, then the modifications will be lost or cause conflict
 
 Basic webwork2 configuration files.
 
-- `site.conf.dist` should be copied to `site.conf`, and contains global variables required for basic server
-  configuration. This file is read first in the initialization sequence.
 - `defaults.config` contains initial settings for many customizable options in WeBWorK. This file is read second in the
   initialization sequence. **This file should not be changed**
 - `localOverrides.conf.dist` should be copied to `localOverrides.conf`. `localOverrides.conf` will be read after the
@@ -29,8 +27,7 @@ Configuration extension files.
 
 Server configuration files.
 
-- `webwork2.mojolicious.dist.yml` contains the webwork2 Mojolicious app configuration settings. Copy this file to
-  `webwork2.mojolicious.yml` if you need to change those settings. You usually will need to do this.
+- `webwork2.mojolicious.dist.yml` contains the webwork2 Mojolicious app configuration settings.
 - `webwork2.dist.service` is a systemd configuration file for linux systems that serves the webwork2 app via the
   Mojolicious hypnotoad server. If you need to change it, then copy it to `webwork2.service`.
 - `webwork2-job-queue.dist.service` is a systemd configuration file for linux systems that runs the webwork2 job queue
@@ -42,8 +39,9 @@ Server configuration files.
 
 ## Initial configururation of webwork2
 
-- Copy `site.conf.dist` to `site.conf` and `localOverrides.conf.dist` to `localOverrides.conf`, and adjust the variables
-  in `site.conf` as needed. In particular you will need to set `$server_root_url` to the server name, and set
+- Copy `webwork2.mojolicious.dist.yml` to `webwork2.mojolicious.yml` and change appropriate settings.
+- Copy `localOverrides.conf.dist` to `localOverrides.conf`, and adjust the variables
+  as needed. In particular you will need to set `$server_root_url` to the server name, and set
   `$database_password` to the password for the database.
 - Adjust the variables in `localOverrides.conf` to customize your server for your needs.
 - Copy any of the other `.dist` files and adjust the variables in them as needed. Note that those files will need to be

conf/defaults.config

@@ -14,7 +14,7 @@
 #ScriptAliasMatch /webwork2_course_files/([^/]*)/show-source.cgi/(.*) /opt/webwork/courses/$1/html/show-source.cgi/$2
 #ProxyPassMatch /webwork2_course_files/([^/]*)/show-source.cgi/(.*) !
 
-# Note that if $webwork_url in site.conf is changed, then /webwork2
+# Note that if $webwork_url in webwork2.mojolicious.yml is changed, then /webwork2
 # should be changed below to match.
 <Proxy /webwork2/*>
 	Require all granted
@@ -32,23 +32,23 @@ ProxyPassReverse /webwork2/* http://localhost:8080/webwork2/
 	RequestHeader set X-Forwarded-Proto "https"
 </Location>
 
-# Note that if $webwork_htdocs_url in site.conf is changed, then /webwork2_files
+# Note that if $webwork_htdocs_url in webwork2.mojolicious.yml is changed, then /webwork2_files
 # should be changed below to match.
 <Proxy /webwork2_files/*>
 	Require all granted
 </Proxy>
 ProxyRequests Off
 ProxyPass /webwork2_files http://localhost:8080/webwork2_files keepalive=On
 
-# Note that if $pg_htdocs_url in site.conf is changed, then /pg_files
+# Note that if $pg_htdocs_url in webwork2.mojolicious.yml is changed, then /pg_files
 # should be changed below to match.
 <Proxy /pg_files/*>
 	Require all granted
 </Proxy>
 ProxyRequests Off
 ProxyPass /pg_files http://localhost:8080/pg_files keepalive=On
 
-# Note that if $webwork_courses_url in site.conf is changed, then /pg_files
+# Note that if $webwork_courses_url in webwork2.mojolicious.yml is changed, then /pg_files
 # should be changed below to match.
 <Proxy /webwork2_course_files/*>
 	Require all granted