YunoHost-Apps/vaultwarden_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/vaultwarden_ynh.git synced 2024-09-03 18:26:31 +02:00
Code Issues Activity Actions

Merge pull request #169 from YunoHost-Apps/testing

Browse source 
[fix] Create datadir after user is created
This commit is contained in:
yalh76 2022-01-28 19:53:03 +01:00 committed by GitHub
commit f62a2116f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
conf/systemd.service
View file

@ -8,8 +8,8 @@ After=network.target
User=__APP__ User=__APP__
Group=__APP__ Group=__APP__
WorkingDirectory=__FINALPATH__/live/ WorkingDirectory=__FINALPATH__/live/
ReadWriteDirectories=__FINALPATH__/live/ ReadWriteDirectories=__FINALPATH__/live/ __DATADIR__
EnvironmentFile=__FINALPATH__/live/vaultwarden.env EnvironmentFile=__FINALPATH__/live/.env
ExecStart=__FINALPATH__/live/vaultwarden ExecStart=__FINALPATH__/live/vaultwarden
# Set reasonable connection and process limits # Set reasonable connection and process limits
@ -22,7 +22,7 @@ LimitNPROC=64
# Details for these options: https://www.freedesktop.org/software/systemd/man/systemd.exec.html # Details for these options: https://www.freedesktop.org/software/systemd/man/systemd.exec.html
PrivateTmp=yes PrivateTmp=yes
PrivateDevices=yes PrivateDevices=yes
ProtectHome=true ProtectHome=false
ProtectSystem=strict ProtectSystem=strict
[Install] [Install]

2
scripts/change_url
View file

@ -114,7 +114,7 @@ fi
#================================================= #=================================================
ynh_script_progression --message="Modifying a config file..." ynh_script_progression --message="Modifying a config file..."
config="$final_path/live/vaultwarden.env" config="$final_path/live/.env"
ynh_backup_if_checksum_is_different --file="$config" ynh_backup_if_checksum_is_different --file="$config"

6
scripts/install
View file

@ -156,10 +156,10 @@ chown -R $app:$app "$datadir"
#================================================= #=================================================
ynh_script_progression --message="Adding a configuration file..." ynh_script_progression --message="Adding a configuration file..."
ynh_add_config --template="../conf/vaultwarden.env" --destination="$final_path/live/vaultwarden.env" ynh_add_config --template="../conf/vaultwarden.env" --destination="$final_path/live/.env"
chmod 400 "$final_path/live/vaultwarden.env" chmod 400 "$final_path/live/.env"
chown $app:$app "$final_path/live/vaultwarden.env" chown $app:$app "$final_path/live/.env"
#================================================= #=================================================
# SETUP SYSTEMD # SETUP SYSTEMD

39
scripts/upgrade
View file

@ -72,9 +72,9 @@ then
db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_name=$(ynh_app_setting_get --app=$app --key=db_name)
# Move config file # Move config file
mv $final_path/live/bitwarden_rs.env $final_path/live/vaultwarden.env mv $final_path/live/bitwarden_rs.env $final_path/live/.env
ynh_delete_file_checksum --file="/var/www/$old_app/live/bitwarden_rs.env" ynh_delete_file_checksum --file="/var/www/$old_app/live/bitwarden_rs.env"
ynh_store_file_checksum --file="$final_path/live/vaultwarden.env" ynh_store_file_checksum --file="$final_path/live/.env"
ynh_secure_remove --file="$final_path/live/bitwarden_rs" ynh_secure_remove --file="$final_path/live/bitwarden_rs"
# Manage permissions # Manage permissions
@ -91,18 +91,6 @@ fi
ynh_remove_logrotate ynh_remove_logrotate
# If datadir doesn't exist, create it
if [ -z $datadir ]; then
datadir=/home/yunohost.app/$app
ynh_app_setting_set --app=$app --key=datadir --value=$datadir
mkdir -p $datadir
rsync -arz "$final_path/live/data/" "$datadir/" --delete-after --remove-source-files
ynh_secure_remove --file="$final_path/live/data"
chmod 750 "$datadir"
chmod -R o-rwx "$datadir"
chown -R $app:$app "$datadir"
fi
#================================================= #=================================================
# ENSURE DOWNWARD COMPATIBILITY # ENSURE DOWNWARD COMPATIBILITY
#================================================= #=================================================
@ -133,6 +121,23 @@ ynh_script_progression --message="Making sure dedicated system user exists..."
# Create a dedicated user (if not existing) # Create a dedicated user (if not existing)
ynh_system_user_create --username=$app --home_dir=$final_path ynh_system_user_create --username=$app --home_dir=$final_path
#=================================================
# CREATE DATA DIRECTORY
#=================================================
ynh_script_progression --message="Making sure data directory exists..."
# If datadir doesn't exist, create it
if [ -z $datadir ]; then
datadir=/home/yunohost.app/$app
ynh_app_setting_set --app=$app --key=datadir --value=$datadir
mkdir -p $datadir
rsync -arz "$final_path/live/data/" "$datadir/" --delete-after --remove-source-files
ynh_secure_remove --file="$final_path/live/data"
chmod 750 "$datadir"
chmod -R o-rwx "$datadir"
chown -R $app:$app "$datadir"
fi
#================================================= #=================================================
# DOWNLOAD, CHECK AND UNPACK SOURCE # DOWNLOAD, CHECK AND UNPACK SOURCE
#================================================= #=================================================
@ -214,10 +219,10 @@ fi
#================================================= #=================================================
ynh_script_progression --message="Updating a configuration file..." ynh_script_progression --message="Updating a configuration file..."
ynh_add_config --template="../conf/vaultwarden.env" --destination="$final_path/live/vaultwarden.env" ynh_add_config --template="../conf/vaultwarden.env" --destination="$final_path/live/.env"
chmod 400 "$final_path/live/vaultwarden.env" chmod 400 "$final_path/live/.env"
chown $app:$app "$final_path/live/vaultwarden.env" chown $app:$app "$final_path/live/.env"
#================================================= #=================================================
# SETUP SYSTEMD # SETUP SYSTEMD