Revision d825ef2b
Support de la génération incrémentale de la conf
Change-Id: I3d954ef6f1b8a2164772d21f78c98827144ee340
Reviewed-on: https://vigilo-dev.si.c-s.fr/review/2395
Tested-by: Build system <qa@vigilo-dev.si.c-s.fr>
Reviewed-by: Francois POIROTTE <francois.poirotte@c-s.fr>
| pkg/sudoers | ||
|---|---|---|
| 1 | 1 |
Defaults:apache !requiretty |
| 2 |
apache ALL=(root) NOPASSWD: /usr/bin/vigiconf deploy * |
|
| 2 |
apache ALL=(root) NOPASSWD: /usr/bin/vigiconf deploy, /usr/bin/vigiconf deploy * |
|
| src/plugins/vigilo/front/menu.php | ||
|---|---|---|
| 25 | 25 |
); |
| 26 | 26 |
|
| 27 | 27 |
$debug = empty($_POST['debug']) ? '' : '--debug'; |
| 28 |
$cmd = "/usr/bin/sudo -n /usr/bin/vigiconf deploy -f $debug"; |
|
| 28 |
$force = empty($_POST['force']) ? '' : '--force'; |
|
| 29 |
$cmd = "/usr/bin/sudo -n /usr/bin/vigiconf deploy $force $debug"; |
|
| 29 | 30 |
$res = proc_open($cmd, $fds, $pipes); |
| 30 | 31 |
|
| 31 | 32 |
if (!is_resource($res)) {
|
| src/plugins/vigilo/inc/menu.class.php | ||
|---|---|---|
| 131 | 131 |
echo '<button type="submit" name="deploy" value="1">Déployer la configuration</button> '; |
| 132 | 132 |
echo '<input name="debug" id="debug" value="1" type="checkbox"/> '; |
| 133 | 133 |
echo '<label for="debug">Afficher les informations de débogage</label>'; |
| 134 |
echo '<input name="force" id="force" value="1" type="checkbox"/> '; |
|
| 135 |
echo '<label for="force">Regénérer tous les fichiers</label>'; |
|
| 134 | 136 |
Html::closeForm(); |
| 135 | 137 |
} |
| 136 | 138 |
} |
Also available in: Unified diff