Corrected a number of apt packaging issues

This commit is contained in:
jude 2023-06-13 10:40:04 +01:00
parent c4bd2c1d18
commit fcf8f33681
7 changed files with 16 additions and 16 deletions

2
Cargo.lock generated
View File

@ -2189,7 +2189,7 @@ checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
[[package]] [[package]]
name = "reminder-rs" name = "reminder-rs"
version = "1.6.10" version = "1.6.10-4"
dependencies = [ dependencies = [
"base64", "base64",
"chrono", "chrono",

View File

@ -41,8 +41,9 @@ maintainer-scripts = "debian"
assets = [ assets = [
["target/release/reminder-rs", "usr/bin/reminder-rs", "755"], ["target/release/reminder-rs", "usr/bin/reminder-rs", "755"],
["conf/default.env", "etc/reminder-rs/default.env", "600"], ["conf/default.env", "etc/reminder-rs/default.env", "600"],
["web/static/**/*", "var/www/reminder-rs/static", "755"], ["conf/Rocket.toml", "etc/reminder-rs/Rocket.toml", "600"],
["web/templates/**/*", "var/www/reminder-rs/templates", "755"], ["web/static/**/*", "lib/reminder-rs/static", "755"],
["web/templates/**/*", "lib/reminder-rs/templates", "755"],
# ["nginx/reminder-rs", "etc/nginx/sites-available/reminder-rs", "755"] # ["nginx/reminder-rs", "etc/nginx/sites-available/reminder-rs", "755"]
] ]

8
conf/Rocket.toml Normal file
View File

@ -0,0 +1,8 @@
[default]
address = "127.0.0.1"
port = 18920
template_dir = "/lib/reminder-rs/templates"
limits = { json = "10MiB" }
[release]
secret_key = "release"

3
debian/postinst vendored
View File

@ -4,7 +4,8 @@ set -e
id -u reminder &>/dev/null || useradd -r -M reminder id -u reminder &>/dev/null || useradd -r -M reminder
if [ ! -f /etc/reminder-rs/config.env ]; then if [ ! -f '/etc/reminder-rs/config.env' ]; then
echo "Copying configuration file..."
cp /etc/reminder-rs/default.env /etc/reminder-rs/config.env cp /etc/reminder-rs/default.env /etc/reminder-rs/config.env
fi fi

11
debian/postrm vendored
View File

@ -1,11 +0,0 @@
#!/bin/bash
set -e
id -u reminder &>/dev/null || userdel reminder
if [ -f /etc/reminder-rs/config.env ]; then
rm /etc/reminder-rs/config.env
fi
#DEBHELPER#

View File

@ -5,6 +5,7 @@ Description=Reminder Bot
User=reminder User=reminder
Type=simple Type=simple
ExecStart=/usr/bin/reminder-rs ExecStart=/usr/bin/reminder-rs
WorkingDirectory=/lib/reminder-rs
Restart=always Restart=always
RestartSec=4 RestartSec=4
# Environment="RUST_LOG=warn,reminder_rs=info,postman=info" # Environment="RUST_LOG=warn,reminder_rs=info,postman=info"

View File

@ -105,7 +105,7 @@ pub async fn initialize(
.manage(reqwest_client) .manage(reqwest_client)
.manage(serenity_context) .manage(serenity_context)
.manage(db_pool) .manage(db_pool)
.mount("/static", FileServer::from(concat!(env!("CARGO_MANIFEST_DIR"), "/static"))) .mount("/static", FileServer::from("/lib/reminder-rs/static"))
.mount( .mount(
"/", "/",
routes![ routes![