YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'unstable' into regen-conf-enh

Browse source
This commit is contained in:
Jérôme Lebleu 2016-04-17 15:47:49 +02:00
commit 0bacf65d9c
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
data/actionsmap/yunohost.yml
View file

@ -516,6 +516,7 @@ app:
initdb: initdb:
action_help: Create database and initialize it with optionnal attached script action_help: Create database and initialize it with optionnal attached script
api: POST /tools/initdb api: POST /tools/initdb
deprecated: true
arguments: arguments:
user: user:
help: Name of the DB user help: Name of the DB user
@ -962,7 +963,7 @@ service:
api: PUT /services/regenconf api: PUT /services/regenconf
configuration: configuration:
lock: false lock: false
deprecated: deprecated_alias:
- regenconf - regenconf
arguments: arguments:
names: names:

2
debian/control vendored
View file

@ -10,7 +10,7 @@ Homepage: https://yunohost.org/
Package: yunohost Package: yunohost
Architecture: all Architecture: all
Depends: ${python:Depends}, ${misc:Depends} Depends: ${python:Depends}, ${misc:Depends}
, moulinette (>= 2.3.5) , moulinette (>= 2.3.5.1)
, python-psutil, python-requests, python-dnspython , python-psutil, python-requests, python-dnspython
, python-apt, python-miniupnpc , python-apt, python-miniupnpc
, glances , glances