1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/cockpit_ynh.git synced 2024-09-03 18:16:26 +02:00

Merge pull request #15 from YunoHost-Apps/testing

Fix cockpit path
This commit is contained in:
yalh76 2022-09-23 22:26:32 +02:00 committed by GitHub
commit 35cbc7617d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 5 deletions

View file

@ -10,5 +10,15 @@ location __PATH__/ {
proxy_set_header Connection "upgrade"; proxy_set_header Connection "upgrade";
# Include SSOWAT user panel. # Include SSOWAT user panel.
include conf.d/yunohost_panel.conf.inc; #include conf.d/yunohost_panel.conf.inc;
}
location /cockpit/ {
proxy_pass https://127.0.0.1:8104/cockpit/;
proxy_http_version 1.1;
proxy_buffering off;
proxy_set_header Host $host;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
} }

View file

@ -12,12 +12,13 @@
"license": "LGPL-2.1-only", "license": "LGPL-2.1-only",
"website": "https://cockpit-project.org/", "website": "https://cockpit-project.org/",
"admindoc": "https://cockpit-project.org/documentation.html", "admindoc": "https://cockpit-project.org/documentation.html",
"code": "https://github.com/cockpit-project/cockpit" "code": "https://github.com/cockpit-project/cockpit",
"cpe": "cpe:2.3:a:agentejo:cockpit"
}, },
"license": "LGPL-2.1-only", "license": "LGPL-2.1-only",
"maintainer": { "maintainer": {
"name": "liberodark", "name": "",
"email": "liberodark@gmail.com" "email": ""
}, },
"requirements": { "requirements": {
"yunohost": ">= 4.3.0" "yunohost": ">= 4.3.0"
@ -44,4 +45,4 @@
} }
] ]
} }
} }

View file

@ -114,6 +114,9 @@ ynh_script_progression --message="Updating a configuration file..." --weight=1
ynh_add_config --template="../conf/cockpit.conf" --destination="/etc/cockpit/cockpit.conf" ynh_add_config --template="../conf/cockpit.conf" --destination="/etc/cockpit/cockpit.conf"
chmod 440 "/etc/cockpit/cockpit.conf"
chown root:$app-ws "/etc/cockpit/cockpit.conf"
#================================================= #=================================================
# GENERIC FINALISATION # GENERIC FINALISATION
#================================================= #=================================================