1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/incus_ynh.git synced 2024-09-03 19:26:15 +02:00

Fix broken commit

This commit is contained in:
Salamandar 2024-03-14 23:29:55 +01:00
parent da9e79d50c
commit e894b84102
2 changed files with 2 additions and 13 deletions

2
conf/dnsmasq.conf Normal file
View file

@ -0,0 +1,2 @@
bind-interfaces
except-interface=incusbr0

View file

@ -16,10 +16,7 @@ license = "Apache-2.0"
website = "https://linuxcontainers.org/incus/"
admindoc = "https://linuxcontainers.org/incus/docs/main/"
code = "https://github.com/lxc/incus"
<<<<<<< Updated upstream
=======
# cpe = ""
>>>>>>> Stashed changes
[integration]
yunohost = '>= 11.2'
@ -34,20 +31,10 @@ ram.runtime = "50M"
[install]
[resources]
<<<<<<< Updated upstream
# Do NOT handle system_user, deb package will
# [resources.system_user]
# [resources.install_dir]
=======
[resources.system_user]
[resources.install_dir]
[resources.data_dir]
# TODO: incus actual data dir
>>>>>>> Stashed changes
# Do NOT handle /var/lib, deb package will
# [resources.data_dir]