dépôts
/
lhc
/
ateliers.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Modifications - etc/sv/php5-fpm/configure.sh - Installation de php5-gd
[lhc/ateliers.git]
/
vm_remote
diff --git
a/vm_remote
b/vm_remote
index
0fa0165
..
b12b180
100755
(executable)
--- a/
vm_remote
+++ b/
vm_remote
@@
-1,6
+1,6
@@
#!/bin/sh
set -e -f ${DRY_RUN:+-n} -u
#!/bin/sh
set -e -f ${DRY_RUN:+-n} -u
-tool=$(
cd "${0%/*}"; cd -
)
+tool=$(
readlink -e "${0%/*}"
)
. "$tool"/lib/rule.sh
. "$tool"/etc/vm.sh
. "$tool"/lib/rule.sh
. "$tool"/etc/vm.sh
@@
-47,7
+47,7
@@
rule_ssh () {
"$tool"/lib/ssh $vm_fqdn "$@"
}
rule_mosh () {
"$tool"/lib/ssh $vm_fqdn "$@"
}
rule_mosh () {
- mosh --ssh="$tool/lib/ssh $
*" $vm_fqdn
+ mosh --ssh="$tool/lib/ssh $
{ssh-}" -- $vm_fqdn "$@"
}
rule__ssh_known_hosts_update () {
rule ssh \
}
rule__ssh_known_hosts_update () {
rule ssh \
@@
-98,7
+98,7
@@
rule_apache2_key_send () {
do conf=${conf#"$tool"/etc/nginx/site.d/}
local site=${conf%/key_send}
rule _x509_site_key_decrypt \
do conf=${conf#"$tool"/etc/nginx/site.d/}
local site=${conf%/key_send}
rule _x509_site_key_decrypt \
- "$(cat "$tool"/etc/apache2/site.d/"$site"/
key_send
)" |
+ "$(cat "$tool"/etc/apache2/site.d/"$site"/
x509_host
)" |
rule ssh -l root ' \
sudo install -d -m 770 -o '"$user"' -g '"$user"' \
/etc/apache2 \
rule ssh -l root ' \
sudo install -d -m 770 -o '"$user"' -g '"$user"' \
/etc/apache2 \
@@
-146,10
+146,10
@@
rule_nginx_configure () {
for conf in "$tool"/etc/nginx/site.d/*/site.conf
do conf=${conf#"$tool"/etc/nginx/site.d/}
local site="${conf%/site.conf}"
for conf in "$tool"/etc/nginx/site.d/*/site.conf
do conf=${conf#"$tool"/etc/nginx/site.d/}
local site="${conf%/site.conf}"
- if test -f "$tool"/etc/nginx/site.d/"$site"/
key_send
+ if test -f "$tool"/etc/nginx/site.d/"$site"/
x509_host
then
rule _x509_site_key_decrypt \
then
rule _x509_site_key_decrypt \
- "$(cat "$tool"/etc/nginx/site.d/"$site"/
key_send
)" |
+ "$(cat "$tool"/etc/nginx/site.d/"$site"/
x509_host
)" |
rule ssh -l root ' \
sudo install -d -m 770 -o root -g root \
/etc/nginx \
rule ssh -l root ' \
sudo install -d -m 770 -o root -g root \
/etc/nginx \