1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/lxd_ynh.git synced 2024-09-03 19:45:53 +02:00

Merge pull request #25 from YunoHost-Apps/testing

Testing
This commit is contained in:
Kayou 2022-01-14 16:08:10 +01:00 committed by GitHub
commit 0bfa7e8837
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 19 additions and 6 deletions

View file

@ -5,7 +5,7 @@
"description": { "description": {
"en": "Offers a user experience similar to virtual machines but using Linux containers instead." "en": "Offers a user experience similar to virtual machines but using Linux containers instead."
}, },
"version": "4.21~ynh1", "version": "4.21~ynh2",
"url": "https://example.com", "url": "https://example.com",
"license": "Apache-2.0", "license": "Apache-2.0",
"maintainer": { "maintainer": {

View file

@ -50,9 +50,12 @@ ynh_backup --src_path="/var/log/$app/"
ynh_backup --src_path="/usr/local/lib/$app/" ynh_backup --src_path="/usr/local/lib/$app/"
ynh_backup --src_path="/usr/local/bin/fuidshift"
ynh_backup --src_path="/usr/local/bin/lxc" ynh_backup --src_path="/usr/local/bin/lxc"
ynh_backup --src_path="/usr/local/bin/lxd"
ynh_backup --src_path="/usr/local/bin/lxc-to-lxd" ynh_backup --src_path="/usr/local/bin/lxc-to-lxd"
ynh_backup --src_path="/usr/local/bin/lxd"
ynh_backup --src_path="/usr/local/bin/lxd-agent"
ynh_backup --src_path="/usr/local/bin/lxd-benchmark"
ynh_backup --src_path="/usr/local/bin/lxd-p2c" ynh_backup --src_path="/usr/local/bin/lxd-p2c"
ynh_backup --src_path="/etc/bash_completion.d/lxd-client" ynh_backup --src_path="/etc/bash_completion.d/lxd-client"

View file

@ -78,7 +78,7 @@ ynh_exec_warn_less make
mkdir -p /usr/local/lib/$app mkdir -p /usr/local/lib/$app
mkdir -p /var/log/$app mkdir -p /var/log/$app
cp -a ${GOPATH}/{raft,dqlite}/.libs/lib*.so* /usr/local/lib/$app/ cp -a ${GOPATH}/{raft,dqlite}/.libs/lib*.so* /usr/local/lib/$app/
cp ${GOPATH}/bin/{lxc,lxd,lxc-to-lxd,lxd-p2c} /usr/local/bin cp ${GOPATH}/bin/{fuidshift,lxc,lxc-to-lxd,lxd,lxd-agent,lxd-benchmark,lxd-p2c} /usr/local/bin
cp ${lxd_tmp}/scripts/bash/lxd-client /etc/bash_completion.d/ cp ${lxd_tmp}/scripts/bash/lxd-client /etc/bash_completion.d/
popd popd

View file

@ -72,14 +72,21 @@ ynh_secure_remove --file="/usr/local/lib/$app"
# Remove the log files # Remove the log files
ynh_secure_remove --file="/var/log/$app" ynh_secure_remove --file="/var/log/$app"
ynh_secure_remove --file="/usr/local/bin/fuidshift"
ynh_secure_remove --file="/usr/local/bin/lxc" ynh_secure_remove --file="/usr/local/bin/lxc"
ynh_secure_remove --file="/usr/local/bin/lxd"
ynh_secure_remove --file="/usr/local/bin/lxc-to-lxd" ynh_secure_remove --file="/usr/local/bin/lxc-to-lxd"
ynh_secure_remove --file="/usr/local/bin/lxd"
ynh_secure_remove --file="/usr/local/bin/lxd-agent"
ynh_secure_remove --file="/usr/local/bin/lxd-benchmark"
ynh_secure_remove --file="/usr/local/bin/lxd-p2c" ynh_secure_remove --file="/usr/local/bin/lxd-p2c"
ynh_secure_remove --file="/etc/bash_completion.d/lxd-client" ynh_secure_remove --file="/etc/bash_completion.d/lxd-client"
sed -i "/# Added by lxd$/{N;/root:100000:65536/d}" /etc/sub{u,g}id sed -i "/# Added by lxd$/{N;/root:100000:65536/d}" /etc/sub{u,g}id
ynh_secure_remove --file="/etc/dnsmasq.d/lxd"
systemctl restart dnsmasq
#================================================= #=================================================
# GENERIC FINALIZATION # GENERIC FINALIZATION
#================================================= #=================================================

View file

@ -72,9 +72,12 @@ ynh_restore_file --origin_path="/var/log/$app/"
ynh_restore_file --origin_path="/usr/local/lib/$app/" ynh_restore_file --origin_path="/usr/local/lib/$app/"
ynh_restore_file --origin_path="/usr/local/bin/fuidshift"
ynh_restore_file --origin_path="/usr/local/bin/lxc" ynh_restore_file --origin_path="/usr/local/bin/lxc"
ynh_restore_file --origin_path="/usr/local/bin/lxd"
ynh_restore_file --origin_path="/usr/local/bin/lxc-to-lxd" ynh_restore_file --origin_path="/usr/local/bin/lxc-to-lxd"
ynh_restore_file --origin_path="/usr/local/bin/lxd"
ynh_restore_file --origin_path="/usr/local/bin/lxd-agent"
ynh_restore_file --origin_path="/usr/local/bin/lxd-benchmark"
ynh_restore_file --origin_path="/usr/local/bin/lxd-p2c" ynh_restore_file --origin_path="/usr/local/bin/lxd-p2c"
ynh_restore_file --origin_path="/etc/bash_completion.d/lxd-client" ynh_restore_file --origin_path="/etc/bash_completion.d/lxd-client"

View file

@ -96,7 +96,7 @@ ynh_exec_warn_less make
mkdir -p /usr/local/lib/$app mkdir -p /usr/local/lib/$app
mkdir -p /var/log/$app mkdir -p /var/log/$app
cp -a ${GOPATH}/{raft,dqlite}/.libs/lib*.so* /usr/local/lib/$app/ cp -a ${GOPATH}/{raft,dqlite}/.libs/lib*.so* /usr/local/lib/$app/
cp ${GOPATH}/bin/{lxc,lxd,lxc-to-lxd,lxd-p2c} /usr/local/bin cp ${GOPATH}/bin/{fuidshift,lxc,lxc-to-lxd,lxd,lxd-agent,lxd-benchmark,lxd-p2c} /usr/local/bin
cp ${lxd_tmp}/scripts/bash/lxd-client /etc/bash_completion.d/ cp ${lxd_tmp}/scripts/bash/lxd-client /etc/bash_completion.d/
popd popd