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:
parent
da9e79d50c
commit
e894b84102
2 changed files with 2 additions and 13 deletions
2
conf/dnsmasq.conf
Normal file
2
conf/dnsmasq.conf
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
bind-interfaces
|
||||||
|
except-interface=incusbr0
|
|
@ -16,10 +16,7 @@ license = "Apache-2.0"
|
||||||
website = "https://linuxcontainers.org/incus/"
|
website = "https://linuxcontainers.org/incus/"
|
||||||
admindoc = "https://linuxcontainers.org/incus/docs/main/"
|
admindoc = "https://linuxcontainers.org/incus/docs/main/"
|
||||||
code = "https://github.com/lxc/incus"
|
code = "https://github.com/lxc/incus"
|
||||||
<<<<<<< Updated upstream
|
|
||||||
=======
|
|
||||||
# cpe = ""
|
# cpe = ""
|
||||||
>>>>>>> Stashed changes
|
|
||||||
|
|
||||||
[integration]
|
[integration]
|
||||||
yunohost = '>= 11.2'
|
yunohost = '>= 11.2'
|
||||||
|
@ -34,20 +31,10 @@ ram.runtime = "50M"
|
||||||
[install]
|
[install]
|
||||||
|
|
||||||
[resources]
|
[resources]
|
||||||
<<<<<<< Updated upstream
|
|
||||||
|
|
||||||
# Do NOT handle system_user, deb package will
|
# Do NOT handle system_user, deb package will
|
||||||
# [resources.system_user]
|
# [resources.system_user]
|
||||||
|
|
||||||
# [resources.install_dir]
|
# [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
|
# Do NOT handle /var/lib, deb package will
|
||||||
# [resources.data_dir]
|
# [resources.data_dir]
|
||||||
|
|
Loading…
Add table
Reference in a new issue