diff --git a/.build/Jenkinsfile b/.build/Jenkinsfile index 092a3f5..5244ac1 100644 --- a/.build/Jenkinsfile +++ b/.build/Jenkinsfile @@ -173,7 +173,7 @@ pipeline { mkdir -p rpxy_${env.BUILD_VERSION}-1_amd64/usr/local/bin mkdir -p rpxy_${env.BUILD_VERSION}-1_amd64/etc/systemd/system mkdir -p rpxy_${env.BUILD_VERSION}-1_amd64/usr/share/doc/rpxy - mkdir -p rpxy_${env.BUILD_VERSION}-1_amd64/etc/rpxy + mkdir -p rpxy_${env.BUILD_VERSION}-1_amd64/etc/rpxy/acme_registry mkdir -p rpxy_${env.BUILD_VERSION}-1_amd64/DEBIAN """ diff --git a/.build/config.toml b/.build/config.toml index 5b60c51..8a453ae 100644 --- a/.build/config.toml +++ b/.build/config.toml @@ -36,8 +36,10 @@ listen_ipv6 = false ###################################################################### ## Registering a backend app served by a domain name "localhost" -#[apps.localhost] -#server_name = 'localhost' # Domain name +[apps.localhost] +server_name = 'localhost' # Domain name + +reverse_proxy = [{ upstream = [{ location = 'localhost:8080' }] }] # Optional: TLS setting. if https_port is specified and tls is true above, either of this must be given. #tls = { https_redirection = true, tls_cert_path = '/certs/server.crt', tls_cert_key_path = '/certs/server.key' } diff --git a/.build/rpxy-start.sh b/.build/rpxy-start.sh index ba06ef7..199e5c6 100644 --- a/.build/rpxy-start.sh +++ b/.build/rpxy-start.sh @@ -11,7 +11,7 @@ fi # Check if rpxy-webui is installed if dpkg-query -W -f='${Status}' rpxy-webui 2>/dev/null | grep -q "install ok installed"; then echo "rpxy-webui is installed. Starting rpxy with rpxy-webui" - exec /usr/local/bin/rpxy -w -c /var/www/rpxy-webui/storage/app/config.toml + exec /usr/bin/rpxy -w -c /var/www/rpxy-webui/storage/app/config.toml else echo "rpxy-webui is not installed. Starting with default config" @@ -25,5 +25,5 @@ else echo "# Default rpxy config file" > /etc/rpxy/config.toml fi - exec /usr/local/bin/rpxy -c /etc/rpxy/config.toml + exec /usr/bin/rpxy -c /etc/rpxy/config.toml fi