skel now applies to the container root, SSL works
ci/woodpecker/push/woodpecker Pipeline failed Details

why
Johannes Bülow 2024-01-31 08:21:43 +01:00
parent c991ef7295
commit 25eff5ff74
Signed by untrusted user who does not match committer: jmb
GPG Key ID: B56971CF7B8F83A6
4 changed files with 6 additions and 6 deletions

2
Vagrantfile vendored
View File

@ -93,7 +93,7 @@ Vagrant.configure("2") do |config|
# OS # OS
apt-get update apt-get update
apt-get upgrade -y apt-get upgrade -y
apt-get install -y vim curl git wget qemu-guest-agent make-ssl-cert apt-get install -y vim curl git wget qemu-guest-agent ssl-cert
apt-get install -y nfs-common podman pwgen open-vm-tools make gcc libgpgme-dev apt-get install -y nfs-common podman pwgen open-vm-tools make gcc libgpgme-dev
apt-get install -y build-essential pkgconf pkgconf-bin libdevmapper-dev libbtrfs-dev apt-get install -y build-essential pkgconf pkgconf-bin libdevmapper-dev libbtrfs-dev
echo "export EDITOR=vim" >> /etc/profile echo "export EDITOR=vim" >> /etc/profile

View File

@ -14,8 +14,8 @@ image: lscr.io/linuxserver/webtop
maxage: 10800 maxage: 10800
# Port Podterminal should listen to # Port Podterminal should listen to
port: 80 port: 80
# Files that will be copied into container userhome on startup # Files that will be copied into container on startup
skel: /etc/podterminal/skel/ skel: /etc/podterminal/skel.tar.gz
ssl: false ssl: false
ssl_cert: /etc/ssl/certs/ssl-cert-snakeoil.pem ssl_cert: /etc/ssl/certs/ssl-cert-snakeoil.pem
ssl_cert_key: /etc/ssl/private/ssl-cert-snakeoil.key ssl_cert_key: /etc/ssl/private/ssl-cert-snakeoil.key

View File

@ -10,8 +10,7 @@ import (
"github.com/spf13/viper" "github.com/spf13/viper"
) )
// CopySkelToContainer copies an Archive into the containers home directory // CopySkelToContainer copies an Archive into the containers root
// (Assumes the use of a Webtop container)
func CopySkelToContainer(id string) error { func CopySkelToContainer(id string) error {
log.Println("Copying skel Archive to container") log.Println("Copying skel Archive to container")
var err error var err error
@ -31,7 +30,7 @@ func CopySkelToContainer(id string) error {
defer file.Close() defer file.Close()
params := url.Values{} params := url.Values{}
params.Set("path", "/config") params.Set("path", "/")
response, err := conn.DoRequest( response, err := conn.DoRequest(
Socket, Socket,

View File

@ -31,6 +31,7 @@ func Run() error {
} }
log.Println("Router is ready") log.Println("Router is ready")
if err != nil { if err != nil {
log.Panic("Could not start Webserver: ", err)
return err return err
} }
return nil return nil