Incorporated changes for release 1.1.2

This commit is contained in:
2026-02-14 11:44:10 -05:00
parent 16d1ff9bb8
commit 39931c0ca5
11 changed files with 782 additions and 545 deletions

View File

@@ -2,7 +2,7 @@
# server-setup.sh
# OpenDRS Online Discrepancy Reporting System
# Copyright (C) 2020 Rod Wright
# Copyright (C) 2021 Rod Wright
# SPDX-License-Identifier: GPL-2.0
@@ -30,10 +30,22 @@ fi
echo "It looks like you have. Continuing."
echo ""
echo ""
echo "Updating Raspbian..."
echo "Updating Raspberry Pi OS..."
sleep 10
echo ""
echo ""
echo ""
echo ""
apt update && apt dist-upgrade -y
echo ""
echo ""
echo ""
echo ""
echo "...done."
sleep 10
echo ""
echo ""
echo ""
echo ""
echo "IMPORTANT!: Be sure to make note of usernames and passwords you provide below."
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 -n "Press enter to continue."
read continueok
sleep 10
echo ""
echo ""
echo ""
echo ""
apt install -y apache2 php php-mcrypt mariadb-server phpmyadmin uuid-runtime
cp etc/apache2/mods-available/alias.conf /etc/apache2/mods-available
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 -n "Press enter to proceed."
read continueok
echo ""
echo ""
echo ""
echo ""
mysql_secure_installation
mysql mysql -e "update user set plugin='';flush privileges;"
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 "instances of OpenDRS on this server, you should choose a distinctive 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 ""
# Create initial database
db_create_fail=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\""
# Create install path
echo ""
echo ""
echo ""
echo ""
echo "Creating installation directory . . ."
echo ""
echo ""
echo ""
echo ""
echo "Installing to $docroot_path/$inst_name"
sleep 10
install_path=$docroot_path/$inst_name
mkdir $install_path
@@ -173,6 +208,10 @@ fi
echo "Installing distribution . . ."
cp -Rv ../distfiles/* $install_path
ln -s $install_path/writeups.php $install_path/index.php
echo ""
echo ""
echo ""
echo ""
# set ownership
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:group of the OpenDRS installation"
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 "Setting file ownership . . ."
chown -R $httpd_user_group $install_path

View File

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