rod.wright/OpenDRS
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 15 Wiki Activity

Incorporated changes for release 1.1.2

Browse Source
This commit is contained in:
Rod Wright
2026-02-14 11:44:10 -05:00
parent 16d1ff9bb8
commit 39931c0ca5
11 changed files with 782 additions and 545 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG
View File

@@ -62,3 +62,11 @@ Changelog
- Changed systemd ctrl-alt-del.target symlink to point to - Changed systemd ctrl-alt-del.target symlink to point to
reboot.target. reboot.target.
1.1.2 - 2021-04-28
- Added ability to export search results as a CSV file.
- Fixed bug in server-setup.sh that resulted in an incorrect install
location if the installation name was left at the default.
- Fixed bug in server-setup.sh that resulted in failure to set the
ownership of the installed server directory tree if the http
user and group names were left at the default.
- Updated and tested to support Raspberry Pi 4B hardware.

55
RPiSetup/server-setup.sh
View File

@@ -2,7 +2,7 @@
# server-setup.sh # server-setup.sh
# OpenDRS Online Discrepancy Reporting System # OpenDRS Online Discrepancy Reporting System
# Copyright (C) 2020 Rod Wright # Copyright (C) 2021 Rod Wright
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
@@ -30,10 +30,22 @@ fi
echo "It looks like you have. Continuing." echo "It looks like you have. Continuing."
echo "" echo ""
echo "" echo ""
echo "Updating Raspbian..." echo "Updating Raspberry Pi OS..."
sleep 10 sleep 10
echo ""
echo ""
echo ""
echo ""
apt update && apt dist-upgrade -y apt update && apt dist-upgrade -y
echo ""
echo ""
echo ""
echo ""
echo "...done." echo "...done."
sleep 10
echo ""
echo ""
echo ""
echo "" echo ""
echo "IMPORTANT!: Be sure to make note of usernames and passwords you provide below." echo "IMPORTANT!: Be sure to make note of usernames and passwords you provide below."
echo "You will need them later." echo "You will need them later."
@@ -43,7 +55,10 @@ echo "automatically. Choose Yes when prompted to install phpmyadmin database and
echo "generate a random password(leave the field blank)." echo "generate a random password(leave the field blank)."
echo -n "Press enter to continue." echo -n "Press enter to continue."
read continueok read continueok
sleep 10 echo ""
echo ""
echo ""
echo ""
apt install -y apache2 php php-mcrypt mariadb-server phpmyadmin uuid-runtime apt install -y apache2 php php-mcrypt mariadb-server phpmyadmin uuid-runtime
cp etc/apache2/mods-available/alias.conf /etc/apache2/mods-available cp etc/apache2/mods-available/alias.conf /etc/apache2/mods-available
service apache2 restart service apache2 restart
@@ -54,6 +69,10 @@ echo "Configuring the mysql installation. Accept the defaults at the following p
echo "Remember the password you set here. You'll need it during the OpenDRS install." echo "Remember the password you set here. You'll need it during the OpenDRS install."
echo -n "Press enter to proceed." echo -n "Press enter to proceed."
read continueok read continueok
echo ""
echo ""
echo ""
echo ""
mysql_secure_installation mysql_secure_installation
mysql mysql -e "update user set plugin='';flush privileges;" mysql mysql -e "update user set plugin='';flush privileges;"
echo "" echo ""
@@ -94,9 +113,15 @@ echo "What would you like to call this installation of OpenDRS? If you accept"
echo "the default, it will be called $inst_name. If you will be running multiple" echo "the default, it will be called $inst_name. If you will be running multiple"
echo "instances of OpenDRS on this server, you should choose a distinctive name." echo "instances of OpenDRS on this server, you should choose a distinctive name."
echo -n "Installation name [$inst_name]: " echo -n "Installation name [$inst_name]: "
read inst_name read inst_name_in
if [ "$inst_name_in" != "" ]
then
inst_name=$inst_name_in
fi
echo ""
echo ""
echo ""
echo "" echo ""
# Create initial database # Create initial database
db_create_fail=1 db_create_fail=1
while [ $db_create_fail -eq 1 ] while [ $db_create_fail -eq 1 ]
@@ -156,7 +181,17 @@ export MYSQL_PWD="$drs_pass"
mysql -u"$drs_user" $new_db_name -e "update config set value=\"$inst_name\",defaultvalue=\"$inst_name\" where name=\"app_name\"" mysql -u"$drs_user" $new_db_name -e "update config set value=\"$inst_name\",defaultvalue=\"$inst_name\" where name=\"app_name\""
# Create install path # Create install path
echo ""
echo ""
echo ""
echo ""
echo "Creating installation directory . . ." echo "Creating installation directory . . ."
echo ""
echo ""
echo ""
echo ""
echo "Installing to $docroot_path/$inst_name"
sleep 10
install_path=$docroot_path/$inst_name install_path=$docroot_path/$inst_name
mkdir $install_path mkdir $install_path
@@ -173,6 +208,10 @@ fi
echo "Installing distribution . . ." echo "Installing distribution . . ."
cp -Rv ../distfiles/* $install_path cp -Rv ../distfiles/* $install_path
ln -s $install_path/writeups.php $install_path/index.php ln -s $install_path/writeups.php $install_path/index.php
echo ""
echo ""
echo ""
echo ""
# set ownership # set ownership
echo "In order to set the ownership correctly, we need to know the user and" echo "In order to set the ownership correctly, we need to know the user and"
@@ -182,7 +221,11 @@ echo "your webserver's document tree to see what this should be."
echo "Enter the user and group separated by a colon (username:groupname)." echo "Enter the user and group separated by a colon (username:groupname)."
echo "Enter the user:group of the OpenDRS installation" echo "Enter the user:group of the OpenDRS installation"
echo -n "directory [$apache_user:$apache_group] :" echo -n "directory [$apache_user:$apache_group] :"
read httpd_user_group read httpd_user_group_in
if [ "$http_user_group_in" != "" ]
then
http_user_group=$http_user_group_in
fi
echo "" echo ""
echo "Setting file ownership . . ." echo "Setting file ownership . . ."
chown -R $httpd_user_group $install_path chown -R $httpd_user_group $install_path

42
RPiSetup/terminal-setup.sh
View File

@@ -2,7 +2,7 @@
# terminal-setup.sh # terminal-setup.sh
# OpenDRS Online Maintenance Tracking System # OpenDRS Online Maintenance Tracking System
# Copyright (C) 2020 Rod Wright # Copyright (C) 2021 Rod Wright
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
@@ -15,7 +15,7 @@ echo ""
echo "" echo ""
echo "You should have already completed the following steps:" echo "You should have already completed the following steps:"
echo "" echo ""
echo "1. Created a Raspbian Lite SD card from the latest release." echo "1. Created a Raspberry Pi OS Lite SD card from the latest release."
echo "2. Installed the card in a Raspberry Pi, booted it, and logged in as pi." echo "2. Installed the card in a Raspberry Pi, booted it, and logged in as pi."
echo "3. Ran sudo raspi-config and :" echo "3. Ran sudo raspi-config and :"
echo " a. Set a strong password for the pi user." echo " a. Set a strong password for the pi user."
@@ -30,27 +30,48 @@ echo " f. Reboot when prompted and logged back in as pi."
echo "4. Transferred the OpenDRS distribution package to /home/pi on the" echo "4. Transferred the OpenDRS distribution package to /home/pi on the"
echo " Raspberry Pi and extracted it." echo " Raspberry Pi and extracted it."
echo "5. Changed directory to RPiSetup in the the extracted distribution directory." echo "5. Changed directory to RPiSetup in the the extracted distribution directory."
echo "6. Ran sudo ./terminal-setup.sh (this file)."
echo "" echo ""
echo "If you have completed these steps, press enter to continue. If not," echo "If you have completed these steps, press enter to continue. If not,"
echo -n "press ctrl-c to quit." echo -n "press ctrl-c to quit."
read continueok read continueok
echo "" echo ""
echo "" echo ""
echo "Updating Raspbian..." echo ""
echo ""
echo "Updating Raspberry Pi OS..."
sleep 10 sleep 10
echo ""
echo ""
echo ""
echo ""
apt update && apt dist-upgrade -y apt update && apt dist-upgrade -y
echo ""
echo ""
echo ""
echo ""
echo "...done." echo "...done."
sleep 10
echo ""
echo ""
echo "Copying files..." echo "Copying files..."
chmod +x usr/local/bin/* chmod +x usr/local/bin/*
cp usr/local/bin/* /usr/local/bin cp usr/local/bin/* /usr/local/bin
cp etc/apt/sources.list.d/* /etc/apt/sources.list.d cp etc/apt/sources.list.d/* /etc/apt/sources.list.d
cp lib/systemd/system/getty@tty1.service /lib/systemd/system cp lib/systemd/system/getty@tty1.service /lib/systemd/system
echo ""
echo ""
echo ""
echo ""
echo "...done." echo "...done."
sleep 10
echo "" echo ""
echo "" echo ""
echo "Installing required terminal packages..." echo "Installing required terminal packages..."
sleep 10 sleep 10
echo ""
echo ""
echo ""
echo ""
wget http://www.webmin.com/jcameron-key.asc wget http://www.webmin.com/jcameron-key.asc
apt-key add jcameron-key.asc apt-key add jcameron-key.asc
rm jcameron-key.asc rm jcameron-key.asc
@@ -68,6 +89,10 @@ cd brlaser-master
cmake . && make && make install cmake . && make && make install
cd .. cd ..
myhn=`hostname` myhn=`hostname`
echo ""
echo ""
echo ""
echo ""
echo "Drivers have been installed for the Brother HL-L2300D printer that may come" echo "Drivers have been installed for the Brother HL-L2300D printer that may come"
echo "with the terminal." echo "with the terminal."
echo "After the terminal is set up and working, you can use another network" echo "After the terminal is set up and working, you can use another network"
@@ -78,11 +103,20 @@ read continueok
echo "" echo ""
echo "" echo ""
echo "Creating customer user..." echo "Creating customer user..."
sleep 10
echo ""
echo ""
echo ""
echo ""
cloneuser `who am i | awk '{print $1}'` customer cloneuser `who am i | awk '{print $1}'` customer
mkdir -p /home/customer/.config/openbox mkdir -p /home/customer/.config/openbox
cp home/customer/.profile /home/customer cp home/customer/.profile /home/customer
cp home/customer/.config/openbox/rc.xml /home/customer/.config/openbox cp home/customer/.config/openbox/rc.xml /home/customer/.config/openbox
chown -R customer:customer /home/customer/.config /home/customer/.profile chown -R customer:customer /home/customer/.config /home/customer/.profile
echo ""
echo ""
echo ""
echo ""
echo "...done." echo "...done."
echo "" echo ""
echo "" echo ""

28
RaspberryPiSetup.txt
View File

@@ -1,6 +1,6 @@
Raspberry Pi setup Raspberry Pi setup
1. Create Raspbian Lite SD card from the most recent stable release. 1. Create Raspberry Pi OS Lite SD card from the most recent stable release.
2. Insert SD card in Raspberry Pi and boot. 2. Insert SD card in Raspberry Pi and boot.
@@ -8,24 +8,24 @@ Raspberry Pi setup
4. sudo raspi-config and: 4. sudo raspi-config and:
a. Use option 1 to set a strong password for the default user (pi). a. Set a strong password for the default user (pi).
b. Use option 2 Network Options to: b. Set the desired hostname.
1. Set the desired hostname.
2. Set WiFi SSID and passphrase if using WiFi for networking.
c. Use option 4 Localisation Options to: c. Set Wireless LAN SSID and passphrase if using WiFi for networking.
1. Set locale.
c. Use Localisation Options to:
1. Set locale to en_US.UTF-8 UTF-8.
2. Set timezone. 2. Set timezone.
3. Set keyboard layout (IMPORTANT! Raspbian is made in England, so 3. Set keyboard layout (IMPORTANT! Raspberry Pi OS is made in
unless that's the kind of keyboard you have, the default layout England, so unless that's the kind of keyboard you have, the
will make your symbols come out wrong!). default layout will make your symbols come out wrong!).
4. Set WiFi country. 4. Set WLAN country.
d. Use option 5 Interfacing Options to enable SSH server. d. Use Interfacing Options to enable SSH server.
e. If you have black borders on the sides of the screen, use option 7 e. If you have black borders on the sides of the screen, use Display
Advanced Options to select No for Overscan compensation. Underscan option to change Overscan compensation.
f. When you've finished, tab down to highlight Finish and hit enter. f. When you've finished, tab down to highlight Finish and hit enter.

2
boilerplate.php
View File

@@ -48,7 +48,7 @@ if ($print=="Printer Friendly") {
$mbgcolor=MENUBG_COLOR; $mbgcolor=MENUBG_COLOR;
} }
$role=dblookup($mts_db,"users","id","role",$userid); $role=dblookup($drs_db,"users","id","role",$userid);
framework("begin","$appname","Boilerplate Page",$print); framework("begin","$appname","Boilerplate Page",$print);

9
distfiles/CHANGELOG
View File

@@ -61,3 +61,12 @@ Changelog
chromium hotkey combinations and enable ctrl-alt-del reboot. chromium hotkey combinations and enable ctrl-alt-del reboot.
- Changed systemd ctrl-alt-del.target symlink to point to - Changed systemd ctrl-alt-del.target symlink to point to
reboot.target. reboot.target.
1.1.2 - 2021-04-28
- Added ability to export search results as a CSV file.
- Fixed bug in server-setup.sh that resulted in an incorrect install
location if the installation name was left at the default.
- Fixed bug in server-setup.sh that resulted in failure to set the
ownership of the installed server directory tree if the http
user and group names were left at the default.
- Updated and tested to support Raspberry Pi 4B hardware.

1
distfiles/common.php
View File

@@ -807,5 +807,4 @@ function group_table($groupid,$role=false,$mode="view",$selection="none",$expand
} }
?> ?>

1171
distfiles/search.php
View File

File diff suppressed because it is too large Load Diff

4
install.sh
View File

@@ -2,12 +2,12 @@
# install.sh # install.sh
# OpenDRS Online Discrepancy Reporting System # OpenDRS Online Discrepancy Reporting System
# Copyright (C) 2020 Rod Wright # Copyright (C) 2021 Rod Wright
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
DRS_VERSION="1.1.1" DRS_VERSION="1.1.2"
DOC_ROOT="/var/www" DOC_ROOT="/var/www"
INSTALL_LOC="opendrs" INSTALL_LOC="opendrs"
APACHE_USER="www-data" APACHE_USER="www-data"

2
opendrs-initial.sql
View File

@@ -63,7 +63,7 @@ CREATE TABLE `config` (
LOCK TABLES `config` WRITE; LOCK TABLES `config` WRITE;
/*!40000 ALTER TABLE `config` DISABLE KEYS */; /*!40000 ALTER TABLE `config` DISABLE KEYS */;
INSERT INTO `config` VALUES (1,'drs_version','1.1.1','1.1.1'),(5,'app_name','OpenDRS - Discrepancy Reporting System','OpenDRS Discrepancy Reporting System'),(6,'banner','1','1'),(7,'background_color','0B3144','0B3144'),(8,'p_background_color','FFFFFF','FFFFFF'),(11,'menubg_color','000000','000000'),(12,'p_menubg_color','FFFFFF','FFFFFF'),(13,'text_color','FFFFFF','FFFFFF'),(14,'p_text_color','000000','000000'),(15,'link_color','79EFEA','79EFEA'),(16,'p_link_color','000000','000000'),(17,'vlink_color','79EFEA','79EFEA'),(18,'p_vlink_color','000000','000000'),(19,'heading_color','5AE2B3','5AE2B3'),(20,'p_heading_color','000000','000000'),(21,'footer_message','Please report bugs to Rod Wright (software@rodsplace.net)','Please report bugs to Rod Wright (software@rodsplace.net)'),(26,'unix_server_session_dir','/tmp/opendrs/opendrs/sessions','/tmp/opendrs/opendrs/sessions'),(27,'win_server_session_dir','c:\\Windows\\Temp\\opendrs\\opendrs\\sessions','c:\\Windows\\Temp\\opendrs\\opendrs\\sessions'),(28,'session_ttl_days','30','30'),(29,'period_eff_help_txt','If maintenance issues prevented the training objectives from being achieved and you will have to come back and redo the same training, answer Non-effective. Otherwise, answer Effective.','If maintenance issues prevented the training objectives from being achieved and you will have to come back and redo the same training, answer Non-effective. Otherwise, answer Effective.'); INSERT INTO `config` VALUES (1,'drs_version','1.1.2','1.1.2'),(5,'app_name','OpenDRS - Discrepancy Reporting System','OpenDRS Discrepancy Reporting System'),(6,'banner','1','1'),(7,'background_color','0B3144','0B3144'),(8,'p_background_color','FFFFFF','FFFFFF'),(11,'menubg_color','000000','000000'),(12,'p_menubg_color','FFFFFF','FFFFFF'),(13,'text_color','FFFFFF','FFFFFF'),(14,'p_text_color','000000','000000'),(15,'link_color','79EFEA','79EFEA'),(16,'p_link_color','000000','000000'),(17,'vlink_color','79EFEA','79EFEA'),(18,'p_vlink_color','000000','000000'),(19,'heading_color','5AE2B3','5AE2B3'),(20,'p_heading_color','000000','000000'),(21,'footer_message','Please report bugs to Rod Wright (software@rodsplace.net)','Please report bugs to Rod Wright (software@rodsplace.net)'),(26,'unix_server_session_dir','/tmp/opendrs/opendrs/sessions','/tmp/opendrs/opendrs/sessions'),(27,'win_server_session_dir','c:\\Windows\\Temp\\opendrs\\opendrs\\sessions','c:\\Windows\\Temp\\opendrs\\opendrs\\sessions'),(28,'session_ttl_days','30','30'),(29,'period_eff_help_txt','If maintenance issues prevented the training objectives from being achieved and you will have to come back and redo the same training, answer Non-effective. Otherwise, answer Effective.','If maintenance issues prevented the training objectives from being achieved and you will have to come back and redo the same training, answer Non-effective. Otherwise, answer Effective.');
/*!40000 ALTER TABLE `config` ENABLE KEYS */; /*!40000 ALTER TABLE `config` ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;

5
opendrs-update.sql
View File

@@ -34,3 +34,8 @@ UPDATE config SET defaultvalue="OpenDRS Discrepancy Reporting System" WHERE name
UPDATE config SET defaultvalue="/tmp/opendrs/opendrs/sessions" WHERE name="unix_server_session_dir"; UPDATE config SET defaultvalue="/tmp/opendrs/opendrs/sessions" WHERE name="unix_server_session_dir";
UPDATE config SET defaultvalue="c:\Windows\Temp\opendrs\opendrs\sessions" WHERE name="win_server_session_dir"; UPDATE config SET defaultvalue="c:\Windows\Temp\opendrs\opendrs\sessions" WHERE name="win_server_session_dir";
-- -------------------------------------- -- --------------------------------------
-- ---------- version 1.1.2 -------------
-- Update version number
UPDATE config SET value="1.1.2",defaultvalue="1.1.2" WHERE name="drs_version";
-- --------------------------------------