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
Correction : vm_{hosted,remote} : rule_{apache2,nginx}_configure : $site .
[lhc/ateliers.git]
/
vm_remote
diff --git
a/vm_remote
b/vm_remote
index
b7ce833
..
438f922
100755
(executable)
--- a/
vm_remote
+++ b/
vm_remote
@@
-103,29
+103,27
@@
rule_apache2_key_send () {
local -; set +f
for conf in "$tool"/etc/apache2/site.d/*/VirtualHost.conf
do conf=${conf#"$tool"/etc/apache2/site.d/}
local -; set +f
for conf in "$tool"/etc/apache2/site.d/*/VirtualHost.conf
do conf=${conf#"$tool"/etc/apache2/site.d/}
- local
user port service site
- IFS=. read -r
user port service site
<<-EOF
+ local
port domain
+ IFS=. read -r
port domain
<<-EOF
${conf%\/VirtualHost\.conf}
EOF
${conf%\/VirtualHost\.conf}
EOF
- assert 'test "${user:+set}"'
- assert 'test "${service:+set}"'
- assert 'test "${site:+set}"'
assert 'test "${port:+set}"'
assert 'test "${port:+set}"'
- local site_dir="$user.$port.$service.$site"
+ assert 'test "${domain:+set}"'
+ local site="$port.$domain"
case $port in
(443)
rule ssh -l root ' \
sudo install -d -m 770 -o '"$user"' -g '"$user"' \
/etc/apache2 \
case $port in
(443)
rule ssh -l root ' \
sudo install -d -m 770 -o '"$user"' -g '"$user"' \
/etc/apache2 \
- /etc/apache2/site.d/'"$site
_dir
"' \
- /etc/apache2/site.d/'"$site
_dir
"'/x509; \
+ /etc/apache2/site.d/'"$site"' \
+ /etc/apache2/site.d/'"$site"'/x509; \
sudo install -m 644 -o '"$user"' -g '"$user"' /dev/stdin \
sudo install -m 644 -o '"$user"' -g '"$user"' /dev/stdin \
- /etc/apache2/site.d/'"$site
_dir
"'/x509/.gitignore <<-EOF
+ /etc/apache2/site.d/'"$site"'/x509/.gitignore <<-EOF
key.pem
EOF
'
rule _x509_service_key_send_deciphered $service \
key.pem
EOF
'
rule _x509_service_key_send_deciphered $service \
-
~"$user"/etc/apache2/"$site_dir
"/x509/key.pem -l root "$@"
+
/etc/apache2/"$site
"/x509/key.pem -l root "$@"
;;
esac
done
;;
esac
done
@@
-159,30
+157,28
@@
rule_nginx_key_send () {
local -; set +f
for conf in "$tool"/etc/nginx/site.d/*/server.conf
do conf=${conf#"$tool"/etc/nginx/site.d/}
local -; set +f
for conf in "$tool"/etc/nginx/site.d/*/server.conf
do conf=${conf#"$tool"/etc/nginx/site.d/}
- local
user port service site
- IFS=. read -r
user port service site
<<-EOF
+ local
port domain
+ IFS=. read -r
port domain
<<-EOF
${conf%\/server\.conf}
EOF
${conf%\/server\.conf}
EOF
- assert 'test "${user:+set}"'
- assert 'test "${service:+set}"'
- assert 'test "${site:+set}"'
assert 'test "${port:+set}"'
assert 'test "${port:+set}"'
- local site_dir="$user.$port.$service.$site"
+ assert 'test "${domain:+set}"'
+ local site="$port.$domain"
case $port in
(443)
rule ssh -l root ' \
sudo install -d -m 770 -o root -g root \
/etc/nginx \
/etc/nginx/site.d \
case $port in
(443)
rule ssh -l root ' \
sudo install -d -m 770 -o root -g root \
/etc/nginx \
/etc/nginx/site.d \
- /etc/nginx/site.d/'"$site
_dir
"' \
- /etc/nginx/site.d/'"$site
_dir
"'/x509; \
+ /etc/nginx/site.d/'"$site"' \
+ /etc/nginx/site.d/'"$site"'/x509; \
sudo install -m 644 -o root -g root /dev/stdin \
sudo install -m 644 -o root -g root /dev/stdin \
- /etc/nginx/site.d/'"$site
_dir
"'/x509/.gitignore <<-EOF
+ /etc/nginx/site.d/'"$site"'/x509/.gitignore <<-EOF
key.pem
EOF
'
rule _x509_service_key_send_deciphered $service \
key.pem
EOF
'
rule _x509_service_key_send_deciphered $service \
- /etc/nginx/"$site
_dir
"/x509/key.pem -l root "$@"
+ /etc/nginx/"$site"/x509/key.pem -l root "$@"
;;
esac
done
;;
esac
done