[fix] cleanup

This commit is contained in:
alban 2020-09-24 15:45:34 +02:00
parent 3422f8b467
commit 67ed0cb9e0
3 changed files with 124 additions and 120 deletions

View File

@ -2,24 +2,21 @@
"variables":{
"user":"root",
"password":"laser",
"disk_size": "100000",
"disk_size":"5G",
"domain":""
},
"builders":[
{
"type":"lxc",
"name":"teamlaser-lj-lxc",
"config_file":"files/lxc/config",
"template_name":"debian",
"template_environment_vars": ["SUITE=buster"],
"template_environment_vars":[
"SUITE=buster"
],
"output_directory":"output-lxc"
},
{
"headless":false,
"name":"teamlaser-lj",
"type":"qemu",
@ -34,12 +31,13 @@
"ssh_username":"{{ user `user` }}",
"ssh_password":"{{ user `password` }}",
"shutdown_command":"echo '{{ user `password` }}' | sudo -S shutdown -h now",
"ssh_wait_timeout":"60m",
"qemuargs":[
[ "-m", "2048M" ]
[
"-m",
"2048M"
]
],
"boot_wait":"2s",
"boot_command":[
"<esc><wait><wait>",
@ -51,10 +49,7 @@
"<enter>"
]
},
{
"headless":false,
"name":"teamlaser-lj-xfce",
"type":"qemu",
@ -69,12 +64,13 @@
"ssh_username":"{{ user `user` }}",
"ssh_password":"{{ user `password` }}",
"shutdown_command":"echo '{{ user `password` }}' | sudo -S shutdown -h now",
"ssh_wait_timeout":"60m",
"qemuargs":[
[ "-m", "2048M" ]
[
"-m",
"2048M"
]
],
"boot_wait":"2s",
"boot_command":[
"<esc><wait><wait>",
@ -87,7 +83,6 @@
]
}
],
"provisioners":[
{
"type":"shell",
@ -95,6 +90,7 @@
"sleep 3",
"apt update",
"apt install -y --no-install-recommends cmake git libasound2-dev libjack-dev libsdl1.2-dev network-manager nginx portaudio19-dev python3-dev python3-pip python3-rtmidi redis-server screen ssh ssl-cert ",
"rm -f /etc/nginx/sites-enabled/default",
"pip3 install setuptools",
"pip3 install DMXEnttecPro mido numpy pysimpledmx redis scipy ",
"git clone https://github.com/ptone/pyosc --depth 1 /tmp/pyosc && cd /tmp/pyosc && ./setup.py install ",

View File

@ -1,12 +1,21 @@
server {
listen 443 ssl;
listen [::]:443 ssl;
ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem;
ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key;
listen 80;
listen [::]:80;
server_name _;
root /opt/LJ/www;
index index.html index.htm index.nginx-debian.html;
return 301 https://localhost$request_uri;
}
server {
listen 443 ssl;
listen [::]:443 ssl;
server_name _;
ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem;
ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key;
root /opt/LJ/www;
index index.html index.htm;
}

View File

@ -11,7 +11,6 @@ echo -e "\e[0m\n"
# Check the ip address on the machine
checkNetwork(){
echo -e "\Checking network connectivity..."
ping=$( ping 1.1.1.1 -c 1 -W 2 &>/dev/null; echo $?;)