Compare commits
5 Commits
v1.3.2-dev
...
v1.4.2-dev
| Author | SHA1 | Date | |
|---|---|---|---|
| 97249aa600 | |||
| 89f7506fa7 | |||
| 4d95710f43 | |||
| eb8829af47 | |||
| 09155561f8 |
47
CHANGELOG
47
CHANGELOG
@@ -1,5 +1,5 @@
|
||||
OpenDRS - Online Discrepancy Reporting System
|
||||
Copyright (C) 2022 Rod Wright
|
||||
Copyright (C) 2024 Rod Wright
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@@ -123,3 +123,48 @@ Changelog
|
||||
- Chromium browser will use the printer designated as the local
|
||||
default if it is selected as such in the Cups printer
|
||||
configuration.
|
||||
|
||||
1.3.3 - 2023-10-03
|
||||
- Restricted the ability to change the report date and time when
|
||||
creating or editing a writeup to only logged in users. This is to
|
||||
prevent reporters from backdating writeups, causing them to possibly
|
||||
be missed.
|
||||
- For Raspberry Pi:
|
||||
- Updated the Webmin custom command scripts to use whatever user is
|
||||
logged into Webmin instead of the user "pi" which may not exist
|
||||
if rpi-imager options were used to set a different initial user
|
||||
when the SD card was created.
|
||||
|
||||
1.4.0 - 2024-05-09
|
||||
- Updated the installer script (install.sh) to check for and install the
|
||||
prerequisites (apache, php, mariadb/mysql) and optional packages
|
||||
(webmin, phpmyadmin).
|
||||
- Added an access mode setting. The access mode should be "untrusted" if
|
||||
OpenDRS is exposed to an untrusted environment such as the internet.
|
||||
Untrusted mode requires a login to access any part of the application.
|
||||
The access mode should be "trusted" when the application is used
|
||||
in a trusted environment where anybody on the network can
|
||||
create/edit writeups and search the database, with a login required
|
||||
for everything else.
|
||||
- On the View Open Writeups and View All Writeups pages, replaced the
|
||||
"Last 30 days" button with a dropdown with more options.
|
||||
- Changed the global font to a sans-serif font.
|
||||
- For Raspberry Pi:
|
||||
- Removed the Raspberry Pi terminal setup from OpenDRS. Setting up
|
||||
a Raspberry Pi as a terminal for OpenDRS can now be accomplished
|
||||
by installing the OpenKiosk application.
|
||||
- Removed the Raspberry Pi server setup from OpenDRS. Setting up
|
||||
a Raspberry Pi as an OpenDRS server is easily accomplished by
|
||||
the OpenDRS installer.
|
||||
|
||||
1.4.1 - 2024-06-18
|
||||
- Updated the installer script (install.sh) to check for and install the
|
||||
package supplying uuidgen. If uuidgen is not present, the mysql
|
||||
user would be created with a blank password.
|
||||
|
||||
1.4.2 - 2024-06-27
|
||||
- Fixed bug introduced in version 1.4.1 in writeups.php where open
|
||||
writeups prior to the current day weren't displayed on the
|
||||
"View Open Writeups" page.
|
||||
- Removed open, closed, and deferred constant definitions from common.php
|
||||
since only one was ever used, and that in only one place.
|
||||
|
||||
2
INSTALL
2
INSTALL
@@ -23,6 +23,6 @@ passwords are unchanged.
|
||||
The Admin Functions menu will be shown when logged in as an admin user.
|
||||
Click on Global Settings to set display options, page colors, banners, and
|
||||
miscellaneous options. Click on Manage Database to set users, devices,
|
||||
subsystems, action reasons and periods.
|
||||
subsystems, action reasons and when discovereds.
|
||||
|
||||
6. Start making writeups
|
||||
|
||||
@@ -1,115 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
# ap-setup.sh
|
||||
# OpenDRS Online Discrepancy Reporting System
|
||||
# Copyright (C) 2022 Rod Wright
|
||||
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
|
||||
# Wireless Access Point Raspberry Pi Setup
|
||||
current_user=`whoami`
|
||||
if [ "$current_user" != "root" ]
|
||||
then
|
||||
echo "You must have root privileges to run this setup."
|
||||
echo "Try 'sudo ./ap-setup.sh'"
|
||||
exit 1
|
||||
fi
|
||||
echo ""
|
||||
echo ""
|
||||
echo "If this terminal connects to a network using ethernet, it can be configured"
|
||||
echo "as a wireless access point for other terminals. Would you like to configure"
|
||||
echo -n "this terminal as an access point? [y/N]: "
|
||||
read wapconf
|
||||
if [ "$wapconf" = "Y" -o "$wapconf" = "y" ]
|
||||
then
|
||||
echo "Configuring as wireless access point."
|
||||
echo ""
|
||||
echo "Copying files..."
|
||||
chmod +x apsetup/usr/local/bin/*
|
||||
cp apsetup/usr/local/bin/* /usr/local/bin
|
||||
cp -R apsetup/etc/* /etc
|
||||
echo ""
|
||||
wapssidok=0
|
||||
while [ "$wapssidok" -ne 1 ]
|
||||
do
|
||||
echo "This access point will need an SSID. This is what will appear"
|
||||
echo "as the name of this terminal when other devices connect."
|
||||
echo -n "Please enter the desired SSID for this access point: "
|
||||
read wapssid
|
||||
if [ "$wapssid" = "" ]
|
||||
then
|
||||
echo "SSID cannot be blank. Try again."
|
||||
else
|
||||
wapssidok=1
|
||||
fi
|
||||
done
|
||||
wappassok=0
|
||||
while [ "$wappassok" -ne 1 ]
|
||||
do
|
||||
echo "You will need to set a passphrase for this access point. It should"
|
||||
echo "be at least 8 characters in length and cannot be blank."
|
||||
echo -n "Please enter the desired passphrase for this access point: "
|
||||
read wappass
|
||||
wappasslen=`echo -n $wappass | wc -m`
|
||||
if [ "$wappass" = "" -o "$wappasslen" -lt 8 ]
|
||||
then
|
||||
echo "Passphrase doesn't satisfy requirements above. Try again."
|
||||
else
|
||||
wappassok=1
|
||||
fi
|
||||
done
|
||||
apt install hostapd
|
||||
systemctl unmask hostapd
|
||||
systemctl enable hostapd
|
||||
echo "[NetDev]" >/etc/systemd/network/bridge-br0.netdev
|
||||
echo "Name=br0" >>/etc/systemd/network/bridge-br0.netdev
|
||||
echo "Kind=bridge" >>/etc/systemd/network/bridge-br0.netdev
|
||||
echo "[Match]" >/etc/systemd/network/br0-member-eth0.network
|
||||
echo "Name=eth0" >>/etc/systemd/network/br0-member-eth0.network
|
||||
echo "" >>/etc/systemd/network/br0-member-eth0.network
|
||||
echo "[Network]" >>/etc/systemd/network/br0-member-eth0.network
|
||||
echo "Bridge=br0" >>/etc/systemd/network/br0-member-eth0.network
|
||||
systemctl enable systemd-networkd
|
||||
mv /etc/dhcpcd.conf /etc/dhcpcd.conf.old
|
||||
echo "denyinterfaces wlan0 eth0" >/etc/dhcpcd.conf
|
||||
cat /etc/dhcpcd.conf.old >>/etc/dhcpcd.conf
|
||||
echo "interface br0" >>/etc/dhcpcd.conf
|
||||
rfkill unblock wlan
|
||||
echo "country_code=US" >/etc/hostapd/hostapd.conf
|
||||
echo "interface=wlan0" >>/etc/hostapd/hostapd.conf
|
||||
echo "bridge=br0" >>/etc/hostapd/hostapd.conf
|
||||
echo "ssid=$wapssid" >>/etc/hostapd/hostapd.conf
|
||||
echo "hw_mode=g" >>/etc/hostapd/hostapd.conf
|
||||
echo "channel=7" >>/etc/hostapd/hostapd.conf
|
||||
echo "macaddr_acl=0" >>/etc/hostapd/hostapd.conf
|
||||
echo "auth_algs=1" >>/etc/hostapd/hostapd.conf
|
||||
echo "ignore_broadcast_ssid=0" >>/etc/hostapd/hostapd.conf
|
||||
echo "wpa=2" >>/etc/hostapd/hostapd.conf
|
||||
echo "wpa_passphrase=$wappass" >>/etc/hostapd/hostapd.conf
|
||||
echo "wpa_key_mgmt=WPA-PSK" >>/etc/hostapd/hostapd.conf
|
||||
echo "wpa_pairwise=TKIP" >>/etc/hostapd/hostapd.conf
|
||||
echo "rsn_pairwise=CCMP" >>/etc/hostapd/hostapd.conf
|
||||
wget -c http://github.com/pjz/webmin-modules/releases/download/v1.0/hostap.wbm.gz
|
||||
gzip -d hostap.wbm.gz
|
||||
/usr/share/webmin/install-module.pl hostap.wbm
|
||||
echo ""
|
||||
echo ""
|
||||
echo "Wireless access point setup is complete. It will be"
|
||||
echo "automatically enabled after reboot. To change the SSID or"
|
||||
echo "passphrase in the future, edit the file /etc/hostapd/hostapd.conf"
|
||||
echo "or use the Host AP module in the Servers section of Webmin."
|
||||
echo ""
|
||||
echo "To disable the access point altogether in the future, run:"
|
||||
echo " sudo wap-disable"
|
||||
echo "at a command prompt and reboot the terminal. To re-enable it, run:"
|
||||
echo " sudo wap-enable"
|
||||
echo "at a command prompt and reboot the terminal."
|
||||
echo "It can also be enabled or disabled via Custom Commands in the Tools"
|
||||
echo "section of Webmin."
|
||||
echo ""
|
||||
echo -n "Press enter key to continue..."
|
||||
read cont
|
||||
else
|
||||
exit 2
|
||||
fi
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
sudo wap-enable
|
||||
Enable Wireless Access Point
|
||||
pi 0 1 0 0 0 0 0 -
|
||||
@@ -1 +0,0 @@
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
sudo wap-disable
|
||||
Disable Wireless Access Point
|
||||
pi 0 1 0 0 0 0 0 -
|
||||
@@ -1 +0,0 @@
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
/etc/hostapd/hostapd.conf
|
||||
Edit Wireless Access Point Parameters
|
||||
|
||||
|
||||
|
||||
|
||||
systemctl restart hostapd
|
||||
0
|
||||
0
|
||||
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
display_mode=1
|
||||
params_file=0
|
||||
params_cmd=0
|
||||
columns=1
|
||||
height=
|
||||
wrap=
|
||||
width=
|
||||
sort=
|
||||
@@ -1,4 +0,0 @@
|
||||
#!/bin/bash
|
||||
systemctl stop hostapd
|
||||
systemctl disable hostapd
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
#!/bin/bash
|
||||
systemctl enable hostapd
|
||||
systemctl start hostapd
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
#!/bin/bash
|
||||
newppok=0
|
||||
while [ "$newppok" -ne 1 ]
|
||||
do
|
||||
echo -n "New passphrase: "
|
||||
read newpp
|
||||
newpplen=`echo -n $newpp | wc -m`
|
||||
if [ "$newpp" = "" -o "$newpplen" -lt 8 ]
|
||||
then
|
||||
echo "Passphrase didn't satisfy requirements. Try again or hit <ctrl>-c to abort."
|
||||
else
|
||||
newppok=1
|
||||
fi
|
||||
done
|
||||
sed -i "/wpa_passphrase=.*/c wpa_passphrase=$newpp" /etc/hostapd/hostapd.conf
|
||||
systemctl restart hostapd
|
||||
@@ -1,15 +0,0 @@
|
||||
#!/bin/bash
|
||||
newssidok=0
|
||||
while [ "$newssidok" -ne 1 ]
|
||||
do
|
||||
echo -n "New SSID: "
|
||||
read newssid
|
||||
if [ "$newssid" = "" ]
|
||||
then
|
||||
echo "SSID cannot be blank. Try again or hit <ctrl>-c to abort."
|
||||
else
|
||||
newssidok=1
|
||||
fi
|
||||
done
|
||||
sed -i "/ssid=.*/c ssid=$newssid" /etc/hostapd/hostapd.conf
|
||||
systemctl restart hostapd
|
||||
@@ -1,126 +0,0 @@
|
||||
cmake_minimum_required(VERSION 3.1)
|
||||
project(brlaser CXX)
|
||||
set(BRLASER_VERSION "4")
|
||||
|
||||
if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
|
||||
message(STATUS "No build type selected, default to RelWithDebInfo")
|
||||
set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Build type (default RelWithDebInfo)" FORCE)
|
||||
endif()
|
||||
|
||||
include(CMakePushCheckState)
|
||||
include(CheckCXXCompilerFlag)
|
||||
include(CheckIncludeFileCXX)
|
||||
|
||||
|
||||
## Enable assertions for all builds
|
||||
## (cmake by default sets NDEBUG for release builds)
|
||||
|
||||
foreach(var
|
||||
CMAKE_CXX_FLAGS_RELEASE
|
||||
CMAKE_CXX_FLAGS_RELWITHDEBINFO
|
||||
CMAKE_CXX_FLAGS_MINSIZEREL)
|
||||
string(REGEX REPLACE "(^| )[/-]D *NDEBUG($| )" " " "${var}" "${${var}}")
|
||||
endforeach()
|
||||
|
||||
|
||||
## Configure the compiler
|
||||
|
||||
set(CMAKE_CXX_STANDARD 11)
|
||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
|
||||
macro(extra_cxx_compiler_flag FLAG)
|
||||
string(REGEX REPLACE "[^A-Za-z_0-9]" "_" SFLAG ${FLAG})
|
||||
check_cxx_compiler_flag(${FLAG} COMPILER_SUPPORT_${SFLAG})
|
||||
if(COMPILER_SUPPORT_${SFLAG})
|
||||
set(EXTRA_CXX_FLAGS "${EXTRA_CXX_FLAGS} ${FLAG}")
|
||||
endif()
|
||||
endmacro(extra_cxx_compiler_flag)
|
||||
|
||||
# Compiler warnings
|
||||
extra_cxx_compiler_flag("-Wall")
|
||||
extra_cxx_compiler_flag("-Wno-missing-braces")
|
||||
# Some security flags
|
||||
extra_cxx_compiler_flag("-fstack-protector-strong")
|
||||
extra_cxx_compiler_flag("-Wformat")
|
||||
extra_cxx_compiler_flag("-Werror=format-security")
|
||||
extra_cxx_compiler_flag("-D_FORTIFY_SOURCE=2")
|
||||
# Enable the supported flags, but give priority to CXXFLAGS env var
|
||||
set(CMAKE_CXX_FLAGS "${EXTRA_CXX_FLAGS} ${CMAKE_CXX_FLAGS}")
|
||||
|
||||
|
||||
## Configure CUPS
|
||||
|
||||
find_program(CUPS_CONFIG NAMES cups-config)
|
||||
if(NOT CUPS_CONFIG)
|
||||
message(FATAL_ERROR "cups-config command not found. Are the CUPS development packages installed?")
|
||||
endif()
|
||||
execute_process(
|
||||
COMMAND "${CUPS_CONFIG}" --datadir
|
||||
OUTPUT_VARIABLE CUPS_DATA_DIR
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
execute_process(
|
||||
COMMAND "${CUPS_CONFIG}" --serverbin
|
||||
OUTPUT_VARIABLE CUPS_SERVER_BIN
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
execute_process(
|
||||
COMMAND "${CUPS_CONFIG}" --cflags
|
||||
OUTPUT_VARIABLE CUPS_CFLAGS
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
execute_process(
|
||||
COMMAND "${CUPS_CONFIG}" --ldflags
|
||||
OUTPUT_VARIABLE CUPS_LDFLAGS
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
execute_process(
|
||||
COMMAND "${CUPS_CONFIG}" --image --libs
|
||||
OUTPUT_VARIABLE CUPS_LIBS
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
|
||||
cmake_push_check_state()
|
||||
set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${CUPS_CFLAGS}")
|
||||
check_include_file_cxx(cups/raster.h HAVE_CUPS_RASTER_H)
|
||||
cmake_pop_check_state()
|
||||
if(NOT HAVE_CUPS_RASTER_H)
|
||||
message(SEND_ERROR "<cups/raster.h> header not found. Are the CUPS development packages installed?")
|
||||
endif()
|
||||
|
||||
|
||||
## Build instructions
|
||||
|
||||
configure_file(
|
||||
"${PROJECT_SOURCE_DIR}/brlaser.drv.in"
|
||||
"${PROJECT_BINARY_DIR}/brlaser.drv")
|
||||
|
||||
configure_file(
|
||||
"${PROJECT_SOURCE_DIR}/config.h.in"
|
||||
"${PROJECT_BINARY_DIR}/config.h")
|
||||
|
||||
include_directories("${PROJECT_BINARY_DIR}")
|
||||
|
||||
add_executable(rastertobrlaser src/main.cc src/job.cc src/line.cc src/debug.cc)
|
||||
target_compile_options(rastertobrlaser PRIVATE ${CUPS_CFLAGS})
|
||||
target_link_libraries(rastertobrlaser ${CUPS_LIBS})
|
||||
target_link_libraries(rastertobrlaser ${CUPS_LDFLAGS})
|
||||
|
||||
add_executable(brdecode src/brdecode.cc)
|
||||
add_executable(test_lest test/test_lest.cc)
|
||||
add_executable(test_line test/test_line.cc src/line.cc)
|
||||
add_executable(test_block test/test_block.cc)
|
||||
|
||||
enable_testing()
|
||||
add_test(test_lest test_lest)
|
||||
add_test(test_line test_line)
|
||||
add_test(test_block test_block)
|
||||
|
||||
# Autotools-style "make check" command
|
||||
add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND})
|
||||
add_dependencies(check test_lest test_line test_block)
|
||||
|
||||
|
||||
# Installation
|
||||
|
||||
install(
|
||||
TARGETS rastertobrlaser
|
||||
DESTINATION "${CUPS_SERVER_BIN}/filter")
|
||||
install(
|
||||
FILES "${PROJECT_BINARY_DIR}/brlaser.drv"
|
||||
DESTINATION "${CUPS_DATA_DIR}/drv")
|
||||
@@ -1,339 +0,0 @@
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 2, June 1991
|
||||
|
||||
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The licenses for most software are designed to take away your
|
||||
freedom to share and change it. By contrast, the GNU General Public
|
||||
License is intended to guarantee your freedom to share and change free
|
||||
software--to make sure the software is free for all its users. This
|
||||
General Public License applies to most of the Free Software
|
||||
Foundation's software and to any other program whose authors commit to
|
||||
using it. (Some other Free Software Foundation software is covered by
|
||||
the GNU Lesser General Public License instead.) You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
this service if you wish), that you receive source code or can get it
|
||||
if you want it, that you can change the software or use pieces of it
|
||||
in new free programs; and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to make restrictions that forbid
|
||||
anyone to deny you these rights or to ask you to surrender the rights.
|
||||
These restrictions translate to certain responsibilities for you if you
|
||||
distribute copies of the software, or if you modify it.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must give the recipients all the rights that
|
||||
you have. You must make sure that they, too, receive or can get the
|
||||
source code. And you must show them these terms so they know their
|
||||
rights.
|
||||
|
||||
We protect your rights with two steps: (1) copyright the software, and
|
||||
(2) offer you this license which gives you legal permission to copy,
|
||||
distribute and/or modify the software.
|
||||
|
||||
Also, for each author's protection and ours, we want to make certain
|
||||
that everyone understands that there is no warranty for this free
|
||||
software. If the software is modified by someone else and passed on, we
|
||||
want its recipients to know that what they have is not the original, so
|
||||
that any problems introduced by others will not reflect on the original
|
||||
authors' reputations.
|
||||
|
||||
Finally, any free program is threatened constantly by software
|
||||
patents. We wish to avoid the danger that redistributors of a free
|
||||
program will individually obtain patent licenses, in effect making the
|
||||
program proprietary. To prevent this, we have made it clear that any
|
||||
patent must be licensed for everyone's free use or not licensed at all.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||
|
||||
0. This License applies to any program or other work which contains
|
||||
a notice placed by the copyright holder saying it may be distributed
|
||||
under the terms of this General Public License. The "Program", below,
|
||||
refers to any such program or work, and a "work based on the Program"
|
||||
means either the Program or any derivative work under copyright law:
|
||||
that is to say, a work containing the Program or a portion of it,
|
||||
either verbatim or with modifications and/or translated into another
|
||||
language. (Hereinafter, translation is included without limitation in
|
||||
the term "modification".) Each licensee is addressed as "you".
|
||||
|
||||
Activities other than copying, distribution and modification are not
|
||||
covered by this License; they are outside its scope. The act of
|
||||
running the Program is not restricted, and the output from the Program
|
||||
is covered only if its contents constitute a work based on the
|
||||
Program (independent of having been made by running the Program).
|
||||
Whether that is true depends on what the Program does.
|
||||
|
||||
1. You may copy and distribute verbatim copies of the Program's
|
||||
source code as you receive it, in any medium, provided that you
|
||||
conspicuously and appropriately publish on each copy an appropriate
|
||||
copyright notice and disclaimer of warranty; keep intact all the
|
||||
notices that refer to this License and to the absence of any warranty;
|
||||
and give any other recipients of the Program a copy of this License
|
||||
along with the Program.
|
||||
|
||||
You may charge a fee for the physical act of transferring a copy, and
|
||||
you may at your option offer warranty protection in exchange for a fee.
|
||||
|
||||
2. You may modify your copy or copies of the Program or any portion
|
||||
of it, thus forming a work based on the Program, and copy and
|
||||
distribute such modifications or work under the terms of Section 1
|
||||
above, provided that you also meet all of these conditions:
|
||||
|
||||
a) You must cause the modified files to carry prominent notices
|
||||
stating that you changed the files and the date of any change.
|
||||
|
||||
b) You must cause any work that you distribute or publish, that in
|
||||
whole or in part contains or is derived from the Program or any
|
||||
part thereof, to be licensed as a whole at no charge to all third
|
||||
parties under the terms of this License.
|
||||
|
||||
c) If the modified program normally reads commands interactively
|
||||
when run, you must cause it, when started running for such
|
||||
interactive use in the most ordinary way, to print or display an
|
||||
announcement including an appropriate copyright notice and a
|
||||
notice that there is no warranty (or else, saying that you provide
|
||||
a warranty) and that users may redistribute the program under
|
||||
these conditions, and telling the user how to view a copy of this
|
||||
License. (Exception: if the Program itself is interactive but
|
||||
does not normally print such an announcement, your work based on
|
||||
the Program is not required to print an announcement.)
|
||||
|
||||
These requirements apply to the modified work as a whole. If
|
||||
identifiable sections of that work are not derived from the Program,
|
||||
and can be reasonably considered independent and separate works in
|
||||
themselves, then this License, and its terms, do not apply to those
|
||||
sections when you distribute them as separate works. But when you
|
||||
distribute the same sections as part of a whole which is a work based
|
||||
on the Program, the distribution of the whole must be on the terms of
|
||||
this License, whose permissions for other licensees extend to the
|
||||
entire whole, and thus to each and every part regardless of who wrote it.
|
||||
|
||||
Thus, it is not the intent of this section to claim rights or contest
|
||||
your rights to work written entirely by you; rather, the intent is to
|
||||
exercise the right to control the distribution of derivative or
|
||||
collective works based on the Program.
|
||||
|
||||
In addition, mere aggregation of another work not based on the Program
|
||||
with the Program (or with a work based on the Program) on a volume of
|
||||
a storage or distribution medium does not bring the other work under
|
||||
the scope of this License.
|
||||
|
||||
3. You may copy and distribute the Program (or a work based on it,
|
||||
under Section 2) in object code or executable form under the terms of
|
||||
Sections 1 and 2 above provided that you also do one of the following:
|
||||
|
||||
a) Accompany it with the complete corresponding machine-readable
|
||||
source code, which must be distributed under the terms of Sections
|
||||
1 and 2 above on a medium customarily used for software interchange; or,
|
||||
|
||||
b) Accompany it with a written offer, valid for at least three
|
||||
years, to give any third party, for a charge no more than your
|
||||
cost of physically performing source distribution, a complete
|
||||
machine-readable copy of the corresponding source code, to be
|
||||
distributed under the terms of Sections 1 and 2 above on a medium
|
||||
customarily used for software interchange; or,
|
||||
|
||||
c) Accompany it with the information you received as to the offer
|
||||
to distribute corresponding source code. (This alternative is
|
||||
allowed only for noncommercial distribution and only if you
|
||||
received the program in object code or executable form with such
|
||||
an offer, in accord with Subsection b above.)
|
||||
|
||||
The source code for a work means the preferred form of the work for
|
||||
making modifications to it. For an executable work, complete source
|
||||
code means all the source code for all modules it contains, plus any
|
||||
associated interface definition files, plus the scripts used to
|
||||
control compilation and installation of the executable. However, as a
|
||||
special exception, the source code distributed need not include
|
||||
anything that is normally distributed (in either source or binary
|
||||
form) with the major components (compiler, kernel, and so on) of the
|
||||
operating system on which the executable runs, unless that component
|
||||
itself accompanies the executable.
|
||||
|
||||
If distribution of executable or object code is made by offering
|
||||
access to copy from a designated place, then offering equivalent
|
||||
access to copy the source code from the same place counts as
|
||||
distribution of the source code, even though third parties are not
|
||||
compelled to copy the source along with the object code.
|
||||
|
||||
4. You may not copy, modify, sublicense, or distribute the Program
|
||||
except as expressly provided under this License. Any attempt
|
||||
otherwise to copy, modify, sublicense or distribute the Program is
|
||||
void, and will automatically terminate your rights under this License.
|
||||
However, parties who have received copies, or rights, from you under
|
||||
this License will not have their licenses terminated so long as such
|
||||
parties remain in full compliance.
|
||||
|
||||
5. You are not required to accept this License, since you have not
|
||||
signed it. However, nothing else grants you permission to modify or
|
||||
distribute the Program or its derivative works. These actions are
|
||||
prohibited by law if you do not accept this License. Therefore, by
|
||||
modifying or distributing the Program (or any work based on the
|
||||
Program), you indicate your acceptance of this License to do so, and
|
||||
all its terms and conditions for copying, distributing or modifying
|
||||
the Program or works based on it.
|
||||
|
||||
6. Each time you redistribute the Program (or any work based on the
|
||||
Program), the recipient automatically receives a license from the
|
||||
original licensor to copy, distribute or modify the Program subject to
|
||||
these terms and conditions. You may not impose any further
|
||||
restrictions on the recipients' exercise of the rights granted herein.
|
||||
You are not responsible for enforcing compliance by third parties to
|
||||
this License.
|
||||
|
||||
7. If, as a consequence of a court judgment or allegation of patent
|
||||
infringement or for any other reason (not limited to patent issues),
|
||||
conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot
|
||||
distribute so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you
|
||||
may not distribute the Program at all. For example, if a patent
|
||||
license would not permit royalty-free redistribution of the Program by
|
||||
all those who receive copies directly or indirectly through you, then
|
||||
the only way you could satisfy both it and this License would be to
|
||||
refrain entirely from distribution of the Program.
|
||||
|
||||
If any portion of this section is held invalid or unenforceable under
|
||||
any particular circumstance, the balance of the section is intended to
|
||||
apply and the section as a whole is intended to apply in other
|
||||
circumstances.
|
||||
|
||||
It is not the purpose of this section to induce you to infringe any
|
||||
patents or other property right claims or to contest validity of any
|
||||
such claims; this section has the sole purpose of protecting the
|
||||
integrity of the free software distribution system, which is
|
||||
implemented by public license practices. Many people have made
|
||||
generous contributions to the wide range of software distributed
|
||||
through that system in reliance on consistent application of that
|
||||
system; it is up to the author/donor to decide if he or she is willing
|
||||
to distribute software through any other system and a licensee cannot
|
||||
impose that choice.
|
||||
|
||||
This section is intended to make thoroughly clear what is believed to
|
||||
be a consequence of the rest of this License.
|
||||
|
||||
8. If the distribution and/or use of the Program is restricted in
|
||||
certain countries either by patents or by copyrighted interfaces, the
|
||||
original copyright holder who places the Program under this License
|
||||
may add an explicit geographical distribution limitation excluding
|
||||
those countries, so that distribution is permitted only in or among
|
||||
countries not thus excluded. In such case, this License incorporates
|
||||
the limitation as if written in the body of this License.
|
||||
|
||||
9. The Free Software Foundation may publish revised and/or new versions
|
||||
of the General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the Program
|
||||
specifies a version number of this License which applies to it and "any
|
||||
later version", you have the option of following the terms and conditions
|
||||
either of that version or of any later version published by the Free
|
||||
Software Foundation. If the Program does not specify a version number of
|
||||
this License, you may choose any version ever published by the Free Software
|
||||
Foundation.
|
||||
|
||||
10. If you wish to incorporate parts of the Program into other free
|
||||
programs whose distribution conditions are different, write to the author
|
||||
to ask for permission. For software which is copyrighted by the Free
|
||||
Software Foundation, write to the Free Software Foundation; we sometimes
|
||||
make exceptions for this. Our decision will be guided by the two goals
|
||||
of preserving the free status of all derivatives of our free software and
|
||||
of promoting the sharing and reuse of software generally.
|
||||
|
||||
NO WARRANTY
|
||||
|
||||
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
||||
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
||||
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
|
||||
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
|
||||
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
|
||||
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
|
||||
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
|
||||
REPAIR OR CORRECTION.
|
||||
|
||||
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
|
||||
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
|
||||
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
|
||||
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
|
||||
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
|
||||
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
||||
POSSIBILITY OF SUCH DAMAGES.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
convey the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program is interactive, make it output a short notice like this
|
||||
when it starts in an interactive mode:
|
||||
|
||||
Gnomovision version 69, Copyright (C) year name of author
|
||||
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, the commands you use may
|
||||
be called something other than `show w' and `show c'; they could even be
|
||||
mouse-clicks or menu items--whatever suits your program.
|
||||
|
||||
You should also get your employer (if you work as a programmer) or your
|
||||
school, if any, to sign a "copyright disclaimer" for the program, if
|
||||
necessary. Here is a sample; alter the names:
|
||||
|
||||
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
|
||||
`Gnomovision' (which makes passes at compilers) written by James Hacker.
|
||||
|
||||
<signature of Ty Coon>, 1 April 1989
|
||||
Ty Coon, President of Vice
|
||||
|
||||
This General Public License does not permit incorporating your program into
|
||||
proprietary programs. If your program is a subroutine library, you may
|
||||
consider it more useful to permit linking proprietary applications with the
|
||||
library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License.
|
||||
@@ -1,9 +0,0 @@
|
||||
brlaser v3 (2014-07-07)
|
||||
Added DCP-7065DN description.
|
||||
|
||||
brlaser v2 (2014-06-29)
|
||||
Suppport compilation with GCC 4.6.
|
||||
Add a basic test suite.
|
||||
|
||||
brlaser v1 (2013-12-30)
|
||||
Initial release.
|
||||
@@ -1,85 +0,0 @@
|
||||
brlaser: Brother laser printer driver
|
||||
=====================================
|
||||
|
||||
brlaser is a CUPS driver for Brother laser printers.
|
||||
|
||||
Although most Brother printers support a standard printer language
|
||||
such as PCL or PostScript, not all do. If you have a monochrome
|
||||
Brother laser printer (or multi-function device) and the other open
|
||||
source drivers don't work, this one might help.
|
||||
|
||||
This driver is known to work with these printers:
|
||||
|
||||
* Brother DCP-1510
|
||||
* Brother DCP-7030
|
||||
* Brother DCP-7040
|
||||
* Brother DCP-7055
|
||||
* Brother DCP-7055W
|
||||
* Brother DCP-7065DN
|
||||
* Brother HL-L2300D
|
||||
* Brother MFC-7360N
|
||||
|
||||
|
||||
Other printers
|
||||
--------------
|
||||
|
||||
If your printer isn't included in the list above, just try selecting
|
||||
any entry marked 'brlaser' and see if it works.
|
||||
|
||||
If it does, please create a new issue here in Github and include the
|
||||
output of this command:
|
||||
|
||||
sudo lpinfo --include-schemes usb -l -v
|
||||
|
||||
Then I'll be able to add a proper entry for your printer.
|
||||
|
||||
|
||||
Installation
|
||||
------------
|
||||
|
||||
Some operating systems already ship this driver. This is the case for
|
||||
at least Debian, Ubuntu, Raspbian, openSUSE and Arch Linux. Look for a
|
||||
package named `printer-driver-brlaser`.
|
||||
|
||||
You'll also need Ghostscript, in case that's not installed
|
||||
automatically.
|
||||
|
||||
Once brlaser is installed, you can add your printer using the usual
|
||||
CUPS interface.
|
||||
|
||||
|
||||
Building from source
|
||||
--------------------
|
||||
|
||||
To compile brlaser you'll need CMake and the CUPS development packages
|
||||
(libcups2-dev, libcupsimage2-dev or similar).
|
||||
|
||||
Get the code by cloning the git repo <!-- or downloading the [latest
|
||||
release] -->. Compile and install with these commands:
|
||||
|
||||
cmake .
|
||||
make
|
||||
sudo make install
|
||||
|
||||
It might be needed to restart CUPS after this.
|
||||
|
||||
[latest release]: https://github.com/pdewacht/brlaser/releases/latest
|
||||
|
||||
|
||||
Copyright
|
||||
---------
|
||||
|
||||
Copyright © 2013 Peter De Wachter
|
||||
|
||||
brlaser is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
brlaser is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with brlaser. If not, see <http://www.gnu.org/licenses/>.
|
||||
@@ -1,143 +0,0 @@
|
||||
// This file is part of the brlaser printer driver.
|
||||
//
|
||||
// Copyright 2013 Peter De Wachter
|
||||
//
|
||||
// brlaser is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 2 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// brlaser is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with brlaser. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#define USING "using @CMAKE_PROJECT_NAME@ v@BRLASER_VERSION@"
|
||||
|
||||
// Include standard font and media definitions
|
||||
#include <font.defs>
|
||||
#include <media.defs>
|
||||
|
||||
// List the fonts that are supported, in this case all standard fonts...
|
||||
Font *
|
||||
|
||||
// Manufacturer and driver version.
|
||||
Manufacturer "Brother"
|
||||
Version "@BRLASER_VERSION@"
|
||||
|
||||
// Each filter provided by the driver...
|
||||
Filter application/vnd.cups-raster 33 rastertobrlaser
|
||||
|
||||
// Supported resolutions.
|
||||
// The 1200dpi mode is weird: we need to send 1200x1200dpi raster
|
||||
// data, but Brother only advertises 1200x600dpi. I wonder what
|
||||
// is going on there.
|
||||
// The 300dpi mode is reportedly not supported on all printers, so
|
||||
// it's listed in individual printer blocks where we believe it works.
|
||||
// Resolution k 1 0 0 0 "300dpi/300 DPI"
|
||||
*Resolution k 1 0 0 0 "600dpi/600 DPI"
|
||||
Resolution k 1 0 0 0 "1200dpi/1200HQ"
|
||||
|
||||
// Supported page sizes.
|
||||
HWMargins 8 8 8 16
|
||||
*MediaSize A4
|
||||
MediaSize A5
|
||||
MediaSize A6
|
||||
MediaSize B5
|
||||
MediaSize B6
|
||||
MediaSize EnvC5
|
||||
MediaSize EnvMonarch
|
||||
MediaSize EnvDL
|
||||
MediaSize Executive
|
||||
MediaSize Legal
|
||||
MediaSize Letter
|
||||
|
||||
// Input trays. Numbers must match the filter source code.
|
||||
*InputSlot 0 "Auto/Auto-select"
|
||||
InputSlot 1 "Tray1/Tray 1"
|
||||
InputSlot 2 "Tray2/Tray 2"
|
||||
InputSlot 3 "Tray3/Tray 3"
|
||||
InputSlot 4 "MPTray/MP Tray"
|
||||
InputSlot 5 "Manual/Manual"
|
||||
|
||||
// Media types.
|
||||
*MediaType 0 "PLAIN/Plain paper"
|
||||
MediaType 1 "THIN/Thin paper"
|
||||
MediaType 2 "THICK/Thick paper"
|
||||
MediaType 3 "THICKER/Thicker paper"
|
||||
MediaType 4 "BOND/Bond paper"
|
||||
MediaType 5 "TRANS/Transparencies"
|
||||
MediaType 6 "ENV/Envelopes"
|
||||
MediaType 7 "ENV-THICK/Thick envelopes"
|
||||
MediaType 8 "ENV-THIN/Thin envelopes"
|
||||
|
||||
Option "brlaserEconomode/Toner save mode" Boolean AnySetup 10
|
||||
*Choice False/Off "<</cupsInteger10 0>>setpagedevice"
|
||||
Choice True/On "<</cupsInteger10 1>>setpagedevice"
|
||||
|
||||
|
||||
{
|
||||
ModelName "DCP-1510"
|
||||
Attribute "NickName" "" "Brother DCP-1510 series, $USING"
|
||||
Attribute "1284DeviceID" "" "MFG:Brother;CMD:PJL,XL2HB;MDL:DCP-1510 series;CLS:PRINTER;CID:Brother Laser Type1;"
|
||||
Resolution k 1 0 0 0 "300dpi/300 DPI"
|
||||
PCFileName "br1510.ppd"
|
||||
}
|
||||
|
||||
{
|
||||
ModelName "DCP-7030"
|
||||
Attribute "NickName" "" "Brother DCP-7030, $USING"
|
||||
Attribute "1284DeviceID" "" "MFG:Brother;CMD:PJL,HBP;MDL:DCP-7030;CLS:PRINTER;"
|
||||
Resolution k 1 0 0 0 "300dpi/300 DPI"
|
||||
PCFileName "br7030.ppd"
|
||||
}
|
||||
|
||||
{
|
||||
ModelName "DCP-7040"
|
||||
Attribute "NickName" "" "Brother DCP-7040, $USING"
|
||||
Attribute "1284DeviceID" "" "MFG:Brother;CMD:PJL,HBP;MDL:DCP-7040;CLS:PRINTER;"
|
||||
Resolution k 1 0 0 0 "300dpi/300 DPI"
|
||||
PCFileName "br7040.ppd"
|
||||
}
|
||||
|
||||
{
|
||||
ModelName "DCP-7055"
|
||||
Attribute "NickName" "" "Brother DCP-7055, $USING"
|
||||
Attribute "1284DeviceID" "" "MFG:Brother;CMD:PJL,HBP;MDL:DCP-7055;CLS:PRINTER;CID:Brother Laser Type1;"
|
||||
Resolution k 1 0 0 0 "300dpi/300 DPI"
|
||||
PCFileName "br7055.ppd"
|
||||
}
|
||||
|
||||
{
|
||||
ModelName "DCP-7055W"
|
||||
Attribute "NickName" "" "Brother DCP-7055W, $USING"
|
||||
Attribute "1284DeviceID" "" "MFG:Brother;CMD:PJL,HBP;MDL:DCP-7055W;CLS:PRINTER;CID:Brother Laser Type1;"
|
||||
Resolution k 1 0 0 0 "300dpi/300 DPI"
|
||||
PCFileName "br7055w.ppd"
|
||||
}
|
||||
|
||||
{
|
||||
ModelName "DCP-7065DN"
|
||||
Attribute "NickName" "" "Brother DCP-7065DN, $USING"
|
||||
Attribute "1284DeviceID" "" "MFG:Brother;CMD:PJL,HBP;MDL:DCP-7065DN;CLS:PRINTER;CID:Brother Laser Type1;"
|
||||
Duplex rotated
|
||||
PCFileName "br7065dn.ppd"
|
||||
}
|
||||
|
||||
{
|
||||
ModelName "HL-L2300D"
|
||||
Attribute "NickName" "" "Brother HL-L2300D, $USING"
|
||||
Attribute "1284DeviceID" "" " MFG:Brother;CMD:PJL,HBP;MDL:HL-L2300D series;CLS:PRINTER;CID:Brother Laser Type1;"
|
||||
Duplex rotated
|
||||
PCFileName "brl2300d.ppd"
|
||||
}
|
||||
|
||||
{
|
||||
ModelName "MFC-7360N"
|
||||
Attribute "NickName" "" "Brother MFC-7360N, $USING"
|
||||
Attribute "1284DeviceID" "" "MFG:Brother;CMD:PJL,HBP;MDL:MFC-7360N;CLS:PRINTER;CID:Brother Laser Type1;"
|
||||
PCFileName "br7360n.ppd"
|
||||
}
|
||||
@@ -1,2 +0,0 @@
|
||||
#define PACKAGE "@CMAKE_PROJECT_NAME@"
|
||||
#define VERSION "@BRLASER_VERSION@"
|
||||
@@ -1,68 +0,0 @@
|
||||
// This file is part of the brlaser printer driver.
|
||||
//
|
||||
// Copyright 2013 Peter De Wachter
|
||||
//
|
||||
// brlaser is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 2 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// brlaser is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with brlaser. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#ifndef BLOCK_H
|
||||
#define BLOCK_H
|
||||
|
||||
#include <assert.h>
|
||||
#include <stdio.h>
|
||||
#include <vector>
|
||||
|
||||
class block {
|
||||
public:
|
||||
block(): line_bytes_(0) {
|
||||
lines_.reserve(max_lines_per_block_);
|
||||
}
|
||||
|
||||
bool empty() const {
|
||||
return line_bytes_ == 0;
|
||||
}
|
||||
|
||||
void add_line(std::vector<uint8_t> &&line) {
|
||||
assert(!line.empty());
|
||||
assert(line_fits(line.size()));
|
||||
line_bytes_ += line.size();
|
||||
lines_.emplace_back(line);
|
||||
}
|
||||
|
||||
bool line_fits(unsigned size) {
|
||||
return lines_.size() != max_lines_per_block_
|
||||
&& line_bytes_ + size < max_block_size_;
|
||||
}
|
||||
|
||||
void flush(FILE *f) {
|
||||
if (!empty()) {
|
||||
fprintf(f, "%dw%c%c",
|
||||
line_bytes_ + 2, 0,
|
||||
static_cast<int>(lines_.size()));
|
||||
for (auto &line : lines_) {
|
||||
fwrite(line.data(), 1, line.size(), f);
|
||||
}
|
||||
line_bytes_ = 0;
|
||||
lines_.clear();
|
||||
}
|
||||
}
|
||||
|
||||
private:
|
||||
static const unsigned max_block_size_ = 16350;
|
||||
static const unsigned max_lines_per_block_ = 128;
|
||||
|
||||
std::vector<std::vector<uint8_t>> lines_;
|
||||
int line_bytes_;
|
||||
};
|
||||
|
||||
#endif // BLOCK_H
|
||||
@@ -1,225 +0,0 @@
|
||||
// A quick-and-dirty tool to convert print files back to pbm images.
|
||||
//
|
||||
// Copyright 2013 Peter De Wachter
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 2 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#include <stdint.h>
|
||||
#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
#include <algorithm>
|
||||
#include <exception>
|
||||
#include <vector>
|
||||
#include <string>
|
||||
|
||||
namespace {
|
||||
|
||||
const size_t MAX_LINE_SIZE = 2000;
|
||||
|
||||
FILE *in_file;
|
||||
std::vector<std::vector<uint8_t>> page;
|
||||
std::vector<uint8_t> line;
|
||||
size_t line_offset;
|
||||
|
||||
|
||||
class unexpected_eof: public std::exception {
|
||||
public:
|
||||
virtual const char *what() const noexcept {
|
||||
return "Unexpected EOF";
|
||||
}
|
||||
};
|
||||
|
||||
class line_overflow: public std::exception {
|
||||
public:
|
||||
virtual const char *what() const noexcept {
|
||||
return "Unreasonable long line, aborting";
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
uint8_t get() {
|
||||
int ch = getc(in_file);
|
||||
if (ch < 0)
|
||||
throw unexpected_eof();
|
||||
return ch;
|
||||
}
|
||||
|
||||
unsigned read_overflow() {
|
||||
uint8_t ch;
|
||||
unsigned sum = 0;
|
||||
do {
|
||||
ch = get();
|
||||
sum += ch;
|
||||
} while (ch == 255);
|
||||
return sum;
|
||||
}
|
||||
|
||||
void read_repeat(uint8_t cmd) {
|
||||
uint16_t offset = (cmd >> 5) & 3;
|
||||
if (offset == 3)
|
||||
offset += read_overflow();
|
||||
uint16_t count = cmd & 31;
|
||||
if (count == 31)
|
||||
count += read_overflow();
|
||||
count += 2;
|
||||
uint8_t data = get();
|
||||
|
||||
size_t end = line_offset + offset + count;
|
||||
if (end > line.size()) {
|
||||
if (end > MAX_LINE_SIZE)
|
||||
throw line_overflow();
|
||||
line.resize(end);
|
||||
}
|
||||
line_offset += offset;
|
||||
std::fill_n(line.begin() + line_offset, count, data);
|
||||
line_offset += count;
|
||||
}
|
||||
|
||||
void read_substitute(uint8_t cmd) {
|
||||
uint16_t offset = (cmd >> 3) & 15;
|
||||
if (offset == 15)
|
||||
offset += read_overflow();
|
||||
uint16_t count = cmd & 7;
|
||||
if (count == 7)
|
||||
count += read_overflow();
|
||||
count += 1;
|
||||
|
||||
size_t end = line_offset + offset + count;
|
||||
if (end > line.size()) {
|
||||
if (end > MAX_LINE_SIZE)
|
||||
throw line_overflow();
|
||||
line.resize(end);
|
||||
}
|
||||
line_offset += offset;
|
||||
std::generate_n(line.begin() + line_offset, count, get);
|
||||
line_offset += count;
|
||||
}
|
||||
|
||||
void read_edit() {
|
||||
int8_t cmd = get();
|
||||
if (cmd < 0) {
|
||||
read_repeat(cmd);
|
||||
} else {
|
||||
read_substitute(cmd);
|
||||
}
|
||||
}
|
||||
|
||||
void read_line() {
|
||||
uint8_t num_edits = get();
|
||||
if (num_edits == 255) {
|
||||
line.clear();
|
||||
} else {
|
||||
line_offset = 0;
|
||||
for (int i = 0; i < num_edits; ++i) {
|
||||
read_edit();
|
||||
}
|
||||
}
|
||||
page.push_back(line);
|
||||
}
|
||||
|
||||
void read_block() {
|
||||
unsigned count = get();
|
||||
count = count * 256 + get();
|
||||
for (unsigned i = 0; i < count; ++i) {
|
||||
read_line();
|
||||
}
|
||||
}
|
||||
|
||||
bool read_page() {
|
||||
bool in_esc = false;
|
||||
int ch;
|
||||
|
||||
page.clear();
|
||||
line.clear();
|
||||
while ((ch = getc(in_file)) >= 0) {
|
||||
if (ch == '\f') {
|
||||
break;
|
||||
} else if (ch == 033) {
|
||||
in_esc = true;
|
||||
} else if (in_esc && ch == 'w') {
|
||||
read_block();
|
||||
} else if (in_esc && (ch >= 'A' && ch <= 'Z')) {
|
||||
in_esc = false;
|
||||
}
|
||||
}
|
||||
return !page.empty();
|
||||
}
|
||||
|
||||
void write_pnm(FILE *f) {
|
||||
size_t height = page.size();
|
||||
size_t width = 0;
|
||||
for (auto &l : page) {
|
||||
width = std::max(width, l.size());
|
||||
}
|
||||
|
||||
fprintf(f, "P4 %zd %zd\n", width * 8, height);
|
||||
std::vector<uint8_t> empty(width);
|
||||
for (auto &l : page) {
|
||||
fwrite(l.data(), 1, l.size(), f);
|
||||
fwrite(empty.data(), 1, width - l.size(), f);
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
int main(int argc, char *argv[]) {
|
||||
const char *in_filename;
|
||||
std::string out_prefix;
|
||||
|
||||
if (argc > 2) {
|
||||
in_filename = argv[1];
|
||||
out_prefix = argv[2];
|
||||
} else if (argc > 1) {
|
||||
in_filename = argv[1];
|
||||
out_prefix = argv[1];
|
||||
} else {
|
||||
in_filename = nullptr;
|
||||
out_prefix = "page";
|
||||
}
|
||||
|
||||
if (in_filename) {
|
||||
in_file = fopen(in_filename, "rb");
|
||||
if (!in_file) {
|
||||
fprintf(stderr, "Can't open file \"%s\"\n", in_filename);
|
||||
return 1;
|
||||
}
|
||||
} else {
|
||||
in_file = stdin;
|
||||
if (isatty(0)) {
|
||||
fprintf(stderr, "No filename given and no input on stdin\n");
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
int page_num = 1;
|
||||
while (read_page()) {
|
||||
std::string out_filename = out_prefix
|
||||
+ "-" + std::to_string(page_num) + ".pbm";
|
||||
FILE *out_file = fopen(out_filename.c_str(), "wb");
|
||||
if (!out_file) {
|
||||
fprintf(stderr, "Can't write file \"%s\"\n", out_filename.c_str());
|
||||
return 1;
|
||||
}
|
||||
write_pnm(out_file);
|
||||
fclose(out_file);
|
||||
fprintf(stderr, "%s\n", out_filename.c_str());
|
||||
++page_num;
|
||||
}
|
||||
} catch (std::exception &e) {
|
||||
fprintf(stderr, "%s\n", e.what());
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@@ -1,107 +0,0 @@
|
||||
// This file is part of the brlaser printer driver.
|
||||
//
|
||||
// Copyright 2013 Peter De Wachter
|
||||
//
|
||||
// brlaser is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 2 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// brlaser is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with brlaser. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#include "config.h"
|
||||
#include "debug.h"
|
||||
#include <iostream>
|
||||
#include <typeinfo>
|
||||
|
||||
namespace {
|
||||
|
||||
template <typename T>
|
||||
void dump(const char *name, const T &value) {
|
||||
std::cerr << "DEBUG: " PACKAGE ": page header: " << name << " = " << value << '\n';
|
||||
}
|
||||
|
||||
template <typename T, int N>
|
||||
void dump(const char *name, const T (&value)[N]) {
|
||||
std::cerr << "DEBUG: " PACKAGE ": page header: " << name << " =";
|
||||
for (int i = 0; i < N; ++i) {
|
||||
std::cerr << ' ' << value[i];
|
||||
}
|
||||
std::cerr << '\n';
|
||||
}
|
||||
|
||||
void dump(const char *name, const char *value) {
|
||||
std::cerr << "DEBUG: " PACKAGE ": page header: " << name << " = \"" << value << "\"\n";
|
||||
}
|
||||
|
||||
template <int N, int M>
|
||||
void dump(const char *name, const char (&value)[N][M]) {
|
||||
std::cerr << "DEBUG: " PACKAGE ": page header: " << name << " =";
|
||||
for (int i = 0; i < N; ++i) {
|
||||
std::cerr << " \"" << value[i] << '"';
|
||||
}
|
||||
std::cerr << '\n';
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
|
||||
void dump_page_header(const cups_page_header2_t &h) {
|
||||
#define d(f) dump(#f, h.f)
|
||||
d(MediaClass);
|
||||
d(MediaColor);
|
||||
d(MediaType);
|
||||
d(OutputType);
|
||||
d(AdvanceDistance);
|
||||
d(AdvanceMedia);
|
||||
d(Collate);
|
||||
d(CutMedia);
|
||||
d(Duplex);
|
||||
d(HWResolution);
|
||||
d(ImagingBoundingBox);
|
||||
d(InsertSheet);
|
||||
d(Jog);
|
||||
d(LeadingEdge);
|
||||
d(Margins);
|
||||
d(ManualFeed);
|
||||
d(MediaPosition);
|
||||
d(MediaWeight);
|
||||
d(MirrorPrint);
|
||||
d(NegativePrint);
|
||||
d(NumCopies);
|
||||
d(Orientation);
|
||||
d(OutputFaceUp);
|
||||
d(PageSize);
|
||||
d(Separations);
|
||||
d(TraySwitch);
|
||||
d(Tumble);
|
||||
d(cupsWidth);
|
||||
d(cupsHeight);
|
||||
d(cupsMediaType);
|
||||
d(cupsBitsPerColor);
|
||||
d(cupsBitsPerPixel);
|
||||
d(cupsBytesPerLine);
|
||||
d(cupsColorOrder);
|
||||
d(cupsColorSpace);
|
||||
d(cupsCompression);
|
||||
d(cupsRowCount);
|
||||
d(cupsRowFeed);
|
||||
d(cupsRowStep);
|
||||
d(cupsNumColors);
|
||||
d(cupsBorderlessScalingFactor);
|
||||
d(cupsPageSize);
|
||||
d(cupsImagingBBox);
|
||||
d(cupsInteger);
|
||||
d(cupsReal);
|
||||
d(cupsString);
|
||||
d(cupsMarkerType);
|
||||
d(cupsRenderingIntent);
|
||||
d(cupsPageSizeName);
|
||||
#undef d
|
||||
}
|
||||
@@ -1,25 +0,0 @@
|
||||
// This file is part of the brlaser printer driver.
|
||||
//
|
||||
// Copyright 2013 Peter De Wachter
|
||||
//
|
||||
// brlaser is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 2 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// brlaser is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with brlaser. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#ifndef DEBUG_H
|
||||
#define DEBUG_H
|
||||
|
||||
#include <cups/raster.h>
|
||||
|
||||
void dump_page_header(const cups_page_header2_t &h);
|
||||
|
||||
#endif
|
||||
@@ -1,118 +0,0 @@
|
||||
// This file is part of the brlaser printer driver.
|
||||
//
|
||||
// Copyright 2013 Peter De Wachter
|
||||
//
|
||||
// brlaser is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 2 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// brlaser is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with brlaser. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#include "job.h"
|
||||
#include <assert.h>
|
||||
#include <algorithm>
|
||||
#include <vector>
|
||||
#include "line.h"
|
||||
#include "block.h"
|
||||
|
||||
|
||||
job::job(FILE *out, const std::string &job_name)
|
||||
: out_(out),
|
||||
job_name_(job_name),
|
||||
page_params_() {
|
||||
// Delete dubious characters from job name
|
||||
std::replace_if(job_name_.begin(), job_name_.end(), [](char c) {
|
||||
return c < 32 || c >= 127 || c == '"' || c == '\\';
|
||||
}, ' ');
|
||||
|
||||
begin_job();
|
||||
}
|
||||
|
||||
job::~job() {
|
||||
end_job();
|
||||
}
|
||||
|
||||
void job::begin_job() {
|
||||
for (int i = 0; i < 128; ++i) {
|
||||
putc(0, out_);
|
||||
}
|
||||
fprintf(out_, "\033%%-12345X@PJL\n");
|
||||
fprintf(out_, "@PJL JOB NAME=\"%s\"\n", job_name_.c_str());
|
||||
}
|
||||
|
||||
void job::end_job() {
|
||||
fprintf(out_, "\033%%-12345X@PJL\n");
|
||||
fprintf(out_, "@PJL EOJ NAME=\"%s\"\n", job_name_.c_str());
|
||||
fprintf(out_, "\033%%-12345X\n");
|
||||
}
|
||||
|
||||
void job::write_page_header() {
|
||||
fprintf(out_, "\033%%-12345X@PJL\n");
|
||||
if (page_params_.resolution != 1200) {
|
||||
fprintf(out_, "@PJL SET RAS1200MODE = FALSE\n");
|
||||
fprintf(out_, "@PJL SET RESOLUTION = %d\n", page_params_.resolution);
|
||||
} else {
|
||||
fprintf(out_, "@PJL SET RAS1200MODE = TRUE\n");
|
||||
fprintf(out_, "@PJL SET RESOLUTION = 600\n");
|
||||
}
|
||||
fprintf(out_, "@PJL SET ECONOMODE = %s\n",
|
||||
page_params_.economode ? "ON" : "OFF");
|
||||
fprintf(out_, "@PJL SET SOURCETRAY = %s\n",
|
||||
page_params_.sourcetray.c_str());
|
||||
fprintf(out_, "@PJL SET MEDIATYPE = %s\n",
|
||||
page_params_.mediatype.c_str());
|
||||
fprintf(out_, "@PJL SET PAPER = %s\n",
|
||||
page_params_.papersize.c_str());
|
||||
fprintf(out_, "@PJL SET PAGEPROTECT = AUTO\n");
|
||||
fprintf(out_, "@PJL SET ORIENTATION = PORTRAIT\n");
|
||||
fprintf(out_, "@PJL ENTER LANGUAGE = PCL\n");
|
||||
|
||||
fputs("\033E", out_);
|
||||
fprintf(out_, "\033&l%dX", std::max(1, page_params_.num_copies));
|
||||
|
||||
if (page_params_.duplex) {
|
||||
fputs("\033&l2S", out_);
|
||||
}
|
||||
}
|
||||
|
||||
void job::encode_page(const page_params &page_params,
|
||||
int lines,
|
||||
int linesize,
|
||||
nextline_fn nextline) {
|
||||
if (!(page_params_ == page_params)) {
|
||||
page_params_ = page_params;
|
||||
write_page_header();
|
||||
}
|
||||
|
||||
std::vector<uint8_t> line(linesize);
|
||||
std::vector<uint8_t> reference(linesize);
|
||||
block block;
|
||||
|
||||
if (!nextline(line)) {
|
||||
return;
|
||||
}
|
||||
block.add_line(encode_line(line));
|
||||
std::swap(line, reference);
|
||||
|
||||
fputs("\033*b1030m", out_);
|
||||
|
||||
for (int i = 1; i < lines && nextline(line); ++i) {
|
||||
std::vector<uint8_t> encoded = encode_line(line, reference);
|
||||
if (!block.line_fits(encoded.size())) {
|
||||
block.flush(out_);
|
||||
}
|
||||
block.add_line(std::move(encoded));
|
||||
std::swap(line, reference);
|
||||
}
|
||||
|
||||
block.flush(out_);
|
||||
fputs("1030M\f", out_);
|
||||
fflush(out_);
|
||||
}
|
||||
@@ -1,68 +0,0 @@
|
||||
// This file is part of the brlaser printer driver.
|
||||
//
|
||||
// Copyright 2013 Peter De Wachter
|
||||
//
|
||||
// brlaser is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 2 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// brlaser is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with brlaser. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#ifndef JOB_H
|
||||
#define JOB_H
|
||||
|
||||
#include <stdint.h>
|
||||
#include <stdio.h>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
struct page_params {
|
||||
int num_copies;
|
||||
int resolution;
|
||||
bool duplex;
|
||||
bool economode;
|
||||
std::string sourcetray;
|
||||
std::string mediatype;
|
||||
std::string papersize;
|
||||
|
||||
bool operator==(const page_params &o) const {
|
||||
return num_copies == o.num_copies
|
||||
&& resolution == o.resolution
|
||||
&& duplex == o.duplex
|
||||
&& economode == o.economode
|
||||
&& sourcetray == o.sourcetray
|
||||
&& mediatype == o.mediatype
|
||||
&& papersize == o.papersize;
|
||||
}
|
||||
};
|
||||
|
||||
class job {
|
||||
public:
|
||||
typedef bool (*nextline_fn)(std::vector<uint8_t> &buf);
|
||||
|
||||
explicit job(FILE *out, const std::string &job_name);
|
||||
~job();
|
||||
|
||||
void encode_page(const page_params ¶ms,
|
||||
int lines,
|
||||
int linesize,
|
||||
nextline_fn nextline);
|
||||
|
||||
private:
|
||||
void begin_job();
|
||||
void end_job();
|
||||
void write_page_header();
|
||||
|
||||
FILE *out_;
|
||||
std::string job_name_;
|
||||
page_params page_params_;
|
||||
};
|
||||
|
||||
#endif // JOB_H
|
||||
@@ -1,191 +0,0 @@
|
||||
// This file is part of the brlaser printer driver.
|
||||
//
|
||||
// Copyright 2013 Peter De Wachter
|
||||
//
|
||||
// brlaser is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 2 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// brlaser is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with brlaser. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#include "line.h"
|
||||
#include <assert.h>
|
||||
#include <algorithm>
|
||||
using std::vector;
|
||||
|
||||
namespace {
|
||||
|
||||
void write_overflow(int value, vector<uint8_t> *out) {
|
||||
if (value >= 0) {
|
||||
if (value < 255) {
|
||||
out->push_back(value);
|
||||
} else {
|
||||
out->insert(out->end(), value / 255, 255);
|
||||
out->push_back(value % 255);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
template <typename Iterator>
|
||||
void write_substitute(int offset,
|
||||
Iterator first,
|
||||
Iterator last,
|
||||
vector<uint8_t> *out) {
|
||||
assert(offset >= 0);
|
||||
assert(offset < 10000);
|
||||
assert(first != last);
|
||||
|
||||
const int offset_max = 15;
|
||||
const int count_max = 7;
|
||||
int count = std::distance(first, last) - 1;
|
||||
|
||||
int offset_low = std::min(offset, offset_max);
|
||||
int count_low = std::min(count, count_max);
|
||||
out->push_back((offset_low << 3) | count_low);
|
||||
write_overflow(offset - offset_max, out);
|
||||
write_overflow(count - count_max, out);
|
||||
out->insert(out->end(), first, last);
|
||||
}
|
||||
|
||||
void write_repeat(int offset, int count, int value, vector<uint8_t> *out) {
|
||||
assert(offset >= 0);
|
||||
assert(offset < 10000);
|
||||
assert(count >= 2);
|
||||
assert(count < 10000);
|
||||
|
||||
const int offset_max = 3;
|
||||
const int count_max = 31;
|
||||
count -= 2;
|
||||
|
||||
int offset_low = std::min(offset, offset_max);
|
||||
int count_low = std::min(count, count_max);
|
||||
out->push_back(128 | (offset_low << 5) | count_low);
|
||||
write_overflow(offset - offset_max, out);
|
||||
write_overflow(count - count_max, out);
|
||||
out->push_back(value);
|
||||
}
|
||||
|
||||
|
||||
bool all_zeros(const vector<uint8_t> &buf) {
|
||||
return std::none_of(buf.begin(), buf.end(), [](uint8_t b) { return b; });
|
||||
}
|
||||
|
||||
template <typename Iterator1, typename Iterator2>
|
||||
int skip_to_next_mismatch(Iterator1 *first1,
|
||||
Iterator1 last1,
|
||||
Iterator2 *first2) {
|
||||
auto mismatch_it = std::mismatch(*first1, last1, *first2);
|
||||
int skipped = std::distance(*first1, mismatch_it.first);
|
||||
*first1 = mismatch_it.first;
|
||||
*first2 = mismatch_it.second;
|
||||
return skipped;
|
||||
}
|
||||
|
||||
template <typename Iterator>
|
||||
int repeat_length(Iterator first, Iterator last) {
|
||||
if (first != last) {
|
||||
auto k = *first;
|
||||
auto mismatch = std::find_if(std::next(first), last,
|
||||
[=](decltype(k) x) { return x != k; });
|
||||
return std::distance(first, mismatch);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
template <typename Iterator1, typename Iterator2>
|
||||
int substitute_length(Iterator1 first1, Iterator1 last1, Iterator2 first2) {
|
||||
if (first1 != last1) {
|
||||
Iterator1 it1 = first1;
|
||||
Iterator2 it2 = first2;
|
||||
Iterator1 next1 = std::next(first1);
|
||||
Iterator2 next2 = std::next(first2);
|
||||
Iterator1 prev1 = first1;
|
||||
while (next1 != last1) {
|
||||
if ((*it1 == *it2 && *next1 == *next2)) {
|
||||
return std::distance(first1, it1);
|
||||
}
|
||||
if (*it1 == *next1 && *it1 == *prev1) {
|
||||
return std::distance(first1, prev1);
|
||||
}
|
||||
prev1 = it1;
|
||||
it1 = next1; it2 = next2;
|
||||
++next1; ++next2;
|
||||
}
|
||||
}
|
||||
return std::distance(first1, last1);
|
||||
}
|
||||
|
||||
size_t reserve_size(const vector<uint8_t> &line) {
|
||||
// Big enough to store the line uncompressed together with an Substitute
|
||||
// command with many overflow bytes.
|
||||
return line.size() + 16;
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
vector<uint8_t> encode_line(const vector<uint8_t> &line,
|
||||
const vector<uint8_t> &reference) {
|
||||
assert(line.size() == reference.size());
|
||||
if (all_zeros(line)) {
|
||||
return vector<uint8_t>(1, 0xFF);
|
||||
}
|
||||
|
||||
vector<uint8_t> output;
|
||||
output.reserve(reserve_size(line));
|
||||
output.push_back(0); // first byte is the edit count
|
||||
|
||||
const uint8_t max_edits = 254;
|
||||
int num_edits = 0;
|
||||
|
||||
auto line_it = line.begin();
|
||||
auto ref_it = reference.begin();
|
||||
while (1) {
|
||||
int offset = skip_to_next_mismatch(&line_it, line.end(), &ref_it);
|
||||
if (line_it == line.end()) {
|
||||
// No more differences, we're done.
|
||||
break;
|
||||
}
|
||||
|
||||
if (++num_edits == max_edits) {
|
||||
// We've run out of edits. Just output the rest of the line in a big
|
||||
// substitute command.
|
||||
write_substitute(offset, line_it, line.end(), &output);
|
||||
break;
|
||||
}
|
||||
|
||||
int s = substitute_length(line_it, line.end(), ref_it);
|
||||
if (s > 0) {
|
||||
write_substitute(offset, line_it, std::next(line_it, s), &output);
|
||||
line_it += s;
|
||||
ref_it += s;
|
||||
} else {
|
||||
int r = repeat_length(line_it, line.end());
|
||||
assert(r >= 2);
|
||||
write_repeat(offset, r, *line_it, &output);
|
||||
line_it += r;
|
||||
ref_it += r;
|
||||
}
|
||||
}
|
||||
|
||||
assert(num_edits <= max_edits);
|
||||
output[0] = num_edits;
|
||||
return output;
|
||||
}
|
||||
|
||||
vector<uint8_t> encode_line(const vector<uint8_t> &line) {
|
||||
if (all_zeros(line)) {
|
||||
return vector<uint8_t>(1, 0xFF);
|
||||
}
|
||||
vector<uint8_t> buf;
|
||||
buf.reserve(reserve_size(line));
|
||||
buf.push_back(1);
|
||||
write_substitute(0, line.begin(), line.end(), &buf);
|
||||
return buf;
|
||||
}
|
||||
@@ -1,31 +0,0 @@
|
||||
// This file is part of the brlaser printer driver.
|
||||
//
|
||||
// Copyright 2013 Peter De Wachter
|
||||
//
|
||||
// brlaser is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 2 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// brlaser is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with brlaser. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#ifndef LINE_H
|
||||
#define LINE_H
|
||||
|
||||
#include <stdint.h>
|
||||
#include <vector>
|
||||
|
||||
std::vector<uint8_t> encode_line(
|
||||
const std::vector<uint8_t> &line,
|
||||
const std::vector<uint8_t> &reference);
|
||||
|
||||
std::vector<uint8_t> encode_line(
|
||||
const std::vector<uint8_t> &line);
|
||||
|
||||
#endif // LINE_H
|
||||
@@ -1,205 +0,0 @@
|
||||
// This file is part of the brlaser printer driver.
|
||||
//
|
||||
// Copyright 2013 Peter De Wachter
|
||||
//
|
||||
// brlaser is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 2 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// brlaser is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with brlaser. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#include <stdio.h>
|
||||
#include <signal.h>
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
#include <cups/raster.h>
|
||||
#include <algorithm>
|
||||
#include <functional>
|
||||
#include <string>
|
||||
#include <array>
|
||||
#include <map>
|
||||
#include "config.h"
|
||||
#include "job.h"
|
||||
#include "debug.h"
|
||||
|
||||
|
||||
namespace {
|
||||
|
||||
cups_raster_t *ras;
|
||||
volatile sig_atomic_t interrupted = 0;
|
||||
|
||||
|
||||
void sigterm_handler(int sig) {
|
||||
interrupted = 1;
|
||||
}
|
||||
|
||||
|
||||
bool next_line(std::vector<uint8_t> &buf) {
|
||||
if (interrupted) {
|
||||
return false;
|
||||
}
|
||||
return cupsRasterReadPixels(ras, buf.data(), buf.size()) == buf.size();
|
||||
}
|
||||
|
||||
|
||||
bool plain_ascii_string(const char *str) {
|
||||
bool result = true;
|
||||
for (; result && *str; str++) {
|
||||
result = *str >= 32 && *str <= 126;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
std::string ascii_job_name(const char *job_id, const char *job_user, const char *job_name) {
|
||||
std::array<const char *, 3> parts = {{
|
||||
job_id,
|
||||
job_user,
|
||||
job_name
|
||||
}};
|
||||
std::string result;
|
||||
for (const char *part : parts) {
|
||||
if (*part && plain_ascii_string(part)) {
|
||||
if (!result.empty()) {
|
||||
result += '/';
|
||||
}
|
||||
result += part;
|
||||
}
|
||||
}
|
||||
if (result.empty()) {
|
||||
result = "brlaser";
|
||||
}
|
||||
const int max_size = 79;
|
||||
if (result.size() > max_size) {
|
||||
result.resize(max_size);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
page_params build_page_params(const cups_page_header2_t &header) {
|
||||
static const std::array<std::string, 6> sources = {{
|
||||
"AUTO", "T1", "T2", "T3", "MP", "MANUAL"
|
||||
}};
|
||||
static const std::map<std::string, std::string> sizes = {
|
||||
{ "A4", "A4" },
|
||||
{ "A5", "A5" },
|
||||
{ "A6", "A6" },
|
||||
{ "B5", "B5" },
|
||||
{ "B6", "B6" },
|
||||
{ "EnvC5", "C5" },
|
||||
{ "EnvMonarch", "MONARCH" },
|
||||
{ "EnvPRC5", "DL" },
|
||||
{ "EnvDL", "DL" },
|
||||
{ "Executive", "EXECUTIVE" },
|
||||
{ "Legal", "LEGAL" },
|
||||
{ "Letter", "LETTER" }
|
||||
};
|
||||
|
||||
page_params p = { };
|
||||
p.num_copies = header.NumCopies;
|
||||
p.resolution = header.HWResolution[0];
|
||||
p.economode = header.cupsInteger[10];
|
||||
p.mediatype = header.MediaType;
|
||||
p.duplex = header.Duplex;
|
||||
|
||||
if (header.MediaPosition < sources.size())
|
||||
p.sourcetray = sources[header.MediaPosition];
|
||||
else
|
||||
p.sourcetray = sources[0];
|
||||
|
||||
auto size_it = sizes.find(header.cupsPageSizeName);
|
||||
if (size_it != sizes.end())
|
||||
p.papersize = size_it->second;
|
||||
else
|
||||
p.papersize = "A4";
|
||||
|
||||
return p;
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
|
||||
int main(int argc, char *argv[]) {
|
||||
fprintf(stderr, "INFO: %s version %s\n", PACKAGE, VERSION);
|
||||
|
||||
if (argc != 6 && argc != 7) {
|
||||
fprintf(stderr, "ERROR: rastertobrlaser job-id user title copies options [file]\n");
|
||||
fprintf(stderr, "INFO: This program is a CUPS filter. It is not intended to be run manually.\n");
|
||||
return 1;
|
||||
}
|
||||
const char *job_id = argv[1];
|
||||
const char *job_user = argv[2];
|
||||
const char *job_name = argv[3];
|
||||
// const int job_copies = atoi(argv[4]);
|
||||
// const char *job_options = argv[5];
|
||||
const char *job_filename = argv[6];
|
||||
// const char *job_charset = getenv("CHARSET");
|
||||
|
||||
signal(SIGTERM, sigterm_handler);
|
||||
signal(SIGPIPE, SIG_IGN);
|
||||
|
||||
int fd = STDIN_FILENO;
|
||||
if (job_filename) {
|
||||
fd = open(job_filename, O_RDONLY);
|
||||
if (fd < 0) {
|
||||
fprintf(stderr, "ERROR: " PACKAGE ": Unable to open raster file\n");
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef __OpenBSD__
|
||||
if (pledge("stdio", nullptr) != 0) {
|
||||
fprintf(stderr, "ERROR: " PACKAGE ": pledge failed\n");
|
||||
return 1;
|
||||
}
|
||||
#endif
|
||||
|
||||
ras = cupsRasterOpen(fd, CUPS_RASTER_READ);
|
||||
if (!ras) {
|
||||
fprintf(stderr, "DEBUG: " PACKAGE ": Cannot read raster data. Most likely an earlier filter in the pipeline failed.\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
int pages = 0;
|
||||
{
|
||||
job job(stdout, ascii_job_name(job_id, job_user, job_name));
|
||||
cups_page_header2_t header;
|
||||
while (!interrupted && cupsRasterReadHeader2(ras, &header)) {
|
||||
if (header.cupsBitsPerPixel != 1
|
||||
|| header.cupsBitsPerColor != 1
|
||||
|| header.cupsNumColors != 1
|
||||
|| header.cupsBytesPerLine > 10000) {
|
||||
fprintf(stderr, "ERROR: " PACKAGE ": Page %d: Bogus raster data.\n", pages + 1);
|
||||
dump_page_header(header);
|
||||
return 1;
|
||||
}
|
||||
if (pages == 0) {
|
||||
fprintf(stderr, "DEBUG: " PACKAGE ": Page header of first page\n");
|
||||
dump_page_header(header);
|
||||
}
|
||||
job.encode_page(build_page_params(header),
|
||||
header.cupsHeight,
|
||||
header.cupsBytesPerLine,
|
||||
next_line);
|
||||
fprintf(stderr, "PAGE: %d %d\n", ++pages, header.NumCopies);
|
||||
}
|
||||
}
|
||||
|
||||
if (pages == 0) {
|
||||
fprintf(stderr, "ERROR: " PACKAGE ": No pages were found.\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
fflush(stdout);
|
||||
if (ferror(stdout)) {
|
||||
fprintf(stderr, "DEBUG: " PACKAGE ": Could not write print data. Most likely the CUPS backend failed.\n");
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@@ -1,199 +0,0 @@
|
||||
// Copyright 2013 by Martin Moene
|
||||
//
|
||||
// lest is based on ideas by Kevlin Henney, see video at
|
||||
// http://skillsmatter.com/podcast/agile-testing/kevlin-henney-rethinking-unit-testing-in-c-plus-plus
|
||||
//
|
||||
// Distributed under the Boost Software License, Version 1.0:
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person or organization
|
||||
// obtaining a copy of the software and accompanying documentation covered by
|
||||
// this license (the "Software") to use, reproduce, display, distribute,
|
||||
// execute, and transmit the Software, and to prepare derivative works of the
|
||||
// Software, and to permit third-parties to whom the Software is furnished to
|
||||
// do so, all subject to the following:
|
||||
//
|
||||
// The copyright notices in the Software and this entire statement, including
|
||||
// the above license grant, this restriction and the following disclaimer,
|
||||
// must be included in all copies of the Software, in whole or in part, and
|
||||
// all derivative works of the Software, unless such copies or derivative
|
||||
// works are solely in the form of machine-executable object code generated by
|
||||
// a source language processor.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
|
||||
// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
|
||||
// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
|
||||
// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
// DEALINGS IN THE SOFTWARE.
|
||||
|
||||
#ifndef LEST_LEST_H_INCLUDED
|
||||
#define LEST_LEST_H_INCLUDED
|
||||
|
||||
#include <functional>
|
||||
#include <iostream>
|
||||
#include <stdexcept>
|
||||
#include <string>
|
||||
#include <cstddef>
|
||||
|
||||
#ifndef lest_NO_SHORT_ASSERTION_NAMES
|
||||
# define EXPECT lest_EXPECT
|
||||
# define EXPECT_THROWS lest_EXPECT_THROWS
|
||||
# define EXPECT_THROWS_AS lest_EXPECT_THROWS_AS
|
||||
#endif
|
||||
|
||||
#define lest_EXPECT( expr ) \
|
||||
try \
|
||||
{ \
|
||||
if ( ! (expr) ) \
|
||||
throw lest::failure{ lest_LOCATION, #expr }; \
|
||||
} \
|
||||
catch( lest::failure const & ) \
|
||||
{ \
|
||||
throw ; \
|
||||
} \
|
||||
catch( std::exception const & e ) \
|
||||
{ \
|
||||
throw lest::unexpected{ lest_LOCATION, #expr, lest::with_message( e.what() ) }; \
|
||||
} \
|
||||
catch(...) \
|
||||
{ \
|
||||
throw lest::unexpected{ lest_LOCATION, #expr, "of unknown type" }; \
|
||||
}
|
||||
|
||||
#define lest_EXPECT_THROWS( expr ) \
|
||||
for (;;) \
|
||||
{ \
|
||||
try { lest::serum( expr ); } catch (...) { break; } \
|
||||
throw lest::expected{ lest_LOCATION, #expr }; \
|
||||
}
|
||||
|
||||
#define lest_EXPECT_THROWS_AS( expr, excpt ) \
|
||||
for (;;) \
|
||||
{ \
|
||||
try { lest::serum( expr ); } catch ( excpt & ) { break; } catch (...) {} \
|
||||
throw lest::expected{ lest_LOCATION, #expr, lest::of_type( #excpt ) }; \
|
||||
}
|
||||
|
||||
#define lest_LOCATION lest::location{__FILE__, __LINE__}
|
||||
|
||||
namespace lest {
|
||||
|
||||
struct test
|
||||
{
|
||||
const std::string name;
|
||||
const std::function<void()> behaviour;
|
||||
};
|
||||
|
||||
struct location
|
||||
{
|
||||
const std::string file;
|
||||
const int line;
|
||||
|
||||
location( std::string file, int line )
|
||||
: file{ file }, line{ line } {}
|
||||
};
|
||||
|
||||
struct comment
|
||||
{
|
||||
const std::string text;
|
||||
|
||||
comment( std::string text ) : text{ text } {}
|
||||
explicit operator bool() { return ! text.empty(); }
|
||||
};
|
||||
|
||||
struct message : std::runtime_error
|
||||
{
|
||||
const std::string kind;
|
||||
const location where;
|
||||
const comment note;
|
||||
|
||||
~message() throw() {} // GCC 4.6
|
||||
|
||||
message( std::string kind, location where, std::string expr, std::string note = "" )
|
||||
: std::runtime_error{ expr }, kind{ kind }, where{ where }, note{ note } {}
|
||||
};
|
||||
|
||||
struct failure : message
|
||||
{
|
||||
failure( location where, std::string expr )
|
||||
: message{ "failed", where, expr } {}
|
||||
};
|
||||
|
||||
struct expected : message
|
||||
{
|
||||
expected( location where, std::string expr, std::string excpt = "" )
|
||||
: message{ "failed: didn't get exception", where, expr, excpt } {}
|
||||
};
|
||||
|
||||
struct unexpected : message
|
||||
{
|
||||
unexpected( location where, std::string expr, std::string note )
|
||||
: message{ "failed: got unexpected exception", where, expr, note } {}
|
||||
};
|
||||
|
||||
inline bool serum( bool verum ) { return verum; }
|
||||
|
||||
inline std::string with_message( std::string text )
|
||||
{
|
||||
return "with message \"" + text + "\"";
|
||||
}
|
||||
|
||||
inline std::string of_type( std::string text )
|
||||
{
|
||||
return "of type " + text;
|
||||
}
|
||||
|
||||
inline std::string pluralise( int n, std::string text )
|
||||
{
|
||||
return n == 1 ? text : text + "s";
|
||||
}
|
||||
|
||||
inline std::ostream & operator<<( std::ostream & os, comment note )
|
||||
{
|
||||
return os << (note ? " " + note.text : "" );
|
||||
}
|
||||
|
||||
inline std::ostream & operator<<( std::ostream & os, location where )
|
||||
{
|
||||
#ifdef __GNUG__
|
||||
return os << where.file << ":" << where.line;
|
||||
#else
|
||||
return os << where.file << "(" << where.line << ")";
|
||||
#endif
|
||||
}
|
||||
|
||||
inline void report( std::ostream & os, message const & e, std::string test )
|
||||
{
|
||||
os << e.where << ": " << e.kind << e.note << ": " << test << ": " << e.what() << std::endl;
|
||||
}
|
||||
|
||||
template<std::size_t N>
|
||||
int run( test const (&specification)[N], std::ostream & os = std::cout )
|
||||
{
|
||||
int failures = 0;
|
||||
|
||||
for ( auto & testing : specification )
|
||||
{
|
||||
try
|
||||
{
|
||||
testing.behaviour();
|
||||
}
|
||||
catch( message const & e )
|
||||
{
|
||||
++failures;
|
||||
report( os, e, testing.name );
|
||||
}
|
||||
}
|
||||
|
||||
if ( failures > 0 )
|
||||
{
|
||||
os << failures << " out of " << N << " " << pluralise(N, "test") << " failed." << std::endl;
|
||||
}
|
||||
|
||||
return failures;
|
||||
}
|
||||
|
||||
} // namespace lest
|
||||
|
||||
#endif // LEST_LEST_H_INCLUDED
|
||||
@@ -1,54 +0,0 @@
|
||||
// This file is part of the brlaser printer driver.
|
||||
//
|
||||
// Copyright 2014 Peter De Wachter
|
||||
//
|
||||
// brlaser is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 2 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// brlaser is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with brlaser. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#ifndef TEMPFILE_H
|
||||
#define TEMPFILE_H
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <vector>
|
||||
|
||||
class tempfile {
|
||||
public:
|
||||
explicit tempfile()
|
||||
: ptr_(0),
|
||||
size_(0),
|
||||
file_(open_memstream(&ptr_, &size_)) {
|
||||
}
|
||||
|
||||
~tempfile() {
|
||||
fclose(file_);
|
||||
free(ptr_);
|
||||
}
|
||||
|
||||
FILE *file() {
|
||||
return file_;
|
||||
}
|
||||
|
||||
std::vector<uint8_t> data() {
|
||||
if (fflush(file_))
|
||||
return std::vector<uint8_t>();
|
||||
return std::vector<uint8_t>(ptr_, ptr_ + size_);
|
||||
}
|
||||
|
||||
private:
|
||||
char *ptr_;
|
||||
size_t size_;
|
||||
FILE *file_;
|
||||
};
|
||||
|
||||
#endif // TEMPFILE_H
|
||||
@@ -1,91 +0,0 @@
|
||||
// This file is part of the brlaser printer driver.
|
||||
//
|
||||
// Copyright 2014 Peter De Wachter
|
||||
//
|
||||
// brlaser is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 2 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// brlaser is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with brlaser. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#include "lest.hpp"
|
||||
#include <stdint.h>
|
||||
#include <vector>
|
||||
#include "tempfile.h"
|
||||
#include "../src/block.h"
|
||||
|
||||
typedef std::vector<uint8_t> vec;
|
||||
|
||||
const lest::test specification[] = {
|
||||
"A block is created empty",
|
||||
[] {
|
||||
block b;
|
||||
EXPECT(b.empty());
|
||||
},
|
||||
|
||||
"Adding a line makes a block no longer empty",
|
||||
[] {
|
||||
block b;
|
||||
b.add_line(vec{1});
|
||||
EXPECT(!b.empty());
|
||||
},
|
||||
|
||||
"A block can contain 128 lines",
|
||||
[] {
|
||||
block b;
|
||||
for (int i = 0; i < 128; ++i) {
|
||||
EXPECT(b.line_fits(1));
|
||||
b.add_line(vec(1));
|
||||
}
|
||||
EXPECT(!b.line_fits(1));
|
||||
},
|
||||
|
||||
"A block has a size limit of about 16 kilobyte",
|
||||
[] {
|
||||
block b;
|
||||
for (int i = 0; i < 16; ++i) {
|
||||
EXPECT(b.line_fits(1000));
|
||||
b.add_line(vec(1000));
|
||||
}
|
||||
EXPECT(!b.line_fits(400));
|
||||
},
|
||||
|
||||
"Flushing an empty block does nothing",
|
||||
[] {
|
||||
block b;
|
||||
tempfile f;
|
||||
b.flush(f.file());
|
||||
EXPECT(f.data().empty());
|
||||
},
|
||||
|
||||
"Flush() writes the lines to a file with a proper header",
|
||||
[] {
|
||||
block b;
|
||||
for (uint8_t n = 1; n < 6; ++n) {
|
||||
b.add_line(vec{n, n});
|
||||
}
|
||||
tempfile f;
|
||||
b.flush(f.file());
|
||||
EXPECT(( f.data() == vec{'1','2','w',0,5,1,1,2,2,3,3,4,4,5,5} ));
|
||||
},
|
||||
|
||||
"After flush() a block is empty again",
|
||||
[] {
|
||||
block b;
|
||||
b.add_line(vec{1});
|
||||
tempfile f;
|
||||
b.flush(f.file());
|
||||
EXPECT(b.empty());
|
||||
}
|
||||
};
|
||||
|
||||
int main() {
|
||||
return lest::run(specification);
|
||||
}
|
||||
@@ -1,291 +0,0 @@
|
||||
// Copyright 2013 by Martin Moene
|
||||
//
|
||||
// Distributed under the Boost Software License, Version 1.0:
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person or organization
|
||||
// obtaining a copy of the software and accompanying documentation covered by
|
||||
// this license (the "Software") to use, reproduce, display, distribute,
|
||||
// execute, and transmit the Software, and to prepare derivative works of the
|
||||
// Software, and to permit third-parties to whom the Software is furnished to
|
||||
// do so, all subject to the following:
|
||||
//
|
||||
// The copyright notices in the Software and this entire statement, including
|
||||
// the above license grant, this restriction and the following disclaimer,
|
||||
// must be included in all copies of the Software, in whole or in part, and
|
||||
// all derivative works of the Software, unless such copies or derivative
|
||||
// works are solely in the form of machine-executable object code generated by
|
||||
// a source language processor.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
|
||||
// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
|
||||
// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
|
||||
// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
// DEALINGS IN THE SOFTWARE.
|
||||
|
||||
#include "lest.hpp"
|
||||
#include <sstream>
|
||||
|
||||
using namespace lest;
|
||||
|
||||
const lest::test specification[] =
|
||||
{
|
||||
"Function to suppress warning \"expression has no effect\" acts as identity function", []
|
||||
{
|
||||
EXPECT( false == serum( false ) );
|
||||
EXPECT( true == serum( true ) );
|
||||
},
|
||||
|
||||
"Function with_message() returns correct string", []
|
||||
{
|
||||
std::string msg = "Let writing tests become irresistibly easy and attractive.";
|
||||
EXPECT( "with message \"" + msg + "\"" == with_message( msg ) );
|
||||
},
|
||||
|
||||
"Function of_type() returns correct string", []
|
||||
{
|
||||
std::string msg = "this_type";
|
||||
EXPECT( "of type " + msg == of_type( msg ) );
|
||||
},
|
||||
|
||||
"Function pluralise() adds 's' except for 1 item", []
|
||||
{
|
||||
std::string word = "hammer";
|
||||
EXPECT( word == pluralise( 1, word ) );
|
||||
for ( auto i : {0,2,3,4,5,6,7,8,9,10,11,12} )
|
||||
EXPECT( word + "s" == pluralise( i, word ) );
|
||||
},
|
||||
|
||||
"Location constructs properly", []
|
||||
{
|
||||
char const * file = __FILE__; int line = __LINE__;
|
||||
location where{ file, line };
|
||||
EXPECT( file == where.file );
|
||||
EXPECT( line == where.line );
|
||||
},
|
||||
|
||||
"Comment constructs properly", []
|
||||
{
|
||||
std::string text = __FILE__;
|
||||
comment note = text;
|
||||
EXPECT( text == note.text );
|
||||
},
|
||||
|
||||
"Comment converted to bool indicates absence or presence of comment", []
|
||||
{
|
||||
EXPECT( false == bool( comment( "") ) );
|
||||
EXPECT( true == bool( comment("x") ) );
|
||||
},
|
||||
|
||||
"Failure exception type constructs and prints properly", []
|
||||
{
|
||||
std::string name = "test-name";
|
||||
failure msg( location{"filename.cpp", 765}, "expression" );
|
||||
|
||||
std::ostringstream os;
|
||||
report( os, msg, name );
|
||||
|
||||
#ifndef __GNUG__
|
||||
EXPECT( os.str() == "filename.cpp(765): failed: test-name: expression\n" );
|
||||
#else
|
||||
EXPECT( os.str() == "filename.cpp:765: failed: test-name: expression\n" );
|
||||
#endif
|
||||
},
|
||||
|
||||
"Expected exception type constructs and prints properly", []
|
||||
{
|
||||
std::string name = "test-name";
|
||||
expected msg( location{"filename.cpp", 765}, "expression" );
|
||||
|
||||
std::ostringstream os;
|
||||
report( os, msg, name );
|
||||
|
||||
#ifndef __GNUG__
|
||||
EXPECT( os.str() == "filename.cpp(765): failed: didn't get exception: test-name: expression\n" );
|
||||
#else
|
||||
EXPECT( os.str() == "filename.cpp:765: failed: didn't get exception: test-name: expression\n" );
|
||||
#endif
|
||||
},
|
||||
|
||||
"Unexpected exception type constructs and prints properly", []
|
||||
{
|
||||
std::string name = "test-name";
|
||||
unexpected msg( location{"filename.cpp", 765}, "expression", "exception-type" );
|
||||
|
||||
std::ostringstream os;
|
||||
report( os, msg, name );
|
||||
|
||||
#ifndef __GNUG__
|
||||
EXPECT( os.str() == "filename.cpp(765): failed: got unexpected exception exception-type: test-name: expression\n" );
|
||||
#else
|
||||
EXPECT( os.str() == "filename.cpp:765: failed: got unexpected exception exception-type: test-name: expression\n" );
|
||||
#endif
|
||||
},
|
||||
|
||||
"Expect generates no message exception for a succeeding test", []
|
||||
{
|
||||
test pass = { "P", [] { EXPECT( true ); } };
|
||||
|
||||
try { pass.behaviour(); }
|
||||
catch(...) { throw failure(location{__FILE__,__LINE__}, "unexpected error generated"); }
|
||||
},
|
||||
|
||||
"Expect generates a message exception for a failing test", []
|
||||
{
|
||||
test fail = { "F", [] { EXPECT( false ); } };
|
||||
|
||||
for (;;)
|
||||
{
|
||||
try { fail.behaviour(); } catch ( message & ) { break; }
|
||||
throw failure(location{__FILE__,__LINE__}, "no error generated");
|
||||
}
|
||||
},
|
||||
|
||||
"Expect succeeds for success (true) and failure (false)", []
|
||||
{
|
||||
test pass[] = {{ "P", [] { EXPECT( true ); } }};
|
||||
test fail[] = {{ "F", [] { EXPECT( false ); } }};
|
||||
|
||||
std::ostringstream os;
|
||||
|
||||
EXPECT( 0 == run( pass, os ) );
|
||||
EXPECT( 1 == run( fail, os ) );
|
||||
},
|
||||
|
||||
"Expect succeeds for integer comparation", []
|
||||
{
|
||||
test pass [] = {{ "P" , [] { EXPECT( 7 == 7 ); EXPECT( 7 != 8 );
|
||||
EXPECT( 7 >= 6 ); EXPECT( 7 <= 8 );
|
||||
EXPECT( 7 > 6 ); EXPECT( 7 < 8 ); } }};
|
||||
test fail_1[] = {{ "F1", [] { EXPECT( 7 == 8 ); } }};
|
||||
test fail_2[] = {{ "F2", [] { EXPECT( 7 != 7 ); } }};
|
||||
test fail_3[] = {{ "F3", [] { EXPECT( 7 <= 6 ); } }};
|
||||
test fail_4[] = {{ "F4", [] { EXPECT( 7 >= 8 ); } }};
|
||||
test fail_5[] = {{ "F5", [] { EXPECT( 7 < 6 ); } }};
|
||||
test fail_6[] = {{ "F6", [] { EXPECT( 7 > 8 ); } }};
|
||||
|
||||
std::ostringstream os;
|
||||
|
||||
EXPECT( 0 == run( pass , os ) );
|
||||
EXPECT( 1 == run( fail_1, os ) );
|
||||
EXPECT( 1 == run( fail_2, os ) );
|
||||
EXPECT( 1 == run( fail_3, os ) );
|
||||
EXPECT( 1 == run( fail_4, os ) );
|
||||
EXPECT( 1 == run( fail_5, os ) );
|
||||
EXPECT( 1 == run( fail_6, os ) );
|
||||
},
|
||||
|
||||
"Expect succeeds for string comparation", []
|
||||
{
|
||||
std::string a("a"); std::string b("b");
|
||||
test pass [] = {{ "P" , [=]() { EXPECT( a == a ); EXPECT( a != b );
|
||||
EXPECT( b >= a ); EXPECT( a <= b );
|
||||
EXPECT( b > a ); EXPECT( a < b ); } }};
|
||||
test fail_1[] = {{ "F1", [=]() { EXPECT( a == b ); } }};
|
||||
test fail_2[] = {{ "F2", [=]() { EXPECT( a != a ); } }};
|
||||
test fail_3[] = {{ "F3", [=]() { EXPECT( b <= a ); } }};
|
||||
test fail_4[] = {{ "F4", [=]() { EXPECT( a >= b ); } }};
|
||||
test fail_5[] = {{ "F5", [=]() { EXPECT( b < a ); } }};
|
||||
test fail_6[] = {{ "F6", [=]() { EXPECT( a > b ); } }};
|
||||
|
||||
std::ostringstream os;
|
||||
|
||||
EXPECT( 0 == run( pass , os ) );
|
||||
EXPECT( 1 == run( fail_1, os ) );
|
||||
EXPECT( 1 == run( fail_2, os ) );
|
||||
EXPECT( 1 == run( fail_3, os ) );
|
||||
EXPECT( 1 == run( fail_4, os ) );
|
||||
EXPECT( 1 == run( fail_5, os ) );
|
||||
EXPECT( 1 == run( fail_6, os ) );
|
||||
},
|
||||
|
||||
"Function run() returns the right failure count", []
|
||||
{
|
||||
test pass [] = {{ "P" , [] { EXPECT( 1==1 ); } }};
|
||||
test fail_1[] = {{ "F1", [] { EXPECT( 0==1 ); } }};
|
||||
test fail_3[] = {{ "F1", [] { EXPECT( 0==1 ); } },
|
||||
{ "F2", [] { EXPECT( 0==1 ); } },
|
||||
{ "F3", [] { EXPECT( 0==1 ); } },};
|
||||
|
||||
std::ostringstream os;
|
||||
|
||||
EXPECT( 0 == run( pass , os ) );
|
||||
EXPECT( 1 == run( fail_1, os ) );
|
||||
EXPECT( 3 == run( fail_3, os ) );
|
||||
},
|
||||
|
||||
"Expect succeeds with an unexpected standard exception", []
|
||||
{
|
||||
std::string text = "hello-world";
|
||||
test pass[] = {{ "P", [=]() { EXPECT( (throw std::runtime_error(text), true) ); } }};
|
||||
|
||||
std::ostringstream os;
|
||||
|
||||
EXPECT( 1 == run( pass, os ) );
|
||||
EXPECT( std::string::npos != os.str().find(text) );
|
||||
},
|
||||
|
||||
"Expect succeeds with an unexpected non-standard exception", []
|
||||
{
|
||||
test pass[] = {{ "P", [] { EXPECT( (throw 77, true) ); } }};
|
||||
|
||||
std::ostringstream os;
|
||||
|
||||
EXPECT( 1 == run( pass, os ) );
|
||||
},
|
||||
|
||||
"Expect_throws succeeds with an expected standard exception", []
|
||||
{
|
||||
std::string text = "hello-world";
|
||||
test pass[] = {{ "P", [=]() { EXPECT_THROWS( (throw std::runtime_error(text), true) ); } }};
|
||||
test fail[] = {{ "F", [ ]() { EXPECT_THROWS( true ); } }};
|
||||
|
||||
std::ostringstream os;
|
||||
|
||||
EXPECT( 0 == run( pass, os ) );
|
||||
EXPECT( 1 == run( fail, os ) );
|
||||
},
|
||||
|
||||
"Expect_throws succeeds with an expected non-standard exception", []
|
||||
{
|
||||
test pass[] = {{ "P", [] { EXPECT_THROWS( (throw 77, true) ); } }};
|
||||
test fail[] = {{ "F", [] { EXPECT_THROWS( true ); } }};
|
||||
|
||||
std::ostringstream os;
|
||||
|
||||
EXPECT( 0 == run( pass, os ) );
|
||||
EXPECT( 1 == run( fail, os ) );
|
||||
},
|
||||
|
||||
"Expect_throws_as succeeds with a specific expected standard exception", []
|
||||
{
|
||||
test pass[] = {{ "P", [] { EXPECT_THROWS_AS( (throw std::bad_alloc(), true), std::bad_alloc ); } }};
|
||||
test fail[] = {{ "F", [] { EXPECT_THROWS_AS( (throw std::bad_alloc(), true), std::runtime_error ); } }};
|
||||
|
||||
std::ostringstream os;
|
||||
|
||||
EXPECT( 0 == run( pass, os ) );
|
||||
EXPECT( 1 == run( fail, os ) );
|
||||
},
|
||||
|
||||
"Expect_throws_as succeeds with a specific expected non-standard exception", []
|
||||
{
|
||||
test pass[] = {{ "P", [] { EXPECT_THROWS_AS( (throw 77, true), int ); } }};
|
||||
test fail[] = {{ "F", [] { EXPECT_THROWS_AS( (throw 77, true), std::runtime_error ); } }};
|
||||
|
||||
std::ostringstream os;
|
||||
|
||||
EXPECT( 0 == run( pass, os ) );
|
||||
EXPECT( 1 == run( fail, os ) );
|
||||
},
|
||||
};
|
||||
|
||||
int main()
|
||||
{
|
||||
return lest::run( specification );
|
||||
}
|
||||
|
||||
// cl -nologo -Wall -EHsc test_lest.cpp && test_lest
|
||||
// g++ -Wall -Wextra -Weffc++ -std=c++11 -o test_lest.exe test_lest.cpp && test_lest
|
||||
|
||||
@@ -1,150 +0,0 @@
|
||||
// This file is part of the brlaser printer driver.
|
||||
//
|
||||
// Copyright 2014 Peter De Wachter
|
||||
//
|
||||
// brlaser is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 2 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// brlaser is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with brlaser. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#include "lest.hpp"
|
||||
#include <assert.h>
|
||||
#include <stdint.h>
|
||||
#include <vector>
|
||||
#include "../src/line.h"
|
||||
|
||||
typedef std::vector<uint8_t> vec;
|
||||
|
||||
|
||||
uint8_t sub(uint8_t offset, uint8_t count) {
|
||||
assert(offset < 16);
|
||||
assert(count < 8);
|
||||
return (offset << 3) | count;
|
||||
}
|
||||
|
||||
uint8_t rep(uint8_t offset, uint8_t count) {
|
||||
assert(offset < 4);
|
||||
assert(count < 32);
|
||||
return 128 | (offset << 5) | count;
|
||||
}
|
||||
|
||||
|
||||
const lest::test specification[] = {
|
||||
"Don't crash on zero-length lines",
|
||||
[] {
|
||||
EXPECT(( encode_line(vec{}) == vec{0xFF} ));
|
||||
EXPECT(( encode_line(vec{}, vec{}) == vec{0xFF} ));
|
||||
},
|
||||
|
||||
"Encoding an initial blank line",
|
||||
[] {
|
||||
EXPECT(( encode_line(vec{0,0,0}) == vec{0xFF} ));
|
||||
},
|
||||
|
||||
"Encoding an initial non-blank line",
|
||||
[] {
|
||||
EXPECT(( encode_line(vec{1,2,3}) == (vec{1,sub(0,2),1,2,3}) ));
|
||||
},
|
||||
|
||||
"Encoding a (non-initial) blank line",
|
||||
[] {
|
||||
EXPECT(( encode_line(vec{0,0,0}, vec{1,2,3}) == vec{0xFF} ));
|
||||
},
|
||||
|
||||
"Encoding a repeated line",
|
||||
[] {
|
||||
EXPECT(( encode_line(vec{1,2,3}, vec{1,2,3}) == vec{0} ));
|
||||
},
|
||||
|
||||
"Using a subsitute command",
|
||||
[] {
|
||||
EXPECT(( encode_line(vec{0,0,1,2,3,0,0}, vec(7)) == vec{1,sub(2,2),1,2,3} ));
|
||||
},
|
||||
|
||||
"Using a repeat command",
|
||||
[] {
|
||||
EXPECT(( encode_line(vec{0,0,1,1,0,0}, vec(6)) == vec{1,rep(2,0),1} ));
|
||||
},
|
||||
|
||||
"Repeat command followed by substitute command",
|
||||
[] {
|
||||
EXPECT(( encode_line(vec{1,1,1,2,3}, vec(5)) == vec{2,rep(0,1),1,sub(0,1),2,3} ));
|
||||
},
|
||||
|
||||
"Substitute comand followed by repeat command",
|
||||
[] {
|
||||
EXPECT(( encode_line(vec{3,2,1,1,1}, vec(5)) == vec{2,sub(0,1),3,2,rep(0,1),1} ));
|
||||
},
|
||||
|
||||
"Substitute with an unmodified byte in the middle",
|
||||
[] {
|
||||
EXPECT(( encode_line(vec{1,2,3,0,1,2,3}, vec(7)) == vec{1,sub(0,6),1,2,3,0,1,2,3} ));
|
||||
},
|
||||
|
||||
"Substitue with two unmodified bytes in the middle",
|
||||
[] {
|
||||
EXPECT(( encode_line(vec{1,2,3,0,0,1,2,3}, vec(8)) == vec{2,sub(0,2),1,2,3,sub(2,2),1,2,3} ));
|
||||
},
|
||||
|
||||
"Repeat with an unmodified byte in the middle",
|
||||
[] {
|
||||
EXPECT(( encode_line(vec{1,1,1,0,1,1,1}, vec(7)) == vec{2,rep(0,1),1,rep(1,1),1} ));
|
||||
},
|
||||
|
||||
"254 edits needed for a single line",
|
||||
[] {
|
||||
vec line, result;
|
||||
for (int i = 0; i < 254; ++i)
|
||||
line.insert(line.end(), {0,0,1});
|
||||
result.push_back(254);
|
||||
for (int i = 0; i < 254; ++i)
|
||||
result.insert(result.end(), {sub(2,0),1});
|
||||
EXPECT(( encode_line(line, vec(line.size())) == result ));
|
||||
},
|
||||
|
||||
"Give up if more than 254 edits needed...",
|
||||
[] {
|
||||
vec line, result;
|
||||
for (int i = 0; i < 255; ++i)
|
||||
line.insert(line.end(), {0,0,1});
|
||||
result.push_back(254);
|
||||
for (int i = 0; i < 253; ++i)
|
||||
result.insert(result.end(), {sub(2,0),1});
|
||||
result.insert(result.end(), {sub(2,3),1,0,0,1});
|
||||
EXPECT(( encode_line(line, vec(line.size())) == result ));
|
||||
},
|
||||
|
||||
"Repeat command with overflow bytes",
|
||||
[] {
|
||||
vec line(3, 0);
|
||||
line.insert(line.end(), 512, 1);
|
||||
vec ref(line.size(), 0);
|
||||
vec expected{1,rep(3,31),0,255,224,1};
|
||||
EXPECT(encode_line(line, ref) == expected);
|
||||
},
|
||||
|
||||
"Substitute command with overflow bytes",
|
||||
[] {
|
||||
vec expected{1,sub(15,7),255,0,255,237};
|
||||
vec line(270, 0);
|
||||
for (int i = 0; i < 250; ++i) {
|
||||
expected.insert(expected.end(), {1,2});
|
||||
line.insert(line.end(), {1,2});
|
||||
}
|
||||
vec ref(line.size(), 0);
|
||||
EXPECT(encode_line(line, ref) == expected);
|
||||
},
|
||||
};
|
||||
|
||||
|
||||
int main() {
|
||||
return lest::run(specification);
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
# OpenMDRS configuration
|
||||
|
||||
Alias /opendrs /var/www/opendrs
|
||||
|
||||
<Directory /var/www/opendrs>
|
||||
Options Indexes FollowSymLinks MultiViews
|
||||
AllowOverride None
|
||||
Order allow,deny
|
||||
allow from all
|
||||
</Directory>
|
||||
@@ -1,24 +0,0 @@
|
||||
<IfModule alias_module>
|
||||
# Aliases: Add here as many aliases as you need (with no limit). The format is
|
||||
# Alias fakename realname
|
||||
#
|
||||
# Note that if you include a trailing / on fakename then the server will
|
||||
# require it to be present in the URL. So "/icons" isn't aliased in this
|
||||
# example, only "/icons/". If the fakename is slash-terminated, then the
|
||||
# realname must also be slash terminated, and if the fakename omits the
|
||||
# trailing slash, the realname must also omit it.
|
||||
#
|
||||
# We include the /icons/ alias for FancyIndexed directory listings. If
|
||||
# you do not use FancyIndexing, you may comment this out.
|
||||
|
||||
#Alias /icons/ "/usr/share/apache2/icons/"
|
||||
|
||||
<Directory "/usr/share/apache2/icons">
|
||||
Options FollowSymlinks
|
||||
AllowOverride None
|
||||
Require all granted
|
||||
</Directory>
|
||||
|
||||
</IfModule>
|
||||
|
||||
# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
|
||||
@@ -1,31 +0,0 @@
|
||||
<VirtualHost *:80>
|
||||
# The ServerName directive sets the request scheme, hostname and port that
|
||||
# the server uses to identify itself. This is used when creating
|
||||
# redirection URLs. In the context of virtual hosts, the ServerName
|
||||
# specifies what hostname must appear in the request's Host: header to
|
||||
# match this virtual host. For the default virtual host (this file) this
|
||||
# value is not decisive as it is used as a last resort host regardless.
|
||||
# However, you must set it for any further virtual host explicitly.
|
||||
#ServerName www.example.com
|
||||
|
||||
ServerAdmin webmaster@localhost
|
||||
DocumentRoot /var/www/opendrs
|
||||
|
||||
# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
|
||||
# error, crit, alert, emerg.
|
||||
# It is also possible to configure the loglevel for particular
|
||||
# modules, e.g.
|
||||
#LogLevel info ssl:warn
|
||||
|
||||
ErrorLog ${APACHE_LOG_DIR}/error.log
|
||||
CustomLog ${APACHE_LOG_DIR}/access.log combined
|
||||
|
||||
# For most configuration files from conf-available/, which are
|
||||
# enabled or disabled at a global level, it is possible to
|
||||
# include a line for only one particular virtual host. For example the
|
||||
# following line enables the CGI configuration for this host only
|
||||
# after it has been globally disabled with "a2disconf".
|
||||
#Include conf-available/serve-cgi-bin.conf
|
||||
</VirtualHost>
|
||||
|
||||
# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
|
||||
@@ -1 +0,0 @@
|
||||
deb http://download.webmin.com/download/repository sarge contrib
|
||||
@@ -1,146 +0,0 @@
|
||||
#
|
||||
# Configuration file for the CUPS scheduler. See "man cupsd.conf" for a
|
||||
# complete description of this file.
|
||||
#
|
||||
|
||||
# Log general information in error_log - change "warn" to "debug"
|
||||
# for troubleshooting...
|
||||
LogLevel warn
|
||||
PageLogFormat
|
||||
|
||||
# Deactivate CUPS' internal logrotating, as we provide a better one, especially
|
||||
# LogLevel debug2 gets usable now
|
||||
MaxLogSize 0
|
||||
|
||||
# Only listen for connections from the local machine.
|
||||
#Listen localhost:631
|
||||
Port 631
|
||||
Listen 0.0.0.0:631
|
||||
Listen /var/run/cups/cups.sock
|
||||
|
||||
# Show shared printers on the local network.
|
||||
Browsing On
|
||||
BrowseLocalProtocols dnssd
|
||||
|
||||
# Default authentication type, when authentication is required...
|
||||
DefaultAuthType Basic
|
||||
|
||||
# Web interface setting...
|
||||
WebInterface Yes
|
||||
|
||||
# Restrict access to the server...
|
||||
<Location />
|
||||
Order allow,deny
|
||||
Allow from 192.168.100.*
|
||||
</Location>
|
||||
|
||||
# Restrict access to the admin pages...
|
||||
<Location /admin>
|
||||
AuthType Basic
|
||||
Require valid-user
|
||||
Allow all
|
||||
Order allow,deny
|
||||
</Location>
|
||||
|
||||
# Restrict access to configuration files...
|
||||
<Location /admin/conf>
|
||||
AuthType Default
|
||||
Require user @SYSTEM
|
||||
Order allow,deny
|
||||
</Location>
|
||||
|
||||
# Restrict access to log files...
|
||||
<Location /admin/log>
|
||||
AuthType Default
|
||||
Require user @SYSTEM
|
||||
Order allow,deny
|
||||
</Location>
|
||||
|
||||
# Set the default printer/job policies...
|
||||
<Policy default>
|
||||
# Job/subscription privacy...
|
||||
JobPrivateAccess default
|
||||
JobPrivateValues default
|
||||
SubscriptionPrivateAccess default
|
||||
SubscriptionPrivateValues default
|
||||
|
||||
# Job-related operations must be done by the owner or an administrator...
|
||||
<Limit Create-Job Print-Job Print-URI Validate-Job>
|
||||
Order deny,allow
|
||||
</Limit>
|
||||
|
||||
<Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job Cancel-My-Jobs Close-Job CUPS-Move-Job CUPS-Get-Document>
|
||||
Require user @OWNER @SYSTEM
|
||||
Order deny,allow
|
||||
</Limit>
|
||||
|
||||
# All administration operations require an administrator to authenticate...
|
||||
<Limit CUPS-Add-Modify-Printer CUPS-Delete-Printer CUPS-Add-Modify-Class CUPS-Delete-Class CUPS-Set-Default CUPS-Get-Devices>
|
||||
AuthType Default
|
||||
Require user @SYSTEM
|
||||
Order deny,allow
|
||||
</Limit>
|
||||
|
||||
# All printer operations require a printer operator to authenticate...
|
||||
<Limit Pause-Printer Resume-Printer Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After Cancel-Jobs CUPS-Accept-Jobs CUPS-Reject-Jobs>
|
||||
AuthType Default
|
||||
Require user @SYSTEM
|
||||
Order deny,allow
|
||||
</Limit>
|
||||
|
||||
# Only the owner or an administrator can cancel or authenticate a job...
|
||||
<Limit Cancel-Job CUPS-Authenticate-Job>
|
||||
Require user @OWNER @SYSTEM
|
||||
Order deny,allow
|
||||
</Limit>
|
||||
|
||||
<Limit All>
|
||||
Order deny,allow
|
||||
</Limit>
|
||||
</Policy>
|
||||
|
||||
# Set the authenticated printer/job policies...
|
||||
<Policy authenticated>
|
||||
# Job/subscription privacy...
|
||||
JobPrivateAccess default
|
||||
JobPrivateValues default
|
||||
SubscriptionPrivateAccess default
|
||||
SubscriptionPrivateValues default
|
||||
|
||||
# Job-related operations must be done by the owner or an administrator...
|
||||
<Limit Create-Job Print-Job Print-URI Validate-Job>
|
||||
AuthType Default
|
||||
Order deny,allow
|
||||
</Limit>
|
||||
|
||||
<Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job Cancel-My-Jobs Close-Job CUPS-Move-Job CUPS-Get-Document>
|
||||
AuthType Default
|
||||
Require user @OWNER @SYSTEM
|
||||
Order deny,allow
|
||||
</Limit>
|
||||
|
||||
# All administration operations require an administrator to authenticate...
|
||||
<Limit CUPS-Add-Modify-Printer CUPS-Delete-Printer CUPS-Add-Modify-Class CUPS-Delete-Class CUPS-Set-Default>
|
||||
AuthType Default
|
||||
Require user @SYSTEM
|
||||
Order deny,allow
|
||||
</Limit>
|
||||
|
||||
# All printer operations require a printer operator to authenticate...
|
||||
<Limit Pause-Printer Resume-Printer Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After Cancel-Jobs CUPS-Accept-Jobs CUPS-Reject-Jobs>
|
||||
AuthType Default
|
||||
Require user @SYSTEM
|
||||
Order deny,allow
|
||||
</Limit>
|
||||
|
||||
# Only the owner or an administrator can cancel or authenticate a job...
|
||||
<Limit Cancel-Job CUPS-Authenticate-Job>
|
||||
AuthType Default
|
||||
Require user @OWNER @SYSTEM
|
||||
Order deny,allow
|
||||
</Limit>
|
||||
|
||||
<Limit All>
|
||||
Order deny,allow
|
||||
</Limit>
|
||||
</Policy>
|
||||
@@ -1,25 +0,0 @@
|
||||
# drs.conf
|
||||
|
||||
# URL for OpenDRS
|
||||
DRS_SERVER="http://localhost"
|
||||
|
||||
# Set to "1" to prevent screen blanking on some monitors that go to sleep and won't wake up.
|
||||
INHIBIT_BLANK="0"
|
||||
|
||||
# For standard DRS functionality
|
||||
APP_CMD="chromium-browser --test-type --ignore-certificate-errors --kiosk --no-first-run --check-for-update-interval=1 --simulate-upgrade --incognito $DRS_SERVER"
|
||||
ALIVE_STRING="chromium-browse"
|
||||
KILL_CMD="killall chromium-browser"
|
||||
CLEANUP_CMD="rm -rf ~/.{config,cache}/chromium/"
|
||||
|
||||
# Notes
|
||||
# --test-type will ignore any warnings and
|
||||
# --ignore-certificate-errors will allow you to kiosk any https-page without displaying certificate errors
|
||||
|
||||
#-----------------------------------------------------------------------
|
||||
# For test use
|
||||
#APP_CMD="xterm"
|
||||
#ALIVE_STRING="xterm"
|
||||
#KILL_CMD="killall xterm"
|
||||
#CLEANUP_CMD="sleep 1"
|
||||
|
||||
@@ -1,695 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<openbox_config xmlns="http://openbox.org/3.4/rc"
|
||||
xmlns:xi="http://www.w3.org/2001/XInclude">
|
||||
|
||||
<resistance>
|
||||
<strength>10</strength>
|
||||
<screen_edge_strength>20</screen_edge_strength>
|
||||
</resistance>
|
||||
|
||||
<focus>
|
||||
<focusNew>yes</focusNew>
|
||||
<!-- always try to focus new windows when they appear. other rules do
|
||||
apply -->
|
||||
<followMouse>no</followMouse>
|
||||
<!-- move focus to a window when you move the mouse into it -->
|
||||
<focusLast>yes</focusLast>
|
||||
<!-- focus the last used window when changing desktops, instead of the one
|
||||
under the mouse pointer. when followMouse is enabled -->
|
||||
<underMouse>no</underMouse>
|
||||
<!-- move focus under the mouse, even when the mouse is not moving -->
|
||||
<focusDelay>200</focusDelay>
|
||||
<!-- when followMouse is enabled, the mouse must be inside the window for
|
||||
this many milliseconds (1000 = 1 sec) before moving focus to it -->
|
||||
<raiseOnFocus>no</raiseOnFocus>
|
||||
<!-- when followMouse is enabled, and a window is given focus by moving the
|
||||
mouse into it, also raise the window -->
|
||||
</focus>
|
||||
|
||||
<placement>
|
||||
<policy>Smart</policy>
|
||||
<!-- 'Smart' or 'UnderMouse' -->
|
||||
<center>yes</center>
|
||||
<!-- whether to place windows in the center of the free area found or
|
||||
the top left corner -->
|
||||
<monitor>Primary</monitor>
|
||||
<!-- with Smart placement on a multi-monitor system, try to place new windows
|
||||
on: 'Any' - any monitor, 'Mouse' - where the mouse is, 'Active' - where
|
||||
the active window is, 'Primary' - only on the primary monitor -->
|
||||
<primaryMonitor>1</primaryMonitor>
|
||||
<!-- The monitor where Openbox should place popup dialogs such as the
|
||||
focus cycling popup, or the desktop switch popup. It can be an index
|
||||
from 1, specifying a particular monitor. Or it can be one of the
|
||||
following: 'Mouse' - where the mouse is, or
|
||||
'Active' - where the active window is -->
|
||||
</placement>
|
||||
|
||||
<theme>
|
||||
<name>Clearlooks</name>
|
||||
<titleLayout>NLIMC</titleLayout>
|
||||
<!--
|
||||
available characters are NDSLIMC, each can occur at most once.
|
||||
N: window icon
|
||||
L: window label (AKA title).
|
||||
I: iconify
|
||||
M: maximize
|
||||
C: close
|
||||
S: shade (roll up/down)
|
||||
D: omnipresent (on all desktops).
|
||||
-->
|
||||
<keepBorder>yes</keepBorder>
|
||||
<animateIconify>yes</animateIconify>
|
||||
<font place="ActiveWindow">
|
||||
<name>sans</name>
|
||||
<size>8</size>
|
||||
<!-- font size in points -->
|
||||
<weight>bold</weight>
|
||||
<!-- 'bold' or 'normal' -->
|
||||
<slant>normal</slant>
|
||||
<!-- 'italic' or 'normal' -->
|
||||
</font>
|
||||
<font place="InactiveWindow">
|
||||
<name>sans</name>
|
||||
<size>8</size>
|
||||
<!-- font size in points -->
|
||||
<weight>bold</weight>
|
||||
<!-- 'bold' or 'normal' -->
|
||||
<slant>normal</slant>
|
||||
<!-- 'italic' or 'normal' -->
|
||||
</font>
|
||||
<font place="MenuHeader">
|
||||
<name>sans</name>
|
||||
<size>9</size>
|
||||
<!-- font size in points -->
|
||||
<weight>normal</weight>
|
||||
<!-- 'bold' or 'normal' -->
|
||||
<slant>normal</slant>
|
||||
<!-- 'italic' or 'normal' -->
|
||||
</font>
|
||||
<font place="MenuItem">
|
||||
<name>sans</name>
|
||||
<size>9</size>
|
||||
<!-- font size in points -->
|
||||
<weight>normal</weight>
|
||||
<!-- 'bold' or 'normal' -->
|
||||
<slant>normal</slant>
|
||||
<!-- 'italic' or 'normal' -->
|
||||
</font>
|
||||
<font place="ActiveOnScreenDisplay">
|
||||
<name>sans</name>
|
||||
<size>9</size>
|
||||
<!-- font size in points -->
|
||||
<weight>bold</weight>
|
||||
<!-- 'bold' or 'normal' -->
|
||||
<slant>normal</slant>
|
||||
<!-- 'italic' or 'normal' -->
|
||||
</font>
|
||||
<font place="InactiveOnScreenDisplay">
|
||||
<name>sans</name>
|
||||
<size>9</size>
|
||||
<!-- font size in points -->
|
||||
<weight>bold</weight>
|
||||
<!-- 'bold' or 'normal' -->
|
||||
<slant>normal</slant>
|
||||
<!-- 'italic' or 'normal' -->
|
||||
</font>
|
||||
</theme>
|
||||
|
||||
<desktops>
|
||||
<!-- this stuff is only used at startup, pagers allow you to change them
|
||||
during a session
|
||||
|
||||
these are default values to use when other ones are not already set
|
||||
by other applications, or saved in your session
|
||||
|
||||
use obconf if you want to change these without having to log out
|
||||
and back in -->
|
||||
<number>1</number>
|
||||
<firstdesk>1</firstdesk>
|
||||
<names>
|
||||
<!-- set names up here if you want to, like this:
|
||||
<name>desktop 1</name>
|
||||
<name>desktop 2</name>
|
||||
-->
|
||||
</names>
|
||||
<popupTime>875</popupTime>
|
||||
<!-- The number of milliseconds to show the popup for when switching
|
||||
desktops. Set this to 0 to disable the popup. -->
|
||||
</desktops>
|
||||
|
||||
<resize>
|
||||
<drawContents>yes</drawContents>
|
||||
<popupShow>Nonpixel</popupShow>
|
||||
<!-- 'Always', 'Never', or 'Nonpixel' (xterms and such) -->
|
||||
<popupPosition>Center</popupPosition>
|
||||
<!-- 'Center', 'Top', or 'Fixed' -->
|
||||
<popupFixedPosition>
|
||||
<!-- these are used if popupPosition is set to 'Fixed' -->
|
||||
|
||||
<x>10</x>
|
||||
<!-- positive number for distance from left edge, negative number for
|
||||
distance from right edge, or 'Center' -->
|
||||
<y>10</y>
|
||||
<!-- positive number for distance from top edge, negative number for
|
||||
distance from bottom edge, or 'Center' -->
|
||||
</popupFixedPosition>
|
||||
</resize>
|
||||
|
||||
<!-- You can reserve a portion of your screen where windows will not cover when
|
||||
they are maximized, or when they are initially placed.
|
||||
Many programs reserve space automatically, but you can use this in other
|
||||
cases. -->
|
||||
<margins>
|
||||
<top>0</top>
|
||||
<bottom>0</bottom>
|
||||
<left>0</left>
|
||||
<right>0</right>
|
||||
</margins>
|
||||
|
||||
<dock>
|
||||
<position>TopLeft</position>
|
||||
<!-- (Top|Bottom)(Left|Right|)|Top|Bottom|Left|Right|Floating -->
|
||||
<floatingX>0</floatingX>
|
||||
<floatingY>0</floatingY>
|
||||
<noStrut>no</noStrut>
|
||||
<stacking>Above</stacking>
|
||||
<!-- 'Above', 'Normal', or 'Below' -->
|
||||
<direction>Vertical</direction>
|
||||
<!-- 'Vertical' or 'Horizontal' -->
|
||||
<autoHide>no</autoHide>
|
||||
<hideDelay>300</hideDelay>
|
||||
<!-- in milliseconds (1000 = 1 second) -->
|
||||
<showDelay>300</showDelay>
|
||||
<!-- in milliseconds (1000 = 1 second) -->
|
||||
<moveButton>Middle</moveButton>
|
||||
<!-- 'Left', 'Middle', 'Right' -->
|
||||
</dock>
|
||||
|
||||
<keyboard>
|
||||
<!-- Chromium disable opening new window -->
|
||||
<keybind key="C-n">
|
||||
<action name="Execute">
|
||||
<command>true</command>
|
||||
</action>
|
||||
</keybind>
|
||||
<!-- Chromium disable opening new incognito window -->
|
||||
<keybind key="C-S-n">
|
||||
<action name="Execute">
|
||||
<command>true</command>
|
||||
</action>
|
||||
</keybind>
|
||||
<!-- Chromium disable opening new tab -->
|
||||
<keybind key="C-t">
|
||||
<action name="Execute">
|
||||
<command>true</command>
|
||||
</action>
|
||||
</keybind>
|
||||
<!-- Chromium disable opening home page -->
|
||||
<keybind key="A-Home">
|
||||
<action name="Execute">
|
||||
<command>true</command>
|
||||
</action>
|
||||
</keybind>
|
||||
<!-- Chromium disable back -->
|
||||
<keybind key="A-Left">
|
||||
<action name="Execute">
|
||||
<command>true</command>
|
||||
</action>
|
||||
</keybind>
|
||||
<!-- Chromium disable forward -->
|
||||
<keybind key="A-Right">
|
||||
<action name="Execute">
|
||||
<command>true</command>
|
||||
</action>
|
||||
</keybind>
|
||||
<!-- Chromium disable opening bookmark manager -->
|
||||
<keybind key="C-S-o">
|
||||
<action name="Execute">
|
||||
<command>true</command>
|
||||
</action>
|
||||
</keybind>
|
||||
<!-- Chromium disable opening history page -->
|
||||
<keybind key="C-h">
|
||||
<action name="Execute">
|
||||
<command>true</command>
|
||||
</action>
|
||||
</keybind>
|
||||
<!-- Chromium disable opening downloads page -->
|
||||
<keybind key="C-j">
|
||||
<action name="Execute">
|
||||
<command>true</command>
|
||||
</action>
|
||||
</keybind>
|
||||
<!-- Chromium disable opening task manager -->
|
||||
<keybind key="S-Escape">
|
||||
<action name="Execute">
|
||||
<command>true</command>
|
||||
</action>
|
||||
</keybind>
|
||||
<!-- Chromium disable opening help center -->
|
||||
<keybind key="F1">
|
||||
<action name="Execute">
|
||||
<command>true</command>
|
||||
</action>
|
||||
</keybind>
|
||||
<!-- Chromium disable saving current page -->
|
||||
<keybind key="C-s">
|
||||
<action name="Execute">
|
||||
<command>true</command>
|
||||
</action>
|
||||
</keybind>
|
||||
<!-- Chromium disable opening local file -->
|
||||
<keybind key="C-o">
|
||||
<action name="Execute">
|
||||
<command>true</command>
|
||||
</action>
|
||||
</keybind>
|
||||
<!-- Chromium disable display source -->
|
||||
<keybind key="C-u">
|
||||
<action name="Execute">
|
||||
<command>true</command>
|
||||
</action>
|
||||
</keybind>
|
||||
<!-- Chromium disable saving bookmark-->
|
||||
<keybind key="C-d">
|
||||
<action name="Execute">
|
||||
<command>true</command>
|
||||
</action>
|
||||
</keybind>
|
||||
<!-- Chromium disable saving multi bookmarks -->
|
||||
<keybind key="C-S-d">
|
||||
<action name="Execute">
|
||||
<command>true</command>
|
||||
</action>
|
||||
</keybind>
|
||||
<!-- Enable rebooting with ctrl-alt-shift-del -->
|
||||
<keybind key="C-A-S-Delete">
|
||||
<action name="Execute">
|
||||
<command>shutdown -P now</command>
|
||||
</action>
|
||||
</keybind>
|
||||
<chainQuitKey>C-g</chainQuitKey>
|
||||
</keyboard>
|
||||
|
||||
<mouse>
|
||||
<dragThreshold>1</dragThreshold>
|
||||
<!-- number of pixels the mouse must move before a drag begins -->
|
||||
<doubleClickTime>500</doubleClickTime>
|
||||
<!-- in milliseconds (1000 = 1 second) -->
|
||||
<screenEdgeWarpTime>400</screenEdgeWarpTime>
|
||||
<!-- Time before changing desktops when the pointer touches the edge of the
|
||||
screen while moving a window, in milliseconds (1000 = 1 second).
|
||||
Set this to 0 to disable warping -->
|
||||
<screenEdgeWarpMouse>false</screenEdgeWarpMouse>
|
||||
<!-- Set this to TRUE to move the mouse pointer across the desktop when
|
||||
switching due to hitting the edge of the screen -->
|
||||
|
||||
<context name="Frame">
|
||||
<mousebind button="A-Left" action="Press">
|
||||
<action name="Focus"/>
|
||||
<action name="Raise"/>
|
||||
</mousebind>
|
||||
<mousebind button="A-Left" action="Click">
|
||||
<action name="Unshade"/>
|
||||
</mousebind>
|
||||
<mousebind button="A-Left" action="Drag">
|
||||
<action name="Move"/>
|
||||
</mousebind>
|
||||
|
||||
<mousebind button="A-Right" action="Press">
|
||||
<action name="Focus"/>
|
||||
<action name="Raise"/>
|
||||
<action name="Unshade"/>
|
||||
</mousebind>
|
||||
<mousebind button="A-Right" action="Drag">
|
||||
<action name="Resize"/>
|
||||
</mousebind>
|
||||
|
||||
<mousebind button="A-Middle" action="Press">
|
||||
<action name="Lower"/>
|
||||
<action name="FocusToBottom"/>
|
||||
<action name="Unfocus"/>
|
||||
</mousebind>
|
||||
|
||||
<mousebind button="A-Up" action="Click">
|
||||
<action name="GoToDesktop"><to>previous</to></action>
|
||||
</mousebind>
|
||||
<mousebind button="A-Down" action="Click">
|
||||
<action name="GoToDesktop"><to>next</to></action>
|
||||
</mousebind>
|
||||
<mousebind button="C-A-Up" action="Click">
|
||||
<action name="GoToDesktop"><to>previous</to></action>
|
||||
</mousebind>
|
||||
<mousebind button="C-A-Down" action="Click">
|
||||
<action name="GoToDesktop"><to>next</to></action>
|
||||
</mousebind>
|
||||
<mousebind button="A-S-Up" action="Click">
|
||||
<action name="SendToDesktop"><to>previous</to></action>
|
||||
</mousebind>
|
||||
<mousebind button="A-S-Down" action="Click">
|
||||
<action name="SendToDesktop"><to>next</to></action>
|
||||
</mousebind>
|
||||
</context>
|
||||
|
||||
<context name="Titlebar">
|
||||
<mousebind button="Left" action="Drag">
|
||||
<action name="Move"/>
|
||||
</mousebind>
|
||||
<mousebind button="Left" action="DoubleClick">
|
||||
<action name="ToggleMaximize"/>
|
||||
</mousebind>
|
||||
|
||||
<mousebind button="Up" action="Click">
|
||||
<action name="if">
|
||||
<shaded>no</shaded>
|
||||
<then>
|
||||
<action name="Shade"/>
|
||||
<action name="FocusToBottom"/>
|
||||
<action name="Unfocus"/>
|
||||
<action name="Lower"/>
|
||||
</then>
|
||||
</action>
|
||||
</mousebind>
|
||||
<mousebind button="Down" action="Click">
|
||||
<action name="if">
|
||||
<shaded>yes</shaded>
|
||||
<then>
|
||||
<action name="Unshade"/>
|
||||
<action name="Raise"/>
|
||||
</then>
|
||||
</action>
|
||||
</mousebind>
|
||||
</context>
|
||||
|
||||
<context name="Titlebar Top Right Bottom Left TLCorner TRCorner BRCorner BLCorner">
|
||||
<mousebind button="Left" action="Press">
|
||||
<action name="Focus"/>
|
||||
<action name="Raise"/>
|
||||
<action name="Unshade"/>
|
||||
</mousebind>
|
||||
|
||||
<mousebind button="Middle" action="Press">
|
||||
<action name="Lower"/>
|
||||
<action name="FocusToBottom"/>
|
||||
<action name="Unfocus"/>
|
||||
</mousebind>
|
||||
|
||||
<mousebind button="Right" action="Press">
|
||||
<action name="Focus"/>
|
||||
<action name="Raise"/>
|
||||
<action name="ShowMenu"><menu>client-menu</menu></action>
|
||||
</mousebind>
|
||||
</context>
|
||||
|
||||
<context name="Top">
|
||||
<mousebind button="Left" action="Drag">
|
||||
<action name="Resize"><edge>top</edge></action>
|
||||
</mousebind>
|
||||
</context>
|
||||
|
||||
<context name="Left">
|
||||
<mousebind button="Left" action="Drag">
|
||||
<action name="Resize"><edge>left</edge></action>
|
||||
</mousebind>
|
||||
</context>
|
||||
|
||||
<context name="Right">
|
||||
<mousebind button="Left" action="Drag">
|
||||
<action name="Resize"><edge>right</edge></action>
|
||||
</mousebind>
|
||||
</context>
|
||||
|
||||
<context name="Bottom">
|
||||
<mousebind button="Left" action="Drag">
|
||||
<action name="Resize"><edge>bottom</edge></action>
|
||||
</mousebind>
|
||||
|
||||
<mousebind button="Right" action="Press">
|
||||
<action name="Focus"/>
|
||||
<action name="Raise"/>
|
||||
<action name="ShowMenu"><menu>client-menu</menu></action>
|
||||
</mousebind>
|
||||
</context>
|
||||
|
||||
<context name="TRCorner BRCorner TLCorner BLCorner">
|
||||
<mousebind button="Left" action="Press">
|
||||
<action name="Focus"/>
|
||||
<action name="Raise"/>
|
||||
<action name="Unshade"/>
|
||||
</mousebind>
|
||||
<mousebind button="Left" action="Drag">
|
||||
<action name="Resize"/>
|
||||
</mousebind>
|
||||
</context>
|
||||
|
||||
<context name="Client">
|
||||
<mousebind button="Left" action="Press">
|
||||
<action name="Focus"/>
|
||||
<action name="Raise"/>
|
||||
</mousebind>
|
||||
<mousebind button="Middle" action="Press">
|
||||
<action name="Focus"/>
|
||||
<action name="Raise"/>
|
||||
</mousebind>
|
||||
<mousebind button="Right" action="Press">
|
||||
<action name="Focus"/>
|
||||
<action name="Raise"/>
|
||||
</mousebind>
|
||||
</context>
|
||||
|
||||
<context name="Icon">
|
||||
<mousebind button="Left" action="Press">
|
||||
<action name="Focus"/>
|
||||
<action name="Raise"/>
|
||||
<action name="Unshade"/>
|
||||
<action name="ShowMenu"><menu>client-menu</menu></action>
|
||||
</mousebind>
|
||||
<mousebind button="Right" action="Press">
|
||||
<action name="Focus"/>
|
||||
<action name="Raise"/>
|
||||
<action name="ShowMenu"><menu>client-menu</menu></action>
|
||||
</mousebind>
|
||||
</context>
|
||||
|
||||
<context name="AllDesktops">
|
||||
<mousebind button="Left" action="Press">
|
||||
<action name="Focus"/>
|
||||
<action name="Raise"/>
|
||||
<action name="Unshade"/>
|
||||
</mousebind>
|
||||
<mousebind button="Left" action="Click">
|
||||
<action name="ToggleOmnipresent"/>
|
||||
</mousebind>
|
||||
</context>
|
||||
|
||||
<context name="Shade">
|
||||
<mousebind button="Left" action="Press">
|
||||
<action name="Focus"/>
|
||||
<action name="Raise"/>
|
||||
</mousebind>
|
||||
<mousebind button="Left" action="Click">
|
||||
<action name="ToggleShade"/>
|
||||
</mousebind>
|
||||
</context>
|
||||
|
||||
<context name="Iconify">
|
||||
<mousebind button="Left" action="Press">
|
||||
<action name="Focus"/>
|
||||
<action name="Raise"/>
|
||||
</mousebind>
|
||||
<mousebind button="Left" action="Click">
|
||||
<action name="Iconify"/>
|
||||
</mousebind>
|
||||
</context>
|
||||
|
||||
<context name="Maximize">
|
||||
<mousebind button="Left" action="Press">
|
||||
<action name="Focus"/>
|
||||
<action name="Raise"/>
|
||||
<action name="Unshade"/>
|
||||
</mousebind>
|
||||
<mousebind button="Middle" action="Press">
|
||||
<action name="Focus"/>
|
||||
<action name="Raise"/>
|
||||
<action name="Unshade"/>
|
||||
</mousebind>
|
||||
<mousebind button="Right" action="Press">
|
||||
<action name="Focus"/>
|
||||
<action name="Raise"/>
|
||||
<action name="Unshade"/>
|
||||
</mousebind>
|
||||
<mousebind button="Left" action="Click">
|
||||
<action name="ToggleMaximize"/>
|
||||
</mousebind>
|
||||
<mousebind button="Middle" action="Click">
|
||||
<action name="ToggleMaximize"><direction>vertical</direction></action>
|
||||
</mousebind>
|
||||
<mousebind button="Right" action="Click">
|
||||
<action name="ToggleMaximize"><direction>horizontal</direction></action>
|
||||
</mousebind>
|
||||
</context>
|
||||
|
||||
<context name="Close">
|
||||
<mousebind button="Left" action="Press">
|
||||
<action name="Focus"/>
|
||||
<action name="Raise"/>
|
||||
<action name="Unshade"/>
|
||||
</mousebind>
|
||||
<mousebind button="Left" action="Click">
|
||||
<action name="Close"/>
|
||||
</mousebind>
|
||||
</context>
|
||||
|
||||
<context name="Desktop">
|
||||
<mousebind button="Up" action="Click">
|
||||
<action name="GoToDesktop"><to>previous</to></action>
|
||||
</mousebind>
|
||||
<mousebind button="Down" action="Click">
|
||||
<action name="GoToDesktop"><to>next</to></action>
|
||||
</mousebind>
|
||||
|
||||
<mousebind button="A-Up" action="Click">
|
||||
<action name="GoToDesktop"><to>previous</to></action>
|
||||
</mousebind>
|
||||
<mousebind button="A-Down" action="Click">
|
||||
<action name="GoToDesktop"><to>next</to></action>
|
||||
</mousebind>
|
||||
<mousebind button="C-A-Up" action="Click">
|
||||
<action name="GoToDesktop"><to>previous</to></action>
|
||||
</mousebind>
|
||||
<mousebind button="C-A-Down" action="Click">
|
||||
<action name="GoToDesktop"><to>next</to></action>
|
||||
</mousebind>
|
||||
|
||||
<mousebind button="Left" action="Press">
|
||||
<action name="Focus"/>
|
||||
<action name="Raise"/>
|
||||
</mousebind>
|
||||
<mousebind button="Right" action="Press">
|
||||
<action name="Focus"/>
|
||||
<action name="Raise"/>
|
||||
</mousebind>
|
||||
</context>
|
||||
|
||||
<context name="Root">
|
||||
<!-- Menus -->
|
||||
</context>
|
||||
|
||||
<context name="MoveResize">
|
||||
<mousebind button="Up" action="Click">
|
||||
<action name="GoToDesktop"><to>previous</to></action>
|
||||
</mousebind>
|
||||
<mousebind button="Down" action="Click">
|
||||
<action name="GoToDesktop"><to>next</to></action>
|
||||
</mousebind>
|
||||
<mousebind button="A-Up" action="Click">
|
||||
<action name="GoToDesktop"><to>previous</to></action>
|
||||
</mousebind>
|
||||
<mousebind button="A-Down" action="Click">
|
||||
<action name="GoToDesktop"><to>next</to></action>
|
||||
</mousebind>
|
||||
</context>
|
||||
</mouse>
|
||||
|
||||
<menu>
|
||||
</menu>
|
||||
|
||||
<applications>
|
||||
<!--
|
||||
# this is an example with comments through out. use these to make your
|
||||
# own rules, but without the comments of course.
|
||||
# you may use one or more of the name/class/role/title/type rules to specify
|
||||
# windows to match
|
||||
|
||||
<application name="the window's _OB_APP_NAME property (see obxprop)"
|
||||
class="the window's _OB_APP_CLASS property (see obxprop)"
|
||||
groupname="the window's _OB_APP_GROUP_NAME property (see obxprop)"
|
||||
groupclass="the window's _OB_APP_GROUP_CLASS property (see obxprop)"
|
||||
role="the window's _OB_APP_ROLE property (see obxprop)"
|
||||
title="the window's _OB_APP_TITLE property (see obxprop)"
|
||||
type="the window's _OB_APP_TYPE property (see obxprob)..
|
||||
(if unspecified, then it is 'dialog' for child windows)">
|
||||
# you may set only one of name/class/role/title/type, or you may use more
|
||||
# than one together to restrict your matches.
|
||||
|
||||
# the name, class, role, and title use simple wildcard matching such as those
|
||||
# used by a shell. you can use * to match any characters and ? to match
|
||||
# any single character.
|
||||
|
||||
# the type is one of: normal, dialog, splash, utility, menu, toolbar, dock,
|
||||
# or desktop
|
||||
|
||||
# when multiple rules match a window, they will all be applied, in the
|
||||
# order that they appear in this list
|
||||
|
||||
|
||||
# each rule element can be left out or set to 'default' to specify to not
|
||||
# change that attribute of the window
|
||||
|
||||
<decor>yes</decor>
|
||||
# enable or disable window decorations
|
||||
|
||||
<shade>no</shade>
|
||||
# make the window shaded when it appears, or not
|
||||
|
||||
<position force="no">
|
||||
# the position is only used if both an x and y coordinate are provided
|
||||
# (and not set to 'default')
|
||||
# when force is "yes", then the window will be placed here even if it
|
||||
# says you want it placed elsewhere. this is to override buggy
|
||||
# applications who refuse to behave
|
||||
<x>center</x>
|
||||
# a number like 50, or 'center' to center on screen. use a negative number
|
||||
# to start from the right (or bottom for <y>), ie -50 is 50 pixels from
|
||||
# the right edge (or bottom). use 'default' to specify using value
|
||||
# provided by the application, or chosen by openbox, instead.
|
||||
<y>200</y>
|
||||
<monitor>1</monitor>
|
||||
# specifies the monitor in a xinerama setup.
|
||||
# 1 is the first head, or 'mouse' for wherever the mouse is
|
||||
</position>
|
||||
|
||||
<size>
|
||||
# the size to make the window.
|
||||
<width>20</width>
|
||||
# a number like 20, or 'default' to use the size given by the application.
|
||||
# you can use fractions such as 1/2 or percentages such as 75% in which
|
||||
# case the value is relative to the size of the monitor that the window
|
||||
# appears on.
|
||||
<height>30%</height>
|
||||
</size>
|
||||
|
||||
<focus>yes</focus>
|
||||
# if the window should try be given focus when it appears. if this is set
|
||||
# to yes it doesn't guarantee the window will be given focus. some
|
||||
# restrictions may apply, but Openbox will try to
|
||||
|
||||
<desktop>1</desktop>
|
||||
# 1 is the first desktop, 'all' for all desktops
|
||||
|
||||
<layer>normal</layer>
|
||||
# 'above', 'normal', or 'below'
|
||||
|
||||
<iconic>no</iconic>
|
||||
# make the window iconified when it appears, or not
|
||||
|
||||
<skip_pager>no</skip_pager>
|
||||
# asks to not be shown in pagers
|
||||
|
||||
<skip_taskbar>no</skip_taskbar>
|
||||
# asks to not be shown in taskbars. window cycling actions will also
|
||||
# skip past such windows
|
||||
|
||||
<fullscreen>yes</fullscreen>
|
||||
# make the window in fullscreen mode when it appears
|
||||
|
||||
<maximized>true</maximized>
|
||||
# 'Horizontal', 'Vertical' or boolean (yes/no)
|
||||
</application>
|
||||
|
||||
# end of the example
|
||||
-->
|
||||
</applications>
|
||||
|
||||
</openbox_config>
|
||||
@@ -1,23 +0,0 @@
|
||||
# ~/.profile: executed by the command interpreter for login shells.
|
||||
# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login
|
||||
# exists.
|
||||
# see /usr/share/doc/bash/examples/startup-files for examples.
|
||||
# the files are located in the bash-doc package.
|
||||
|
||||
# the default umask is set in /etc/profile; for setting the umask
|
||||
# for ssh logins, install and configure the libpam-umask package.
|
||||
#umask 022
|
||||
|
||||
# if running bash
|
||||
if [ -n "$BASH_VERSION" ]; then
|
||||
# include .bashrc if it exists
|
||||
if [ -f "$HOME/.bashrc" ]; then
|
||||
. "$HOME/.bashrc"
|
||||
fi
|
||||
fi
|
||||
|
||||
# set PATH so it includes user's private bin if it exists
|
||||
if [ -d "$HOME/bin" ] ; then
|
||||
PATH="$HOME/bin:$PATH"
|
||||
fi
|
||||
/usr/bin/startx /etc/X11/Xsession /usr/local/bin/startdrs.sh -- :0
|
||||
@@ -1,53 +0,0 @@
|
||||
# This file is part of systemd.
|
||||
#
|
||||
# systemd is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU Lesser General Public License as published by
|
||||
# the Free Software Foundation; either version 2.1 of the License, or
|
||||
# (at your option) any later version.
|
||||
|
||||
[Unit]
|
||||
Description=Getty on %I
|
||||
Documentation=man:agetty(8) man:systemd-getty-generator(8)
|
||||
Documentation=http://0pointer.de/blog/projects/serial-console.html
|
||||
After=systemd-user-sessions.service plymouth-quit-wait.service
|
||||
After=rc-local.service
|
||||
|
||||
# If additional gettys are spawned during boot then we should make
|
||||
# sure that this is synchronized before getty.target, even though
|
||||
# getty.target didn't actually pull it in.
|
||||
Before=getty.target
|
||||
IgnoreOnIsolate=yes
|
||||
|
||||
# IgnoreOnIsolate causes issues with sulogin, if someone isolates
|
||||
# rescue.target or starts rescue.service from multi-user.target or
|
||||
# graphical.target.
|
||||
Conflicts=rescue.service
|
||||
Before=rescue.service
|
||||
|
||||
# On systems without virtual consoles, don't start any getty. Note
|
||||
# that serial gettys are covered by serial-getty@.service, not this
|
||||
# unit.
|
||||
ConditionPathExists=/dev/tty0
|
||||
|
||||
[Service]
|
||||
# the VT is cleared by TTYVTDisallocate
|
||||
ExecStart=-/sbin/agetty -a customer --noclear %I $TERM
|
||||
Type=idle
|
||||
Restart=always
|
||||
RestartSec=0
|
||||
UtmpIdentifier=%I
|
||||
TTYPath=/dev/%I
|
||||
TTYReset=yes
|
||||
TTYVHangup=yes
|
||||
TTYVTDisallocate=yes
|
||||
KillMode=process
|
||||
IgnoreSIGPIPE=no
|
||||
SendSIGHUP=yes
|
||||
|
||||
# Unset locale for the console getty since the console has problems
|
||||
# displaying some internationalized messages.
|
||||
Environment=LANG= LANGUAGE= LC_CTYPE= LC_NUMERIC= LC_TIME= LC_COLLATE= LC_MONETARY= LC_MESSAGES= LC_PAPER= LC_NAME= LC_ADDRESS= LC_TELEPHONE= LC_MEASUREMENT= LC_IDENTIFICATION=
|
||||
|
||||
[Install]
|
||||
WantedBy=getty.target
|
||||
DefaultInstance=tty1
|
||||
@@ -1,321 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
# server-setup.sh
|
||||
# OpenDRS Online Discrepancy Reporting System
|
||||
# Copyright (C) 2022 Rod Wright
|
||||
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
|
||||
inst_name="OpenDRS"
|
||||
docroot_path="/var/www"
|
||||
apache_user="www-data"
|
||||
apache_group="www-data"
|
||||
|
||||
current_user=`whoami`
|
||||
if [ "$current_user" != "root" ]
|
||||
then
|
||||
echo "You must have root privileges to run this setup."
|
||||
echo "Try 'sudo ./server-setup.sh'"
|
||||
exit 1
|
||||
fi
|
||||
echo ""
|
||||
echo ""
|
||||
echo ""
|
||||
echo ""
|
||||
echo "This script will configure a Raspberry Pi to be an OpenDRS server."
|
||||
echo ""
|
||||
echo ""
|
||||
echo "You should have already run the terminal-setup.sh script in this directory."
|
||||
echo ""
|
||||
if [ ! -e /etc/drs.conf ]
|
||||
then
|
||||
echo "It looks like the terminal-setup.sh script has not been run yet."
|
||||
echo "This is required before running the server-setup.sh script."
|
||||
echo "Aborting."
|
||||
exit 1
|
||||
fi
|
||||
echo "It looks like you have. Continuing."
|
||||
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 ""
|
||||
echo ""
|
||||
echo "IMPORTANT!: Be sure to make note of usernames and passwords you provide below."
|
||||
echo "You will need them later."
|
||||
echo ""
|
||||
echo "Installing required server packages. You will be prompted about a couple of things:"
|
||||
echo ""
|
||||
echo "- Select apache2 as the web server to configure automatically."
|
||||
echo ""
|
||||
echo "- Choose Yes when prompted to install phpmyadmin database and allow it to"
|
||||
echo " generate a random password(leave the field blank)."
|
||||
echo ""
|
||||
echo -n "Press enter to continue."
|
||||
read continueok
|
||||
echo ""
|
||||
echo ""
|
||||
echo ""
|
||||
echo ""
|
||||
apt install -y apache2 php mariadb-server phpmyadmin uuid-runtime
|
||||
apt install -y php-mysqli
|
||||
cp etc/apache2/mods-available/alias.conf /etc/apache2/mods-available
|
||||
service apache2 restart
|
||||
echo "...done."
|
||||
echo ""
|
||||
echo ""
|
||||
echo "Configuring the MariaDB installation. There will be some more prompts:"
|
||||
echo ""
|
||||
echo "- You'll be prompted for the current password for the root user. You've"
|
||||
echo " just installed MariaDB and you haven't set one yet, so just press enter."
|
||||
echo ""
|
||||
echo "- You'll be prompted to switch to unix_socket authentication. Answer Y."
|
||||
echo ""
|
||||
echo "- You'll be prompted to change the root password. Answer Y and enter a password."
|
||||
echo " Note that this is just the password for the MariaDB root user, not the terminal."
|
||||
echo " DO NOT FORGET THIS PASSWORD. You'll need it later during OpenDRS install."
|
||||
echo ""
|
||||
echo "- Answer Y to remove anonymous users, disallow root login remotely, remove"
|
||||
echo " test database and access, and reload privilege tables."
|
||||
echo ""
|
||||
echo -n "Press enter to proceed."
|
||||
read continueok
|
||||
echo ""
|
||||
echo ""
|
||||
echo ""
|
||||
echo ""
|
||||
mysql_secure_installation
|
||||
echo ""
|
||||
echo ""
|
||||
|
||||
# This is a fresh install
|
||||
operation="installed"
|
||||
# prompt for mysql information
|
||||
bad_mysql_adm=1
|
||||
while [ $bad_mysql_adm -eq 1 ]
|
||||
do
|
||||
admintestdb="drsadm`date +%Y%m%d`"
|
||||
echo "Starting OpenDRS installation."
|
||||
echo ""
|
||||
echo "We need to know the username and password of a MySQL administrator"
|
||||
echo "to be able to create the database and user for OpenDRS. The username"
|
||||
echo "will be root and the password will be the one you were urged to remember"
|
||||
echo "a minute ago."
|
||||
echo ""
|
||||
echo -n "MySQL admin username: "
|
||||
read mysql_adm_user
|
||||
echo ""
|
||||
echo -n "MySQL admin password: "
|
||||
read -s mysql_adm_pass
|
||||
export MYSQL_PWD="$mysql_adm_pass"
|
||||
mysql -u"$mysql_adm_user" -e "create database $admintestdb;drop database $admintestdb"
|
||||
if [ $? -eq 0 ]
|
||||
then
|
||||
bad_mysql_adm=0
|
||||
else
|
||||
echo "ERROR: Either the username/password you supplied were incorrect or the user"
|
||||
echo -n "is not a MySQL administrator. Try again? [y/N]: "
|
||||
read admtry
|
||||
if [ "$admtry" != "Y" -o "$admtry" != "y" ]
|
||||
then
|
||||
exit
|
||||
fi
|
||||
fi
|
||||
done
|
||||
echo ""
|
||||
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_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 ]
|
||||
do
|
||||
name_valid=0
|
||||
while [ $name_valid -eq 0 ]
|
||||
do
|
||||
echo "What would you like to call the database for this installation of OpenDRS?"
|
||||
echo "If you accept the default or make it blank, it will be $inst_name."
|
||||
echo "Spaces or special characters are not allowed in the name."
|
||||
echo -n "database name [$inst_name]: "
|
||||
read new_db_name
|
||||
if [ "$new_db_name" = "" ]
|
||||
then
|
||||
new_db_name=$inst_name
|
||||
fi
|
||||
echo $new_db_name|egrep -q "\W"
|
||||
if [ $? -eq 0 ]
|
||||
then
|
||||
echo "The name you entered seems to contain whitespace or special"
|
||||
echo "characters. Try again or just accept the default."
|
||||
else
|
||||
name_valid=1
|
||||
fi
|
||||
done
|
||||
echo ""
|
||||
export MYSQL_PWD="$mysql_adm_pass"
|
||||
mysql -u"$mysql_adm_user" -e "create database $new_db_name"
|
||||
if [ $? -eq 0 ]
|
||||
then
|
||||
db_create_fail=0
|
||||
else
|
||||
echo "An error was encountered when trying to create the database."
|
||||
echo "This probably means the database already exists."
|
||||
echo -n "Try again with a different database name? [Y/N]: "
|
||||
read dbcreatetry
|
||||
if [ "$dbcreatetry" != "Y" -o "$dbcreatetry" != "y" ]
|
||||
then
|
||||
exit
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
# Create user and give rights to database
|
||||
drs_user="$new_db_name-user"
|
||||
drs_pass=`uuidgen`
|
||||
export MYSQL_PWD="$mysql_adm_pass"
|
||||
mysql -u"$mysql_adm_user" -e "create user if not exists '$drs_user'@'localhost' identified by '$drs_pass'"
|
||||
mysql -u"$mysql_adm_user" -e "grant all on $new_db_name.* to '$drs_user'@'localhost'"
|
||||
mysql -u"$mysql_adm_user" -e "flush privileges"
|
||||
|
||||
# Populate initial database
|
||||
mysql -u"$mysql_adm_user" $new_db_name < ../opendrs-initial.sql
|
||||
|
||||
# Set the installation name
|
||||
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
|
||||
|
||||
# Create db.php if it doesn't exist
|
||||
if [ ! -f "$install_path/db.php" ]
|
||||
then
|
||||
cp ../db.php.template $install_path/db.php
|
||||
sed -i "s/DBNAME/$new_db_name/g" $install_path/db.php
|
||||
sed -i "s/DBUSER/$drs_user/g" $install_path/db.php
|
||||
sed -i "s/DBPASS/$drs_pass/g" $install_path/db.php
|
||||
fi
|
||||
|
||||
# copy distribution to install location
|
||||
echo "Installing distribution . . ."
|
||||
cp -Rv ../distfiles/* $install_path
|
||||
ln -s $install_path/writeups.php $install_path/index.php
|
||||
if [ ! -L "$install_path/jquery-ui" ]
|
||||
then
|
||||
ln -s $install_path/jquery-ui* $install_path/jquery-ui
|
||||
fi
|
||||
echo ""
|
||||
echo ""
|
||||
echo ""
|
||||
echo ""
|
||||
|
||||
# set ownership
|
||||
echo "In order to set the ownership correctly, we need to know the user and"
|
||||
echo "group that the webserver expects its files to be owned by. This is"
|
||||
echo "usually not the root account. Refer to the ownership of other files in"
|
||||
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_in
|
||||
if [ "$httpd_user_group_in" != "" ]
|
||||
then
|
||||
httpd_user_group="$httpd_user_group_in"
|
||||
else
|
||||
httpd_user_group="$apache_user:$apache_group"
|
||||
fi
|
||||
echo ""
|
||||
echo "Setting file ownership . . ."
|
||||
chown -R $httpd_user_group $install_path
|
||||
|
||||
echo ""
|
||||
|
||||
# tell user to launch web browser to continue
|
||||
echo ""
|
||||
echo ""
|
||||
echo ""
|
||||
echo "OpenDRS has been installed."
|
||||
|
||||
echo "# OpenDRS default Apache configuration" > /etc/apache2/conf-available/$inst_name.conf
|
||||
echo "" >> /etc/apache2/conf-available/$inst_name.conf
|
||||
echo "Alias /$inst_name $install_path" >> /etc/apache2/conf-available/$inst_name.conf
|
||||
echo "" >> /etc/apache2/conf-available/$inst_name.conf
|
||||
echo "<Directory $install_path>" >> /etc/apache2/conf-available/$inst_name.conf
|
||||
echo " Options FollowSymLinks" >> /etc/apache2/conf-available/$inst_name.conf
|
||||
echo " DirectoryIndex index.php" >> /etc/apache2/conf-available/$inst_name.conf
|
||||
echo "</Directory>" >> /etc/apache2/conf-available/$inst_name.conf
|
||||
grep -q "<title>Apache2 Debian Default Page: It works</title>" /var/www/html/index.html
|
||||
if [ -$? -eq 0 ]
|
||||
then
|
||||
echo "This apache installation appears to be new or unconfigured. Replacing the default"
|
||||
echo "site index page with a more useful one."
|
||||
site_hostname=`hostname`
|
||||
mv /var/www/html/index.html /var/www/html/defaultindex.html
|
||||
echo "<!doctype html>
|
||||
<html lang=en>
|
||||
<head>
|
||||
<meta charset=utf-8>
|
||||
<title>$site_hostname</title>
|
||||
</head>
|
||||
<body>
|
||||
<p>
|
||||
<a href=\"http://$site_hostname/$inst_name/\">$inst_name</a>
|
||||
</p>
|
||||
</body>
|
||||
</html>" > /var/www/html/index.html
|
||||
fi
|
||||
|
||||
a2enconf $inst_name
|
||||
service apache2 reload
|
||||
echo "OpenDRS server setup is complete."
|
||||
echo ""
|
||||
echo "Once the reboot is complete you will need to do the final installation of $inst_name through"
|
||||
echo "the browser. You will need the mysql username and password you set during the mysql installation above."
|
||||
echo ""
|
||||
echo ""
|
||||
echo "Once the final install is done, you will need to log in to $inst_name to configure it."
|
||||
echo "IMPORTANT: The default login credentials for the initial admin user are:"
|
||||
echo ""
|
||||
echo "login: drsadmin"
|
||||
echo "password: OpenDRS-1"
|
||||
echo ""
|
||||
echo "REMEMBER THESE CREDENTIALS. Otherwise, you will not be able to log in and"
|
||||
echo "configure your new installation."
|
||||
echo "It is highly recommended that you change the initial password to something"
|
||||
echo "secure after logging in for the first time."
|
||||
sed -i 's,'DRS_SERVER=.*','DRS_SERVER="\"http://localhost/$inst_name/\""',' /etc/drs.conf
|
||||
@@ -1,197 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
# terminal-setup.sh
|
||||
# OpenDRS Online Maintenance Tracking System
|
||||
# Copyright (C) 2022 Rod Wright
|
||||
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
|
||||
current_user=`whoami`
|
||||
current_login=`who am i | awk '{print $1}'`
|
||||
if [ "$current_user" != "root" ]
|
||||
then
|
||||
echo "You must have root privileges to run this setup."
|
||||
echo "Try 'sudo ./terminal-setup.sh'"
|
||||
exit 1
|
||||
fi
|
||||
echo ""
|
||||
echo ""
|
||||
echo ""
|
||||
echo ""
|
||||
echo "This script will configure a Raspberry Pi to be an OpenDRS terminal."
|
||||
echo ""
|
||||
echo ""
|
||||
echo "You should have already completed the following steps:"
|
||||
echo ""
|
||||
echo "1. Created a Raspberry Pi OS Lite SD card from the latest release."
|
||||
echo ""
|
||||
echo "2. Installed the card in a Raspberry Pi, booted it, and completed"
|
||||
echo " initial configuration."
|
||||
echo ""
|
||||
echo "3. Ran sudo raspi-config and :"
|
||||
echo " a. Set locale, timezone, and WLAN Country under"
|
||||
echo " Localisation Options. "
|
||||
echo ""
|
||||
echo " b. Set hostname and Boot / Auto Login to Console under System Options."
|
||||
echo ""
|
||||
echo " c. If accessing a network through wifi, the Wireless LAN SSID"
|
||||
echo " and passphrase under System Options."
|
||||
echo ""
|
||||
echo " d. Enable SSH under Interface Options."
|
||||
echo ""
|
||||
echo " e. Set underscan as required under Display Options to get rid of any"
|
||||
echo " black borders around the edge of the display."
|
||||
echo ""
|
||||
echo " f. Reboot when prompted and logged back in as $current_login."
|
||||
echo ""
|
||||
echo "4. Transferred the OpenDRS distribution package to /home/$current_login on the"
|
||||
echo " Raspberry Pi and extracted it."
|
||||
echo "5. Changed directory to RPiSetup in the extracted distribution directory."
|
||||
echo ""
|
||||
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 ""
|
||||
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/drs.conf /etc
|
||||
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 ""
|
||||
echo "deb https://download.webmin.com/download/repository sarge contrib" >/etc/apt/sources.list.d/webmin.list
|
||||
wget https://download.webmin.com/jcameron-key.asc
|
||||
cat jcameron-key.asc | gpg --dearmor >/etc/apt/trusted.gpg.d/jcameron-key.gpg
|
||||
rm jcameron-key.asc
|
||||
apt install apt-transport-https
|
||||
apt update
|
||||
apt install -y --no-install-recommends xorg openbox chromium-browser
|
||||
apt install -y cups libcups2-dev cmake
|
||||
apt install -y webmin
|
||||
addgroup lpadmin
|
||||
usermod -a -G lpadmin $current_login
|
||||
systemctl enable getty@tty1.service
|
||||
service cups-browsed stop
|
||||
systemctl disable cups-browsed.service
|
||||
cp etc/cups/cupsd.conf /etc/cups/
|
||||
service cups restart
|
||||
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"
|
||||
echo "computer to point a web browser to $myhn:631 to add this or another printer"
|
||||
echo "of your choosing."
|
||||
echo -n "Press enter to continue."
|
||||
read continueok
|
||||
echo ""
|
||||
echo "Creating customer user..."
|
||||
sleep 10
|
||||
echo ""
|
||||
echo ""
|
||||
echo ""
|
||||
echo ""
|
||||
cloneuser $current_login 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 ""
|
||||
echo "This terminal will need to communicate with an OpenDRS server. If"
|
||||
echo "you intend to host the server directly on this terminal, leave this"
|
||||
echo -n "blank. Otherwise, enter the server URL :"
|
||||
read server_url
|
||||
if [[ $server_url == "" ]]
|
||||
then
|
||||
conftype="Server/Terminal"
|
||||
./server-setup.sh
|
||||
else
|
||||
conftype="Terminal"
|
||||
sed -i 's,'DRS_SERVER=.*','DRS_SERVER="\"$server_url\""',' /etc/drs.conf
|
||||
fi
|
||||
echo ""
|
||||
echo ""
|
||||
./ap-setup.sh
|
||||
if [ $? -ne 0 ]
|
||||
then
|
||||
echo "If you would like to configure this terminal as an access point at some"
|
||||
echo "time in the future, log in, change directory to the"
|
||||
echo "extracted distribution's RPiSetup directory, and run:"
|
||||
echo " sudo ./ap-setup.sh"
|
||||
fi
|
||||
echo ""
|
||||
echo ""
|
||||
echo "$conftype configuration is now complete. "
|
||||
echo ""
|
||||
echo ""
|
||||
echo "It is highly recommended that after rebooting, you run ssh $current_login@$HOSTNAME"
|
||||
echo "from another computer on the network, then create new users for"
|
||||
echo "any other administrators using the cloneuser command"
|
||||
echo "(cloneuser $current_login <new username>)."
|
||||
echo ""
|
||||
echo ""
|
||||
echo "Terminal setup complete."
|
||||
echo ""
|
||||
if [ "$conftype" = "Terminal" ]
|
||||
then
|
||||
echo "If you would like to use this terminal as a DRS server, after rebooting"
|
||||
echo "and logging back in, change directory to the extracted distribution's"
|
||||
echo "RPiSetup directory, and run:"
|
||||
echo " sudo ./server-setup.sh"
|
||||
echo ""
|
||||
fi
|
||||
echo ""
|
||||
echo "A reboot is required to start using this terminal."
|
||||
echo -n "Would you like to reboot now? [Y/n]: "
|
||||
read rebootok
|
||||
if [ "$rebootok" = "N" -o "$rebootok" = "n" ]
|
||||
then
|
||||
exit 0
|
||||
else
|
||||
reboot
|
||||
fi
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
#!/bin/bash
|
||||
SRC=$1
|
||||
DEST=$2
|
||||
|
||||
if [ $# -ne 2 ]; then
|
||||
echo "Usage: cloneuser source_user destination_user"
|
||||
exit 1
|
||||
fi
|
||||
if ! grep -q $SRC /etc/passwd ;then echo "Source user doesn't exist!"; exit 1; fi
|
||||
if grep -q $DEST /etc/passwd ;then echo "Destination user already exists!"; exit 1; fi
|
||||
|
||||
SRC_GROUPS=`id -Gn ${SRC}`
|
||||
SRC_SHELL=$(awk -F : -v name=${SRC} '(name == $1) { print $7 }' /etc/passwd)
|
||||
RAND_PW=`date +%s | sha256sum | base64 | head -c 32 ; echo`
|
||||
|
||||
echo "Creating user $DEST with a random password"
|
||||
useradd --shell ${SRC_SHELL} --password ${RAND_PW} --create-home ${DEST}
|
||||
for grp in ${SRC_GROUPS};do
|
||||
if [ "$grp" != "$SRC" ]; then
|
||||
echo "Adding user $DEST to group $grp."
|
||||
usermod -a -G $grp ${DEST}
|
||||
fi
|
||||
done
|
||||
echo "Finished. Please set an actual password for $DEST if you want them to be able to log in."
|
||||
|
||||
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,144 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Usage: rpi-clone-setup {-t|--test} hostname
|
||||
# eg: sudo rpi-clone-setup bozo
|
||||
#
|
||||
# This script is automatically run by rpi-clone (when it is given -s options)
|
||||
# to setup an alternate hostname. A cloned file system mounted on /mnt/clone
|
||||
# is expected unless testing with the -t option.
|
||||
#
|
||||
# Or, this script can be run by hand at the end of a clone when rpi-clone
|
||||
# pauses with the cloned file systems still mounted on /mnt/clone.
|
||||
#
|
||||
# Or, run this script by hand with -t to process files in test directories
|
||||
# under /tmp/clone-test. Run -t and look at the files to see if the files
|
||||
# have been edited OK.
|
||||
# eg: sudo rpi-clone-setup -t bozo
|
||||
#
|
||||
# This is a starter script that handles only /etc/hosts and /etc/hostname.
|
||||
# Make sure the script works correctly for your /etc/hosts file.
|
||||
#
|
||||
# If adding a customization for another file:
|
||||
# Add the file to file_list.
|
||||
# If needed, add a mkdir -p line to the "if ((testing))" part.
|
||||
# Add the scripting necessary to customize the file.
|
||||
# Test new scripting by running: rpi-clone-setup -t newhostname
|
||||
#
|
||||
|
||||
file_list="etc/hostname etc/hosts"
|
||||
|
||||
clone=/mnt/clone
|
||||
clone_test=/tmp/clone-test
|
||||
|
||||
PGM=`basename $0`
|
||||
|
||||
if [ `id -u` != 0 ]
|
||||
then
|
||||
echo "You must be root to run $PGM"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
function usage
|
||||
{
|
||||
echo "Usage: $PGM hostname {-t|--test}"
|
||||
echo " Eg: $PGM rpi1"
|
||||
echo " Modify files appropriate to set up for a new host."
|
||||
echo " Files handled are:"
|
||||
for file in $file_list
|
||||
do
|
||||
echo " $file"
|
||||
done
|
||||
echo ""
|
||||
echo "If testing (-t flag) files are copied and processed to $clone_test"
|
||||
echo ""
|
||||
exit 0
|
||||
}
|
||||
|
||||
testing=0
|
||||
while [ "$1" ]
|
||||
do
|
||||
case "$1" in
|
||||
-t|--test)
|
||||
testing=1
|
||||
;;
|
||||
*)
|
||||
if [ "$newhost" != "" ]
|
||||
then
|
||||
echo "Bad args"
|
||||
usage
|
||||
fi
|
||||
newhost=$1
|
||||
;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
|
||||
if [ "$newhost" = "" ]
|
||||
then
|
||||
echo -e "You must specify a target hostname\n"
|
||||
usage
|
||||
fi
|
||||
|
||||
echo -e "\t$newhost\t- target hostname"
|
||||
|
||||
if ((!testing)) && [ ! -d /mnt/clone/etc ]
|
||||
then
|
||||
echo "A destination clone file system is not mounted on /mnt/clone"
|
||||
echo "Aborting!"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if ((testing))
|
||||
then
|
||||
cd /tmp
|
||||
rm -rf $clone_test
|
||||
clone=$clone_test
|
||||
|
||||
mkdir -p $clone/etc
|
||||
|
||||
echo "**********************************************"
|
||||
echo "Testing setup: copying files to $clone"
|
||||
for file in $file_list
|
||||
do
|
||||
echo " cp /$file $clone/$file"
|
||||
cp /$file $clone/$file
|
||||
done
|
||||
echo "This test run will modify those files."
|
||||
echo "**********************************************"
|
||||
echo ""
|
||||
fi
|
||||
|
||||
|
||||
##
|
||||
# Set /etc/hostname
|
||||
#
|
||||
cd $clone/etc
|
||||
echo $newhost > hostname
|
||||
#
|
||||
# Read it back to verify.
|
||||
#
|
||||
echo "$clone/etc/hostname - set new hostname: "
|
||||
LINE=`cat hostname`
|
||||
echo -e "$LINE\n"
|
||||
|
||||
|
||||
##
|
||||
# Edit /etc/hosts - edit the sed command if editing fails for your /etc/hosts.
|
||||
#
|
||||
cd $clone/etc
|
||||
sed -i s/"$HOSTNAME"/"$newhost"/ hosts
|
||||
#
|
||||
# Read it back to verify.
|
||||
#
|
||||
echo "$clone/etc/hosts - set new hostname \"$newhost\" in lines: "
|
||||
LINE=`grep $newhost hosts`
|
||||
echo -e "$LINE\n"
|
||||
|
||||
|
||||
##
|
||||
# Add more customizations if needed.
|
||||
#
|
||||
|
||||
|
||||
exit 0
|
||||
|
||||
@@ -1,40 +0,0 @@
|
||||
#!/bin/bash
|
||||
# startdrs.sh
|
||||
|
||||
source /etc/drs.conf
|
||||
|
||||
openbox-session &
|
||||
|
||||
if [ "$INHIBIT_BLANK" -eq "1" ]
|
||||
then
|
||||
xset s off
|
||||
xset -dpms
|
||||
else
|
||||
xset s off
|
||||
xset +dpms
|
||||
xset dpms 0 600 1800
|
||||
fi
|
||||
|
||||
while true
|
||||
do
|
||||
$KILL_CMD
|
||||
$CLEANUP_CMD
|
||||
|
||||
# start application
|
||||
$APP_CMD &
|
||||
|
||||
sleep 10
|
||||
|
||||
while true
|
||||
do
|
||||
pgrep $ALIVE_STRING
|
||||
if [ "$?" -eq "1" ]
|
||||
then
|
||||
# relaunch application if it terminates
|
||||
$APP_CMD &
|
||||
fi
|
||||
sleep 1
|
||||
done
|
||||
|
||||
exit 0
|
||||
done
|
||||
@@ -1,5 +0,0 @@
|
||||
#!/bin/bash
|
||||
host=$1
|
||||
|
||||
rsync -rlptDvz rwright@$host:/home/rwright/ownCloud/Software_Projects/OpenDRS-1.1.0/distfiles/ /var/www/opendrs/ && chown -R www-data:www-data /var/www/opendrs/*
|
||||
|
||||
@@ -1,38 +0,0 @@
|
||||
Raspberry Pi setup
|
||||
|
||||
1. Create Raspberry Pi OS Lite SD card from the most recent stable release.
|
||||
|
||||
2. Insert SD card in Raspberry Pi, boot it, and complete initial config.
|
||||
|
||||
3. run sudo raspi-config and:
|
||||
|
||||
a. Use Localisation Options to:
|
||||
1. Set locale to en_US.UTF-8 UTF-8.
|
||||
2. Set timezone.
|
||||
3. Set WLAN country.
|
||||
|
||||
b. Use System Options to:
|
||||
1. Set the hostname.
|
||||
2. Set Boot / Auto Login to Console.
|
||||
3. If accessing the network through WiFi, set the Wireless LAN
|
||||
SSID and passphrase.
|
||||
|
||||
c. Under Interface Options, enable SSH.
|
||||
|
||||
d. Under Display Options, set underscan as required to get rid of
|
||||
black screen borders.
|
||||
|
||||
e. When you've finished, tab down to highlight Finish and hit enter.
|
||||
|
||||
f. Reboot when prompted.
|
||||
|
||||
g. Log back in as the user you created during initial configuration.
|
||||
|
||||
4. Copy OpenDRS distribution package to the Raspberry Pi and extract.
|
||||
|
||||
5. Change directory to the extracted distribution.
|
||||
|
||||
6. Change directory to RPiSetup.
|
||||
|
||||
7. run sudo ./terminal-setup.sh
|
||||
|
||||
2
TODO.txt
2
TODO.txt
@@ -7,5 +7,3 @@ TODO
|
||||
- Add a $border_visible debug variable to the end of settings.php and
|
||||
use it wherever there's a "border=\"0\"" to be able to see and fix
|
||||
table layout issues.
|
||||
|
||||
- Automate installation on servers running Nginx as well as Apache.
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
/*
|
||||
boilerplate.php
|
||||
OpenDRS Online Discrepancy Reporting System
|
||||
Copyright (C) 2022 Rod Wright
|
||||
Copyright (C) 2024 Rod Wright
|
||||
|
||||
SPDX-License-Identifier: GPL-2.0
|
||||
*/
|
||||
@@ -14,6 +14,15 @@ if (array_key_exists('print',$_REQUEST)) {
|
||||
$print=false;
|
||||
}
|
||||
|
||||
// redirect to login page if access_mode is untrusted and user is
|
||||
// not logged in
|
||||
if ($access_mode == "untrusted" && ! isset($_SESSION['userid'])) {
|
||||
header("Cache-Control:no-cache, must-revalidate");
|
||||
header("Pragma:no-cache");
|
||||
header("Location:login.php");
|
||||
exit();
|
||||
}
|
||||
|
||||
// redirect to index.php on cancel button press
|
||||
if ($_REQUEST['cancel']) {
|
||||
header("Cache-Control:no-cache, must-revalidate");
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
/*
|
||||
db.php
|
||||
OpenDRS Online Discrepancy Reporting System
|
||||
Copyright (C) 2022 Rod Wright
|
||||
Copyright (C) 2024 Rod Wright
|
||||
|
||||
SPDX-License-Identifier: GPL-2.0
|
||||
*/
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
OpenDRS - Online Discrepancy Reporting System
|
||||
Copyright (C) 2022 Rod Wright
|
||||
Copyright (C) 2024 Rod Wright
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@@ -61,7 +61,7 @@ Changelog
|
||||
chromium hotkey combinations and enable ctrl-alt-del reboot.
|
||||
- Changed systemd ctrl-alt-del.target symlink to point to
|
||||
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
|
||||
@@ -123,3 +123,50 @@ Changelog
|
||||
- Chromium browser will use the printer designated as the local
|
||||
default if it is selected as such in the Cups printer
|
||||
configuration.
|
||||
|
||||
1.3.3 - 2023-10-03
|
||||
- Restricted the ability to change the report date and time when
|
||||
creating or editing a writeup to only logged in users. This is to
|
||||
prevent reporters from backdating writeups, causing them to possibly
|
||||
be missed.
|
||||
- For Raspberry Pi:
|
||||
- Updated the Webmin custom command scripts to use whatever user is
|
||||
logged into Webmin instead of the user "pi" which may not exist
|
||||
if rpi-imager options were used to set a different initial user
|
||||
when the SD card was created.
|
||||
|
||||
1.4.0 - 2024-05-09
|
||||
- Updated the installer script (install.sh) to check for and install the
|
||||
prerequisites (apache, php, mariadb/mysql) and optional packages
|
||||
(webmin, phpmyadmin).
|
||||
- Added an access mode setting. The access mode should be "untrusted" if
|
||||
OpenDRS is exposed to an untrusted environment such as the internet.
|
||||
Untrusted mode requires a login to access any part of the application.
|
||||
The access mode should be "trusted" when the application is used
|
||||
in a trusted environment where anybody on the network can
|
||||
create/edit writeups and search the database, with a login required
|
||||
for everything else.
|
||||
- On the View All Writeups pages, replaced the "Last 7 days" and
|
||||
"Last 30 days" buttons with a dropdown with more options, including
|
||||
future dates so that OpenDRS can be more useful for things like
|
||||
preventive maintenance.
|
||||
- Changed the global font to a sans-serif font.
|
||||
- For Raspberry Pi:
|
||||
- Removed the Raspberry Pi terminal setup from OpenDRS. Setting up
|
||||
a Raspberry Pi as a terminal for OpenDRS can now be accomplished
|
||||
by installing the OpenKiosk application.
|
||||
- Removed the Raspberry Pi server setup from OpenDRS. Setting up
|
||||
a Raspberry Pi as an OpenDRS server is easily accomplished by
|
||||
the OpenDRS installer.
|
||||
|
||||
1.4.1 - 2024-06-18
|
||||
- Updated the installer script (install.sh) to check for and install the
|
||||
package supplying uuidgen. If uuidgen is not present, the mysql
|
||||
user would be created with a blank password.
|
||||
|
||||
1.4.2 - 2024-06-27
|
||||
- Fixed bug introduced in version 1.4.1 in writeups.php where open
|
||||
writeups prior to the current day weren't displayed on the
|
||||
"View Open Writeups" page.
|
||||
- Removed open, closed, and deferred constant definitions from common.php
|
||||
since only one was ever used, and that in only one place.
|
||||
|
||||
@@ -23,6 +23,6 @@ passwords are unchanged.
|
||||
The Admin Functions menu will be shown when logged in as an admin user.
|
||||
Click on Global Settings to set display options, page colors, banners, and
|
||||
miscellaneous options. Click on Manage Database to set users, devices,
|
||||
subsystems, action reasons and periods.
|
||||
subsystems, action reasons and when discovereds.
|
||||
|
||||
6. Start making writeups
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
/*
|
||||
about.php
|
||||
OpenDRS Online Discrepancy Reporting System
|
||||
Copyright (C) 2022 Rod Wright
|
||||
Copyright (C) 2024 Rod Wright
|
||||
|
||||
SPDX-License-Identifier: GPL-2.0
|
||||
*/
|
||||
@@ -51,7 +51,6 @@ if ($print=="Printer Friendly") {
|
||||
$mbgcolor=MENUBG_COLOR;
|
||||
}
|
||||
|
||||
$role=dblookup($drs_db,"users","id","role",$userid);
|
||||
|
||||
framework("begin","$appname","About OpenDRS",$print);
|
||||
|
||||
@@ -80,10 +79,10 @@ echo "
|
||||
OpenDRS $drs_version Discrepancy Reporting System
|
||||
</h3><br>
|
||||
<p>This program is licensed under the terms of the <a href=\"gpl.php\">GNU General Public License</a>. Click on the link
|
||||
or see the LICENSE file in the distribution to read it. OpenDRS is Copyright (C) 2022 by Rod Wright.
|
||||
or see the LICENSE file in the distribution to read it. OpenDRS is Copyright (C) 2024 by Rod Wright.
|
||||
</p>
|
||||
<p>
|
||||
OpenDRS is a simple online maintenance tracking/discrepancy reporting application. It allows anyone with a web browser to create ,
|
||||
OpenDRS is a simple online maintenance tracking/discrepancy reporting application. It allows anyone with a web browser to create,
|
||||
view, and search writeups. The look and feel of the OpenDRS pages are easily changed.
|
||||
Settings that affect all users can be changed in the Admin Functions menu. User specific settings can be changed in the
|
||||
My Profile menu. No browser specific HTML is used in OpenDRS, so it should be useable in any browser, and it has been
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
<?php
|
||||
/*
|
||||
changelog.php
|
||||
OpenMTS Online Maintenance Tracking System
|
||||
Copyright (C) 2022 Rod Wright
|
||||
OpenDRS Online Discrepancy Reporting System
|
||||
Copyright (C) 2024 Rod Wright
|
||||
|
||||
SPDX-License-Identifier: GPL-2.0
|
||||
*/
|
||||
@@ -14,11 +14,11 @@ if (array_key_exists('print',$_REQUEST)) {
|
||||
$print=false;
|
||||
}
|
||||
|
||||
// redirect to search.php on cancel button press
|
||||
// redirect to index.php on cancel button press
|
||||
if (array_key_exists('cancel',$_REQUEST)) {
|
||||
header("Cache-Control:no-cache, must-revalidate");
|
||||
header("Pragma:no-cache");
|
||||
header("Location:search.php");
|
||||
header("Location:index.php");
|
||||
exit();
|
||||
}
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
/*
|
||||
common.php
|
||||
OpenDRS Online Discrepancy Reporting System
|
||||
Copyright (C) 2022 Rod Wright
|
||||
Copyright (C) 2024 Rod Wright
|
||||
|
||||
SPDX-License-Identifier: GPL-2.0
|
||||
*/
|
||||
@@ -37,11 +37,9 @@ $functional_yes=FUNCTIONAL_YES;
|
||||
$functional_no=FUNCTIONAL_NO;
|
||||
$functional_yes_short=FUNCTIONAL_YES_SHORT;
|
||||
$functional_no_short=FUNCTIONAL_NO_SHORT;
|
||||
$access_mode=ACCESS_MODE;
|
||||
|
||||
// define some other constants
|
||||
define("STAT_OPEN",1);
|
||||
define("STAT_CLOSED",2);
|
||||
define("STAT_DEFERRED",3);
|
||||
define("ADMIN",2);
|
||||
define("USER",1);
|
||||
|
||||
@@ -65,6 +63,17 @@ $basic_colors=array(
|
||||
"Fuchsia" => "#FF00FF",
|
||||
"Purple" => "#800080");
|
||||
|
||||
// Determine access mode, login status, and admin status
|
||||
if ($access_mode == "trusted") $trusted=true; else $trusted=false;
|
||||
$loggedin=$isadmin=false;
|
||||
if (isset($_SESSION['userid'])) {
|
||||
$uid=$_SESSION['userid'];
|
||||
$loggedin=true;
|
||||
if (mysqli_fetch_row(mysqli_query($drs_db,"select role from users where id=\"$uid\""))[0] == ADMIN) {
|
||||
$isadmin=true;
|
||||
}
|
||||
}
|
||||
|
||||
// Generic functions
|
||||
|
||||
function framework($option,$htmltitle,$pagetitle,$print) {
|
||||
@@ -94,6 +103,7 @@ function framework($option,$htmltitle,$pagetitle,$print) {
|
||||
<meta http-equiv=\"x-ua-compatible\" content=\"IE=edge\">
|
||||
<title>$htmltitle</title>
|
||||
<style type=\"text/css\">
|
||||
* {font-family: Arial, Helvetica, sans-serif;}
|
||||
table.writeup {table-layout:fixed;}
|
||||
td.forcewrap {word-wrap: break-word;}
|
||||
</style>
|
||||
@@ -274,6 +284,7 @@ function framework($option,$htmltitle,$pagetitle,$print) {
|
||||
});
|
||||
$( \"#device, #subsystem, #discoveredselect, #functional, [id|='sel']\" ).selectmenu();
|
||||
$( \"#status, #user, #reason\" ).selectmenu();
|
||||
$( \"#showdays\" ).selectmenu( { width : 130 } );
|
||||
$( \"#subsystem, #discovered, #searchstatus, #pass, #passconf\").tooltip();
|
||||
$( \"[id|='ms']\").multiselect();
|
||||
$( \"#configtabs, #dbadmintabs, #profiletabs\" ).tabs();
|
||||
@@ -355,30 +366,31 @@ function pageblock($block,$option) {
|
||||
|
||||
function sidemenu($printable=true) {
|
||||
// Displays sidebar menu
|
||||
global $drs_db,$mbgcolor;
|
||||
echo "
|
||||
<div class=\"sidemenu\">
|
||||
<table style=\"table-layout:fixed;width:210px;\" bgcolor=\"#$mbgcolor\" border=\"1\" width=\"100%\">
|
||||
<tr><td align=\"center\"><a href=\"create.php\" title=\"Create new writeup\"><font size=\"+1\"><b>Create New Writeup</b></font></a></td></tr>
|
||||
</table>
|
||||
<br>";
|
||||
global $drs_db,$mbgcolor,$trusted,$loggedin,$isadmin;
|
||||
|
||||
if ($trusted || $loggedin) {
|
||||
echo "
|
||||
<div class=\"sidemenu\">
|
||||
<table style=\"table-layout:fixed;width:210px;\" bgcolor=\"#$mbgcolor\" border=\"1\" width=\"100%\">
|
||||
<tr><td align=\"center\"><a href=\"create.php\" title=\"Create new writeup\"><font size=\"+1\"><b>Create New Writeup</b></font></a></td></tr>
|
||||
</table>
|
||||
<br>";
|
||||
}
|
||||
echo "
|
||||
<center><button onclick=\"goBack()\">Go Back</button></center>
|
||||
";
|
||||
echo "
|
||||
<br>
|
||||
<table style=\"table-layout:fixed;width:210px;\" bgcolor=\"#$mbgcolor\" border=\"1\" width=\"100%\">
|
||||
<tr><td align=\"center\"><a href=\"writeups.php\" title=\"View open writeups\">View Open Writeups</a></td></tr>
|
||||
<tr><td align=\"center\"><a href=\"writeups.php?view=1\" title=\"View all writeups for a date range\">View All Writeups</a></td></tr>
|
||||
<tr><td align=\"center\"><a href=\"groups.php\" title=\"View writeup groups\">Writeup Groups</a></td></tr>
|
||||
<tr><td align=\"center\"><a href=\"search.php\">Search Writeups</a></td></tr>
|
||||
</table>
|
||||
<br>
|
||||
";
|
||||
|
||||
if (isset($_SESSION['userid'])) {
|
||||
$menuuser=$_SESSION['userid'];
|
||||
if (mysqli_fetch_row(mysqli_query($drs_db,"select role from users where id=\"$menuuser\""))[0] == ADMIN) {
|
||||
if ($trusted || $loggedin) {
|
||||
echo "
|
||||
<br>
|
||||
<table style=\"table-layout:fixed;width:210px;\" bgcolor=\"#$mbgcolor\" border=\"1\" width=\"100%\">
|
||||
<tr><td align=\"center\"><a href=\"writeups.php\" title=\"View open writeups\">View Open Writeups</a></td></tr>
|
||||
<tr><td align=\"center\"><a href=\"writeups.php?view=1\" title=\"View all writeups for a date range\">View All Writeups</a></td></tr>
|
||||
<tr><td align=\"center\"><a href=\"groups.php\" title=\"View writeup groups\">Writeup Groups</a></td></tr>
|
||||
<tr><td align=\"center\"><a href=\"search.php\">Search Writeups</a></td></tr>
|
||||
</table>
|
||||
<br>
|
||||
";
|
||||
if ($isadmin) {
|
||||
echo "
|
||||
<br>
|
||||
<table style=\"table-layout:fixed;width:210px;\" bgcolor=\"#$mbgcolor\" border=\"1\" width=\"100%\">
|
||||
@@ -392,7 +404,7 @@ function sidemenu($printable=true) {
|
||||
}
|
||||
}
|
||||
|
||||
if (!isset($_SESSION['userid'])) {
|
||||
if (! $loggedin) {
|
||||
echo "
|
||||
<br>
|
||||
<table style=\"table-layout:fixed;width:210px;\" bgcolor=\"#$mbgcolor\" border=\"1\" width=\"100%\">
|
||||
@@ -401,8 +413,8 @@ function sidemenu($printable=true) {
|
||||
</table>
|
||||
<br>";
|
||||
} else {
|
||||
$loginid=$_SESSION['userid'];
|
||||
$loggedinas=mysqli_fetch_row(mysqli_query($drs_db,"select firstname,lastname from users where id=\"$loginid\""));
|
||||
$menuuser=$_SESSION['userid'];
|
||||
$loggedinas=mysqli_fetch_row(mysqli_query($drs_db,"select firstname,lastname from users where id=\"$menuuser\""));
|
||||
echo "
|
||||
<br>
|
||||
<table style=\"table-layout:fixed;width:210px;\" bgcolor=\"#$mbgcolor\" border=\"1\" width=\"100%\">
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
/*
|
||||
config.php
|
||||
OpenDRS Online Discrepancy Reporting System
|
||||
Copyright (C) 2022 Rod Wright
|
||||
Copyright (C) 2024 Rod Wright
|
||||
|
||||
SPDX-License-Identifier: GPL-2.0
|
||||
*/
|
||||
@@ -14,6 +14,15 @@ if (array_key_exists('print',$_REQUEST)) {
|
||||
$print=false;
|
||||
}
|
||||
|
||||
// redirect to login page if access_mode is untrusted and user is
|
||||
// not logged in
|
||||
if ($access_mode == "untrusted" && ! isset($_SESSION['userid'])) {
|
||||
header("Cache-Control:no-cache, must-revalidate");
|
||||
header("Pragma:no-cache");
|
||||
header("Location:login.php");
|
||||
exit();
|
||||
}
|
||||
|
||||
// redirect to index.php on cancel button press
|
||||
if (array_key_exists('cancel',$_REQUEST)) {
|
||||
header("Cache-Control:no-cache, must-revalidate");
|
||||
@@ -23,11 +32,9 @@ if (array_key_exists('cancel',$_REQUEST)) {
|
||||
}
|
||||
|
||||
// import session variables
|
||||
if (isset($_SESSION['userid'])) $userid=$_SESSION['userid'];
|
||||
$role=dblookup($drs_db,"users","id","role",$userid);
|
||||
// redirect to index.php if not an admin
|
||||
|
||||
if ($role != ADMIN) {
|
||||
// redirect to index.php if not an admin
|
||||
if (! $isadmin) {
|
||||
header("Cache-Control:no-cache, must-revalidate");
|
||||
header("Pragma:no-cache");
|
||||
header("Location:index.php");
|
||||
@@ -82,6 +89,7 @@ extract($incoming, EXTR_SKIP);
|
||||
* update_misc
|
||||
* sessttl
|
||||
* logoutall
|
||||
* accessmode
|
||||
*/
|
||||
|
||||
if (!isset($update_display)) $update_display=false;
|
||||
@@ -249,6 +257,9 @@ if ($edit_banner) {
|
||||
}
|
||||
|
||||
if ($update_misc) {
|
||||
if ($accessmode) {
|
||||
mysqli_query($drs_db,"update config set value=\"$accessmode\" where name=\"access_mode\"");
|
||||
}
|
||||
if ($logoutall) {
|
||||
if ($ostype == 'WIN') {
|
||||
$sessfileloc=mysqli_fetch_row(mysqli_query($drs_db,"select value from config where name=\"win_server_session_dir\""))[0];
|
||||
@@ -544,9 +555,17 @@ echo "
|
||||
<form method=\"post\" action=\"config.php#miscellaneous\">
|
||||
";
|
||||
if ($ttlsuppld_err) format_message(1,"Session expiration time cannot be blank.");
|
||||
|
||||
$curaccessmode=mysqli_fetch_row(mysqli_query($drs_db,"select value from config where name=\"access_mode\""))[0];
|
||||
$trustedstate=$untrustedstate="";
|
||||
if($curaccessmode=="trusted") $trustedstate="checked";
|
||||
if($curaccessmode=="untrusted") $untrustedstate="checked";
|
||||
|
||||
$curttl=mysqli_fetch_row(mysqli_query($drs_db,"select value from config where name=\"session_ttl_days\""))[0];
|
||||
echo "
|
||||
<font size=\"+1\"><b>Miscellaneous Configuration Parameters</b></font><br><br><br><br>
|
||||
Access mode: <input type=\"radio\" name=\"accessmode\" value=\"trusted\" $trustedstate> Trusted
|
||||
<input type=\"radio\" name=\"accessmode\" value=\"untrusted\" $untrustedstate> Untrusted<br><br><br>
|
||||
Session expiration time (users will have to log in again after this long) : <input type=\"text\" name=\"sessttl\" size=\"3\" value=\"$curttl\"> days<br><br>
|
||||
Force logout of all users <input type=\"checkbox\" name=\"logoutall\"><br><br><br><br>
|
||||
<input type=\"submit\" name=\"update_misc\" value=\"Update Options\">
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
/*
|
||||
create.php
|
||||
OpenDRS Online Discrepancy Reporting System
|
||||
Copyright (C) 2022 Rod Wright
|
||||
Copyright (C) 2024 Rod Wright
|
||||
|
||||
SPDX-License-Identifier: GPL-2.0
|
||||
*/
|
||||
@@ -14,6 +14,15 @@ if (array_key_exists('print',$_REQUEST)) {
|
||||
$print=false;
|
||||
}
|
||||
|
||||
// redirect to login page if access_mode is untrusted and user is
|
||||
// not logged in
|
||||
if ($access_mode == "untrusted" && ! isset($_SESSION['userid'])) {
|
||||
header("Cache-Control:no-cache, must-revalidate");
|
||||
header("Pragma:no-cache");
|
||||
header("Location:login.php");
|
||||
exit();
|
||||
}
|
||||
|
||||
// redirect to writeups.php on change cancel
|
||||
if (array_key_exists('cancel',$_REQUEST)) {
|
||||
header("Cache-Control:no-cache, must-revalidate");
|
||||
@@ -225,12 +234,20 @@ if ($preserve) {
|
||||
$funcyesstate="checked";
|
||||
}
|
||||
|
||||
echo "</select></td>";
|
||||
if (!$role) {
|
||||
$timedatedisable="disabled";
|
||||
} else {
|
||||
$timedatedisable="";
|
||||
}
|
||||
echo "
|
||||
</select></td>
|
||||
<td align=\"left\" >Report Date<br>
|
||||
<input type=\"text\" name=\"report_date\" size=\"10\" maxlength=\"10\" value=\"$report_date\" id=\"singledatepicker\" title=\"Format: YYYY-MM-DD\"></td>
|
||||
<input type=\"text\" name=\"report_date\" size=\"10\" maxlength=\"10\" value=\"$report_date\" id=\"singledatepicker\" title=\"Format: YYYY-MM-DD\" $timedatedisable></td>
|
||||
<td align=\"left\">Report Time<br>
|
||||
<input type=\"text\" name=\"report_time\" size=\"8\" maxlength=\"8\" value=\"$report_time\" title=\"Format: HH:MM:SS\"></td>
|
||||
<input type=\"text\" name=\"report_time\" size=\"8\" maxlength=\"8\" value=\"$report_time\" title=\"Format: HH:MM:SS\" $timedatedisable></td>
|
||||
";
|
||||
|
||||
echo "
|
||||
</tr>
|
||||
<tr><td></td><td></td><td></td></tr>
|
||||
<tr><td colspan=\"3\">
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
/*
|
||||
dbadmin.php
|
||||
OpenDRS Online Discrepancy Reporting System
|
||||
Copyright (C) 2022 Rod Wright
|
||||
Copyright (C) 2024 Rod Wright
|
||||
|
||||
SPDX-License-Identifier: GPL-2.0
|
||||
*/
|
||||
@@ -13,6 +13,16 @@ if (array_key_exists('print',$_REQUEST)) {
|
||||
} else {
|
||||
$print=false;
|
||||
}
|
||||
|
||||
// redirect to login page if access_mode is untrusted and user is
|
||||
// not logged in
|
||||
if ($access_mode == "untrusted" && ! isset($_SESSION['userid'])) {
|
||||
header("Cache-Control:no-cache, must-revalidate");
|
||||
header("Pragma:no-cache");
|
||||
header("Location:login.php");
|
||||
exit();
|
||||
}
|
||||
|
||||
// redirect to index.php on cancel button press
|
||||
if (array_key_exists('cancel',$_REQUEST)) {
|
||||
header("Cache-Control:no-cache, must-revalidate");
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
/*
|
||||
gpl.php
|
||||
OpenMTS Online Maintenance Tracking System
|
||||
Copyright (C) 2022 Rod Wright
|
||||
Copyright (C) 2024 Rod Wright
|
||||
|
||||
SPDX-License-Identifier: GPL-2.0
|
||||
*/
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
/*
|
||||
groups.php
|
||||
OpenDRS Online Discrepancy Reporting System
|
||||
Copyright (C) 2022 Rod Wright
|
||||
Copyright (C) 2024 Rod Wright
|
||||
|
||||
SPDX-License-Identifier: GPL-2.0
|
||||
*/
|
||||
@@ -14,6 +14,15 @@ if (array_key_exists('print',$_REQUEST)) {
|
||||
$print=false;
|
||||
}
|
||||
|
||||
// redirect to login page if access_mode is untrusted and user is
|
||||
// not logged in
|
||||
if ($access_mode == "untrusted" && ! isset($_SESSION['userid'])) {
|
||||
header("Cache-Control:no-cache, must-revalidate");
|
||||
header("Pragma:no-cache");
|
||||
header("Location:login.php");
|
||||
exit();
|
||||
}
|
||||
|
||||
// redirect to groups.php on cancel button press
|
||||
if (array_key_exists('cancel',$_REQUEST)) {
|
||||
header("Cache-Control:no-cache, must-revalidate");
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
/*
|
||||
login.php
|
||||
OpenDRS Online Discrepancy Reporting System
|
||||
Copyright (C) 2022 Rod Wright
|
||||
Copyright (C) 2024 Rod Wright
|
||||
|
||||
SPDX-License-Identifier: GPL-2.0
|
||||
*/
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
/*
|
||||
profile.php
|
||||
OpenDRS Online Discrepancy Reporting System
|
||||
Copyright (C) 2022 Rod Wright
|
||||
Copyright (C) 2024 Rod Wright
|
||||
|
||||
SPDX-License-Identifier: GPL-2.0
|
||||
*/
|
||||
@@ -14,6 +14,15 @@ if (array_key_exists('print',$_REQUEST)) {
|
||||
$print=false;
|
||||
}
|
||||
|
||||
// redirect to login page if access_mode is untrusted and user is
|
||||
// not logged in
|
||||
if ($access_mode == "untrusted" && ! isset($_SESSION['userid'])) {
|
||||
header("Cache-Control:no-cache, must-revalidate");
|
||||
header("Pragma:no-cache");
|
||||
header("Location:login.php");
|
||||
exit();
|
||||
}
|
||||
|
||||
// redirect to index.php on cancel button press
|
||||
if (array_key_exists('cancel',$_REQUEST)) {
|
||||
header("Cache-Control:no-cache, must-revalidate");
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
/*
|
||||
search.php
|
||||
OpenDRS Online Discrepancy Reporting System
|
||||
Copyright (C) 2022 Rod Wright
|
||||
Copyright (C) 2024 Rod Wright
|
||||
|
||||
SPDX-License-Identifier: GPL-2.0
|
||||
*/
|
||||
@@ -14,6 +14,15 @@ if (array_key_exists('print',$_REQUEST)) {
|
||||
$print=false;
|
||||
}
|
||||
|
||||
// redirect to login page if access_mode is untrusted and user is
|
||||
// not logged in
|
||||
if ($access_mode == "untrusted" && ! isset($_SESSION['userid'])) {
|
||||
header("Cache-Control:no-cache, must-revalidate");
|
||||
header("Pragma:no-cache");
|
||||
header("Location:login.php");
|
||||
exit();
|
||||
}
|
||||
|
||||
// redirect to search.php on cancel button press
|
||||
if (array_key_exists('cancel',$_REQUEST)) {
|
||||
header("Cache-Control:no-cache, must-revalidate");
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
/*
|
||||
settings.php
|
||||
OpenDRS Online Discrepancy Reporting System
|
||||
Copyright (C) 2022 Rod Wright
|
||||
Copyright (C) 2024 Rod Wright
|
||||
|
||||
SPDX-License-Identifier: GPL-2.0
|
||||
*/
|
||||
@@ -51,7 +51,7 @@ while ($configrow = mysqli_fetch_assoc($configqry)) {
|
||||
}
|
||||
|
||||
// level of error reporting. Set to 0 for production or E_ALL for development/troubleshooting
|
||||
error_reporting(0);
|
||||
//error_reporting(E_ALL);
|
||||
//error_reporting(0);
|
||||
error_reporting(E_ALL);
|
||||
|
||||
?>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
/*
|
||||
writeupdetail.php
|
||||
OpenDRS Online Discrepancy Reporting System
|
||||
Copyright (C) 2022 Rod Wright
|
||||
Copyright (C) 2024 Rod Wright
|
||||
|
||||
SPDX-License-Identifier: GPL-2.0
|
||||
*/
|
||||
@@ -14,6 +14,15 @@ if (array_key_exists('print',$_REQUEST)) {
|
||||
$print=false;
|
||||
}
|
||||
|
||||
// redirect to login page if access_mode is untrusted and user is
|
||||
// not logged in
|
||||
if ($access_mode == "untrusted" && ! isset($_SESSION['userid'])) {
|
||||
header("Cache-Control:no-cache, must-revalidate");
|
||||
header("Pragma:no-cache");
|
||||
header("Location:login.php");
|
||||
exit();
|
||||
}
|
||||
|
||||
// redirect to writeups.php on change cancel
|
||||
if (array_key_exists('cancel',$_REQUEST)) {
|
||||
$id=$_REQUEST['id'];
|
||||
@@ -331,7 +340,7 @@ if($status==3) $deferredstate="selected";
|
||||
echo "
|
||||
<td align=\"left\" >Report Date<br>
|
||||
";
|
||||
if ($useredit) {
|
||||
if ($useredit && $role) {
|
||||
echo "
|
||||
<input type=\"text\" name=\"report_date\" size=\"10\" maxlength=\"10\" value=\"$report_date\" id=\"reportdatepicker\" title=\"Format: YYYY-MM-DD\"></td>
|
||||
";
|
||||
@@ -343,7 +352,7 @@ if ($useredit) {
|
||||
echo "
|
||||
<td align=\"left\">Report Time<br>
|
||||
";
|
||||
if ($useredit) {
|
||||
if ($useredit && $role) {
|
||||
echo "
|
||||
<input type=\"text\" name=\"report_time\" size=\"8\" maxlength=\"8\" value=\"$report_time\" title=\"Format: HH:MM:SS\"></td>
|
||||
";
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
/*
|
||||
writeups.php
|
||||
OpenDRS Online Discrepancy Reporting System
|
||||
Copyright (C) 2022 Rod Wright
|
||||
Copyright (C) 2024 Rod Wright
|
||||
|
||||
SPDX-License-Identifier: GPL-2.0
|
||||
*/
|
||||
@@ -14,6 +14,15 @@ if (array_key_exists('print',$_REQUEST)) {
|
||||
$print=false;
|
||||
}
|
||||
|
||||
// redirect to login page if access_mode is untrusted and user is
|
||||
// not logged in
|
||||
if ($access_mode == "untrusted" && ! isset($_SESSION['userid'])) {
|
||||
header("Cache-Control:no-cache, must-revalidate");
|
||||
header("Pragma:no-cache");
|
||||
header("Location:login.php");
|
||||
exit();
|
||||
}
|
||||
|
||||
// import session variables
|
||||
if (isset($_SESSION['userid'])) {
|
||||
$userid=$_SESSION['userid'];
|
||||
@@ -44,6 +53,7 @@ extract($incoming, EXTR_SKIP);
|
||||
* showyesterday
|
||||
* show7day
|
||||
* show30day
|
||||
* showdays
|
||||
* viewtype
|
||||
* togroup
|
||||
* addtogroup
|
||||
@@ -90,7 +100,7 @@ function opentable($incoming,$start_date,$end_date,$print,$drs_db,$viewtype="sum
|
||||
echo "
|
||||
</form>
|
||||
";
|
||||
$writeup=mysqli_query($drs_db,"select * from writeups where status=".STAT_OPEN." and report_date between \"$start_date\" and \"$end_date\" order by report_date desc,report_time desc");
|
||||
$writeup=mysqli_query($drs_db,"select * from writeups where status=1 and report_date between \"$start_date\" and \"$end_date\" order by report_date desc,report_time desc");
|
||||
if (mysqli_num_rows($writeup)) {
|
||||
$now=date("H:i l");
|
||||
echo "
|
||||
@@ -209,8 +219,24 @@ function viewtable($start_date,$end_date,$print,$drs_db,$viewtype="summary",$rol
|
||||
echo "
|
||||
<input type=\"submit\" name=\"showtoday\" value=\"Today\">
|
||||
<input type=\"submit\" name=\"showyesterday\" value=\"Yesterday\">
|
||||
<input type=\"submit\" name=\"show7day\" value=\"Last 7 Days\">
|
||||
<input type=\"submit\" name=\"show30day\" value=\"Last 30 Days\">
|
||||
<select name=\"showdays\" id=\"showdays\">
|
||||
<option value=\"\">Date range...</option>
|
||||
<option value=\"-3\">Last 3 days</option>
|
||||
<option value=\"-7\">Last 7 days</option>
|
||||
<option value=\"-30\">Last 30 days</option>
|
||||
<option value=\"-90\">Last 90 days</option>
|
||||
<option value=\"-180\">Last 180 days</option></option>
|
||||
<option value=\"-365\">Last 365 days</option>
|
||||
<option value=\"-\">All past</option>
|
||||
<option value=\"+3\">Next 3 days</option>
|
||||
<option value=\"+7\">Next 7 days</option>
|
||||
<option value=\"+30\">Next 30 days</option>
|
||||
<option value=\"+90\">Next 90 days</option>
|
||||
<option value=\"+180\">Next 180 days</option></option>
|
||||
<option value=\"+365\">Next 365 days</option>
|
||||
<option value=\"+\">All future</option>
|
||||
</select>
|
||||
|
||||
";
|
||||
}
|
||||
echo "
|
||||
@@ -390,6 +416,29 @@ if (isset($show30day)) {
|
||||
$end_date=$today;
|
||||
}
|
||||
|
||||
if (isset($showdays) && $showdays != "") {
|
||||
$minmaxqry=mysqli_query($drs_db,"select min(report_date),max(report_date) from writeups");
|
||||
$minmaxdates=mysqli_fetch_row($minmaxqry);
|
||||
$direction=$showdays[0];
|
||||
$numdays=substr($showdays,1);
|
||||
if ($direction=="-") {
|
||||
if ($numdays=="") {
|
||||
$start_date=$minmaxdates[0];
|
||||
} else {
|
||||
$start_date=mysqli_fetch_row(mysqli_query($drs_db,"select date_sub(curdate(),interval $numdays day)"))[0];
|
||||
}
|
||||
$end_date=$today;
|
||||
}
|
||||
if ($direction=="+") {
|
||||
$start_date=$today;
|
||||
if ($numdays=="") {
|
||||
$end_date=$minmaxdates[1];
|
||||
} else {
|
||||
$end_date=mysqli_fetch_row(mysqli_query($drs_db,"select date_add(curdate(),interval $numdays day)"))[0];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (isset($view)) {
|
||||
$pgtitle="Recent Writeups";
|
||||
} else {
|
||||
|
||||
379
install.sh
379
install.sh
@@ -2,12 +2,12 @@
|
||||
|
||||
# install.sh
|
||||
# OpenDRS Online Discrepancy Reporting System
|
||||
# Copyright (C) 2022 Rod Wright
|
||||
# Copyright (C) 2024 Rod Wright
|
||||
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
|
||||
|
||||
DRS_VERSION="1.3.2"
|
||||
DRS_VERSION="1.4.2"
|
||||
DOC_ROOT="/var/www"
|
||||
INSTALL_LOC="opendrs"
|
||||
APACHE_USER="www-data"
|
||||
@@ -21,7 +21,15 @@ if [[ $EUID -ne 0 ]]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# initial stuff
|
||||
|
||||
# Prevent unattended-upgrades from interfering
|
||||
restart_uu=false
|
||||
while systemctl status unattended-upgrades >/dev/null 2>&1
|
||||
do
|
||||
systemctl stop unattended-upgrades
|
||||
sleep 5
|
||||
restart_uu=true
|
||||
done
|
||||
echo ""
|
||||
echo ""
|
||||
echo "* * * * * Welcome to OpenDRS $DRS_VERSION Installation * * * * *"
|
||||
@@ -29,7 +37,341 @@ echo ""
|
||||
echo ""
|
||||
echo "Just press enter at the prompts to accept the defaults shown."
|
||||
echo ""
|
||||
# Check for prerequisites and prompt to install
|
||||
echo "Checking for prerequisites..."
|
||||
echo ""
|
||||
echo ""
|
||||
echo " Checking for apache2 installation..."
|
||||
echo ""
|
||||
if dpkg -l|grep apache2 >/dev/null 2>&1
|
||||
then
|
||||
echo ""
|
||||
echo "apache2 is installed. Continuing."
|
||||
echo ""
|
||||
else
|
||||
echo "OpenDRS requires the apache2 http server, but it doesn't seem"
|
||||
echo -n "to be installed. Install it now? [Y/n]: "
|
||||
read reqinstall
|
||||
if [ "$reqinstall" = "N" -o "$reqinstall" = "n" ]
|
||||
then
|
||||
echo "OpenDRS requires apache2, but you have elected not to install it."
|
||||
echo "Installation cannot continue."
|
||||
exit 1
|
||||
else
|
||||
echo ""
|
||||
echo "###################################################################"
|
||||
echo ""
|
||||
echo "Proceeding with apache2 installation"
|
||||
echo ""
|
||||
echo "###################################################################"
|
||||
sleep 3
|
||||
apt-get install -y apache2
|
||||
echo ""
|
||||
echo "###################################################################"
|
||||
echo ""
|
||||
echo "Finished with apache2 installation"
|
||||
echo ""
|
||||
echo "###################################################################"
|
||||
sleep 3
|
||||
|
||||
fi
|
||||
fi
|
||||
|
||||
echo ""
|
||||
echo " Checking for php installation..."
|
||||
echo ""
|
||||
if dpkg -l|grep php >/dev/null 2>&1
|
||||
then
|
||||
echo ""
|
||||
echo "php is installed. Continuing."
|
||||
echo ""
|
||||
else
|
||||
echo ""
|
||||
echo ""
|
||||
echo "OpenDRS requires php, but it doesn't seem to be installed."
|
||||
echo -n "Install it now? [Y/n]: "
|
||||
read reqinstall
|
||||
if [ "$reqinstall" = "N" -o "$reqinstall" = "n" ]
|
||||
then
|
||||
echo "OpenDRS requires php, but you have elected not to install it."
|
||||
echo "Installation cannot continue."
|
||||
exit 1
|
||||
else
|
||||
echo ""
|
||||
echo "###################################################################"
|
||||
echo ""
|
||||
echo "Proceeding with php installation"
|
||||
echo ""
|
||||
echo "###################################################################"
|
||||
sleep 3
|
||||
apt-get install -y php
|
||||
echo ""
|
||||
echo "###################################################################"
|
||||
echo ""
|
||||
echo "Finished with php installation"
|
||||
echo ""
|
||||
echo "###################################################################"
|
||||
sleep 3
|
||||
fi
|
||||
fi
|
||||
|
||||
echo ""
|
||||
echo " Checking for mariadb or mysql installation..."
|
||||
echo ""
|
||||
|
||||
if dpkg -l|grep mariadb-server >/dev/null 2>&1
|
||||
then
|
||||
echo ""
|
||||
echo "mariadb-server is installed. Continuing."
|
||||
echo ""
|
||||
elif dpkg -l|grep mysql-server >/dev/null 2>&1
|
||||
then
|
||||
echo ""
|
||||
echo "mysql-server is installed. Continuing."
|
||||
echo ""
|
||||
else
|
||||
echo ""
|
||||
echo ""
|
||||
echo "OpenDRS requires either mariadb or mysql server, but neither seem"
|
||||
echo -n "to be installed. Install mariadb-server now? [Y/n]: "
|
||||
read reqinstall
|
||||
if [ "$reqinstall" = "N" -o "$reqinstall" = "n" ]
|
||||
then
|
||||
echo "OpenDRS requires either mariadb or mysql server, but you have elected not to install it."
|
||||
echo "Installation cannot continue."
|
||||
exit 1
|
||||
else
|
||||
echo ""
|
||||
echo "###################################################################"
|
||||
echo ""
|
||||
echo "Proceeding with mariadb-server installation"
|
||||
echo ""
|
||||
echo "###################################################################"
|
||||
sleep 3
|
||||
apt-get install -y mariadb-server
|
||||
echo ""
|
||||
echo "###################################################################"
|
||||
echo ""
|
||||
echo "Finished with mariadb-server installation"
|
||||
echo ""
|
||||
echo "###################################################################"
|
||||
sleep 3
|
||||
echo ""
|
||||
echo "###################################################################"
|
||||
echo ""
|
||||
echo "Proceeding with mariadb configuration"
|
||||
echo ""
|
||||
echo "###################################################################"
|
||||
sleep 3
|
||||
echo ""
|
||||
echo "Configuring the MariaDB installation. There will be some more prompts:"
|
||||
echo ""
|
||||
echo "- You'll be prompted for the current password for the root user. You've"
|
||||
echo " just installed MariaDB and you haven't set one yet, so just press enter."
|
||||
echo ""
|
||||
echo "- You'll be prompted to switch to unix_socket authentication. Answer Y."
|
||||
echo ""
|
||||
echo "- You'll be prompted to change the root password. Answer Y and enter a password."
|
||||
echo " Note that this is just the password for the MariaDB root user, not the root login."
|
||||
echo " DO NOT FORGET THIS PASSWORD. You'll need it later during OpenDRS install."
|
||||
echo ""
|
||||
echo "- Answer Y to remove anonymous users, disallow root login remotely, remove"
|
||||
echo " test database and access, and reload privilege tables."
|
||||
echo ""
|
||||
echo -n "Press enter to proceed."
|
||||
read continueok
|
||||
echo ""
|
||||
mysql_secure_installation
|
||||
echo ""
|
||||
echo "###################################################################"
|
||||
echo ""
|
||||
echo "Finished with mariadb configuration."
|
||||
echo ""
|
||||
echo "###################################################################"
|
||||
sleep 3
|
||||
fi
|
||||
fi
|
||||
echo ""
|
||||
echo " Checking for phpmyadmin installation..."
|
||||
echo ""
|
||||
if dpkg -l|grep phpmyadmin >/dev/null 2>&1
|
||||
then
|
||||
echo ""
|
||||
echo "phpmyadmin is installed. Continuing."
|
||||
echo ""
|
||||
else
|
||||
echo "phpmyadmin is optional, but doesn't seem to be installed."
|
||||
echo "It is an optional package that enables administration of the mysql/mariadb"
|
||||
echo "database server using a friendly GUI. It is highly recommended."
|
||||
echo "Note that this has the potential to be a security risk, especially"
|
||||
echo "if your passwords aren't sufficiently strong."
|
||||
echo -n "Install it now? [Y/n]: "
|
||||
read reqinstall
|
||||
if [ "$reqinstall" = "N" -o "$reqinstall" = "n" ]
|
||||
then
|
||||
echo "Proceeding without installing phpmyadmin. Database administration"
|
||||
echo "will require the use of the mysql/mariadb command line tools."
|
||||
else
|
||||
echo ""
|
||||
echo "###################################################################"
|
||||
echo ""
|
||||
echo "Proceeding with phpmyadmin installation"
|
||||
echo ""
|
||||
echo "###################################################################"
|
||||
sleep 3
|
||||
echo ""
|
||||
echo "During the following installation of phpmyadmin:"
|
||||
echo ""
|
||||
echo "- Select apache2 as the web server to configure automatically."
|
||||
echo ""
|
||||
echo "- Choose Yes when prompted to install phpmyadmin database and allow it to"
|
||||
echo " generate a random password(leave the field blank)."
|
||||
echo ""
|
||||
echo -n "Press enter to continue."
|
||||
read continueok
|
||||
echo ""
|
||||
apt-get install -y phpmyadmin
|
||||
echo ""
|
||||
echo ""
|
||||
echo "You can now access phpmyadmin using a web browser pointed to:"
|
||||
echo "http://$HOSTNAME/phpmyadmin"
|
||||
echo "*** WARNING!! this url is accessible via unencrypted (http), not"
|
||||
echo "encrypted SSL (https) connections. This is a huge security risk"
|
||||
echo "since the username and password you enter will be sent in the"
|
||||
echo "clear for any potential attacker to sniff! You should enable"
|
||||
echo "redirection to https for phpmyadmin in your apache2 configuration."
|
||||
echo ""
|
||||
echo -n "Press enter to continue."
|
||||
read continueok
|
||||
echo ""
|
||||
echo "###################################################################"
|
||||
echo ""
|
||||
echo "Finished with phpmyadmin installation"
|
||||
echo ""
|
||||
echo "###################################################################"
|
||||
sleep 3
|
||||
fi
|
||||
fi
|
||||
echo ""
|
||||
echo " Checking for webmin installation..."
|
||||
echo ""
|
||||
if dpkg -l|grep webmin >/dev/null 2>&1
|
||||
then
|
||||
echo ""
|
||||
echo "webmin is installed. Continuing."
|
||||
echo ""
|
||||
else
|
||||
echo "webmin is optional, but doesn't seem to be installed."
|
||||
echo "It is an optional package that enables system administration"
|
||||
echo "using a friendly GUI. It is highly recommended, especially for"
|
||||
echo "headless servers without any way to log in directly on the machine."
|
||||
echo "Note that this has the potential to be a security risk, especially"
|
||||
echo "if your passwords aren't sufficiently strong."
|
||||
echo -n "Install it now? [Y/n]: "
|
||||
read reqinstall
|
||||
if [ "$reqinstall" = "N" -o "$reqinstall" = "n" ]
|
||||
then
|
||||
echo "Proceeding without installing webmin. System administration"
|
||||
echo "will require login to the server either directly or via ssh."
|
||||
else
|
||||
echo ""
|
||||
echo "###################################################################"
|
||||
echo ""
|
||||
echo "Proceeding with webmin installation"
|
||||
echo ""
|
||||
echo "###################################################################"
|
||||
sleep 3
|
||||
echo "Installing webmin..."
|
||||
skipwebmin="false"
|
||||
if ! curl -o setup-repos.sh https://raw.githubusercontent.com/webmin/webmin/master/setup-repos.sh
|
||||
then
|
||||
echo "Warning: failed to download Webmin repo setup script."
|
||||
echo -n "Ignore and [c]ontinue or [A]bort? [c/A]: "
|
||||
read wmfailchoice
|
||||
if [ "$wmfailchoice" = "C" -o "$wmfailchoice" = "c" ]
|
||||
then
|
||||
skipwebmin="true"
|
||||
echo "Continuing without installing Webmin. You should investigate the failure"
|
||||
echo "and install Webmin manually after the server is set up if you would like"
|
||||
echo "to be able to manage the server from another computer with a GUI instead"
|
||||
echo "of through ssh only."
|
||||
echo -n "Press enter to continue."
|
||||
read continueok
|
||||
echo ""
|
||||
fi
|
||||
fi
|
||||
if [ "$skipwebmin" = "false" ]
|
||||
then
|
||||
sh setup-repos.sh -f
|
||||
apt-get install -y --install-recommends webmin
|
||||
fi
|
||||
echo "...done."
|
||||
echo ""
|
||||
echo "You can now access webmin using a web browser pointed to:"
|
||||
echo "https://$HOSTNAME:10000"
|
||||
echo "Unless you have obtained valid ssl certificates, your server is"
|
||||
echo "using self-signed certs. This is not necessarily a problem, but"
|
||||
echo "your browser will complain. You can tell the browser to accept the"
|
||||
echo "self signed certificates and the traffic will still be encrypted,"
|
||||
echo "however you may be vulnerable to man-in-the-middle attacks. You can"
|
||||
echo "get free valid certificates through LetsEncrypt."
|
||||
echo "See http://letsencrypt.org for more information."
|
||||
echo ""
|
||||
echo -n "Press enter to continue."
|
||||
read continueok
|
||||
echo ""
|
||||
echo "###################################################################"
|
||||
echo ""
|
||||
echo "Finished with webmin installation"
|
||||
echo ""
|
||||
echo "###################################################################"
|
||||
sleep 3
|
||||
|
||||
fi
|
||||
fi
|
||||
echo ""
|
||||
echo " Checking for uuidgen installation..."
|
||||
echo ""
|
||||
if uuidgen 2>&1
|
||||
then
|
||||
echo ""
|
||||
echo "uuidgen is installed. Continuing."
|
||||
echo ""
|
||||
else
|
||||
echo ""
|
||||
echo ""
|
||||
echo "OpenDRS requires uuidgen, but it doesn't seem to be installed."
|
||||
echo -n "Install it now? [Y/n]: "
|
||||
read reqinstall
|
||||
if [ "$reqinstall" = "N" -o "$reqinstall" = "n" ]
|
||||
then
|
||||
echo "OpenDRS requires uuidgen, but you have elected not to install it."
|
||||
echo "Installation cannot continue."
|
||||
exit 1
|
||||
else
|
||||
echo ""
|
||||
echo "###################################################################"
|
||||
echo ""
|
||||
echo "Proceeding with uuidgen installation"
|
||||
echo ""
|
||||
echo "###################################################################"
|
||||
sleep 3
|
||||
apt-get install -y uuid-runtime
|
||||
echo ""
|
||||
echo "###################################################################"
|
||||
echo ""
|
||||
echo "Finished with uuidgen installation"
|
||||
echo ""
|
||||
echo "###################################################################"
|
||||
sleep 3
|
||||
fi
|
||||
fi
|
||||
echo ""
|
||||
echo ""
|
||||
echo "Finished checking for and installing prerequisites..."
|
||||
echo ""
|
||||
echo ""
|
||||
sleep 3
|
||||
# prompt for install location
|
||||
echo "Where would you like to install this version of OpenDRS? This should"
|
||||
echo "be somewhere the webserver can find it. If you don't know, refer to the"
|
||||
@@ -57,10 +399,7 @@ then
|
||||
if [ -e "$install_path/db.php" ]
|
||||
then
|
||||
# A db.php file was found in the install path
|
||||
prev_inst_present=1
|
||||
grep -q -e "OpenDRS" -e "OpenMTS" $install_path/db.php
|
||||
prev_inst_present=$?
|
||||
if [ "$prev_inst_present" -eq 0 ]
|
||||
if grep -q -e "OpenDRS" -e "OpenMTS" $install_path/db.php
|
||||
then
|
||||
# the db.php file is part of an OpenDRS/OpenMTS installation
|
||||
echo "The installation path you chose already exists."
|
||||
@@ -87,7 +426,7 @@ then
|
||||
# apply database updates
|
||||
mysql -u"$curr_username" -f -D $curr_dbname < opendrs-update.sql >/dev/null 2>&1
|
||||
# apply updates to existing db.php
|
||||
./opendrs-update.sh $install_path
|
||||
bash ./opendrs-update.sh $install_path
|
||||
# copy distribution to install location
|
||||
echo "Installing distribution . . ."
|
||||
cp -R distfiles/* $install_path
|
||||
@@ -135,8 +474,8 @@ else
|
||||
# This is a fresh install
|
||||
operation="installed"
|
||||
# prompt for mysql information
|
||||
bad_mysql_adm=1
|
||||
while [ $bad_mysql_adm -eq 1 ]
|
||||
bad_mysql_adm=true
|
||||
while $bad_mysql_adm
|
||||
do
|
||||
admintestdb="drsadm`date +%Y%m%d`"
|
||||
echo "We need to know the username and password of a MySQL administrator"
|
||||
@@ -148,10 +487,9 @@ else
|
||||
echo -n "MySQL admin password: "
|
||||
read -s mysql_adm_pass
|
||||
export MYSQL_PWD="$mysql_adm_pass"
|
||||
mysql -u"$mysql_adm_user" -e "create database $admintestdb;drop database $admintestdb"
|
||||
if [ $? -eq 0 ]
|
||||
if mysql -u"$mysql_adm_user" -e "create database $admintestdb;drop database $admintestdb"
|
||||
then
|
||||
bad_mysql_adm=0
|
||||
bad_mysql_adm=false
|
||||
else
|
||||
echo "ERROR: Either the username/password you supplied were incorrect or the user"
|
||||
echo -n "is not a MySQL administrator. Try again? [Y/N]: "
|
||||
@@ -176,8 +514,8 @@ else
|
||||
echo ""
|
||||
|
||||
# Create initial database
|
||||
db_create_fail=1
|
||||
while [ $db_create_fail -eq 1 ]
|
||||
db_create_fail=true
|
||||
while $db_create_fail
|
||||
do
|
||||
echo "What would you like to call the database for this installation of OpenDRS?"
|
||||
echo "If you accept the default, it will be called opendrs. Again, this is fine"
|
||||
@@ -192,10 +530,9 @@ else
|
||||
fi
|
||||
echo ""
|
||||
export MYSQL_PWD="$mysql_adm_pass"
|
||||
mysql -u"$mysql_adm_user" -e "create database $new_db_name"
|
||||
if [ $? -eq 0 ]
|
||||
if mysql -u"$mysql_adm_user" -e "create database $new_db_name"
|
||||
then
|
||||
db_create_fail=0
|
||||
db_create_fail=false
|
||||
else
|
||||
echo "An error was encountered when trying to create the database."
|
||||
echo "This probably means the database already exists."
|
||||
@@ -238,7 +575,7 @@ else
|
||||
|
||||
# copy distribution to install location
|
||||
echo "Installing distribution . . ."
|
||||
cp -Rv distfiles/* $install_path
|
||||
cp -R distfiles/* $install_path
|
||||
if [ ! -L "$install_path/jquery-ui" ]
|
||||
then
|
||||
ln -s $install_path/jquery-ui* $install_path/jquery-ui
|
||||
@@ -287,7 +624,7 @@ then
|
||||
read enconf
|
||||
if [ "$enconf" = "" -o "$enconf" = "Y" -o "$enconf" = "y" ]
|
||||
then
|
||||
a2enconf $base_url.conf
|
||||
a2enconf $base_url.conf >/dev/null
|
||||
service apache2 reload
|
||||
echo "You can now point a web browser to $base_url on your web server "
|
||||
echo "to set up and configure OpenDRS."
|
||||
@@ -312,3 +649,5 @@ else
|
||||
echo "to use your upgraded OpenDRS."
|
||||
fi
|
||||
|
||||
# Re-enable unattended-upgrades
|
||||
if $restart_uu; then systemctl start unattended-upgrades; fi
|
||||
|
||||
@@ -69,7 +69,7 @@ CREATE TABLE `config` (
|
||||
LOCK TABLES `config` WRITE;
|
||||
/*!40000 ALTER TABLE `config` DISABLE KEYS */;
|
||||
INSERT INTO `config` VALUES
|
||||
(1,'drs_version','1.3.2','1.3.2'),
|
||||
(1,'drs_version','1.4.0','1.4.0'),
|
||||
(5,'app_name','OpenDRS - Discrepancy Reporting System','OpenDRS Discrepancy Reporting System'),
|
||||
(6,'banner','1','1'),
|
||||
(7,'background_color','0B3144','0B3144'),
|
||||
@@ -99,7 +99,8 @@ INSERT INTO `config` VALUES
|
||||
(36,'functional_no','Non-functional','Non-functional'),
|
||||
(37,'functional_yes_short','OK','OK'),
|
||||
(38,'functional_no_short','INOP','INOP'),
|
||||
(39,'disc_drop_data','Name','Name');
|
||||
(39,'disc_drop_data','Name','Name'),
|
||||
(40,'access_mode','trusted','trusted');
|
||||
/*!40000 ALTER TABLE `config` ENABLE KEYS */;
|
||||
UNLOCK TABLES;
|
||||
|
||||
|
||||
@@ -226,3 +226,38 @@ UPDATE config SET value="1.3.1",defaultvalue="1.3.1" WHERE name="drs_version";
|
||||
-- Update version number
|
||||
UPDATE config SET value="1.3.2",defaultvalue="1.3.2" WHERE name="drs_version";
|
||||
-- --------------------------------------
|
||||
|
||||
-- ---------- version 1.3.3 -------------
|
||||
-- Update version number
|
||||
UPDATE config SET value="1.3.3",defaultvalue="1.3.3" WHERE name="drs_version";
|
||||
-- --------------------------------------
|
||||
|
||||
-- ---------- version 1.4.0 -------------
|
||||
-- Update version number
|
||||
UPDATE config SET value="1.4.0",defaultvalue="1.4.0" WHERE name="drs_version";
|
||||
|
||||
-- Add access_mode to config table
|
||||
INSERT INTO config(name,value,defaultvalue)
|
||||
SELECT * FROM
|
||||
(SELECT 'access_mode',
|
||||
'trusted' AS wval,
|
||||
'trusted' AS dval
|
||||
)
|
||||
AS tmp
|
||||
WHERE NOT EXISTS
|
||||
(
|
||||
SELECT `name` FROM `config` WHERE `name` = "access_mode"
|
||||
) LIMIT 1
|
||||
;
|
||||
-- --------------------------------------
|
||||
|
||||
-- ---------- version 1.4.1 -------------
|
||||
-- Update version number
|
||||
UPDATE config SET value="1.4.1",defaultvalue="1.4.1" WHERE name="drs_version";
|
||||
-- --------------------------------------
|
||||
|
||||
-- ---------- version 1.4.2 -------------
|
||||
-- Update version number
|
||||
UPDATE config SET value="1.4.2",defaultvalue="1.4.2" WHERE name="drs_version";
|
||||
-- --------------------------------------
|
||||
|
||||
|
||||
Reference in New Issue
Block a user