From b3665620377a06f7b7a012e2ae7b69d222fae435 Mon Sep 17 00:00:00 2001 From: Robert Griebl Date: Fri, 29 Jul 2022 23:18:37 +0200 Subject: Port to python 3 and django 4.0.6 PLEASE NOTE: This project is not maintained anymore. It was ported to a Qt 6 cmake setup and a more modern Django and Python version to at least keep it usable for legacy projects. For non-production use-cases, please switch to the new appman-package-server available in the Qt Application Manager starting with version 6.7. Task-number: AUTOSUITE-1368 Change-Id: Idc4f2490a2a4399c03fce761250f4b5ac2612a45 Reviewed-by: Dominik Holland --- doc/src/deployment-server-http-server-setup.qdoc | 5 ++--- doc/src/deployment-server-installation.qdoc | 14 ++++++++++++-- doc/src/deployment-server-package-upload.qdoc | 6 +++--- doc/src/deployment-server-reference.qdoc | 4 ++-- doc/src/deployment-server.qdoc | 10 ++++++++-- 5 files changed, 27 insertions(+), 12 deletions(-) (limited to 'doc/src') diff --git a/doc/src/deployment-server-http-server-setup.qdoc b/doc/src/deployment-server-http-server-setup.qdoc index b21ee76..d31b72c 100644 --- a/doc/src/deployment-server-http-server-setup.qdoc +++ b/doc/src/deployment-server-http-server-setup.qdoc @@ -27,13 +27,12 @@ ****************************************************************************/ /*! - \page qtauto-deployment-server-http-server-setup.html + \ingroup qtauto-deployment-server + \page http-server-setup.html \previouspage Qt Automotive Suite Deployment Server API Reference \nextpage Upload Packages to the Deployment Server - \contentspage {Qt Automotive Suite Deployment Server} \startpage Qt Automotive Suite Deployment Server - \title Set up a Production server with Apache, Lighttpd or Nginx The Deployment Server can be set up in combination with a regular web server: Apache, Lighttpd, or diff --git a/doc/src/deployment-server-installation.qdoc b/doc/src/deployment-server-installation.qdoc index 7937992..06fb895 100644 --- a/doc/src/deployment-server-installation.qdoc +++ b/doc/src/deployment-server-installation.qdoc @@ -27,14 +27,24 @@ ****************************************************************************/ /*! - \page qtauto-deployment-server-installation.html - \contentspage {Qt Automotive Suite Deployment Server} + \ingroup qtauto-deployment-server + \page installation.html \previouspage Qt Automotive Suite Deployment Server \nextpage Qt Automotive Suite Deployment Server API Reference \startpage Qt Automotive Suite Deployment Server \title Qt Automotive Suite Deployment Server Installation + \section1 Set up the Server in a Docker Container + + The new recommended way to run this server is through the supplied \c Dockerfile and the + \c docker-manage.sh script, which can both be found in the modules root directory. + + Instead of messing with Django's project configuration, you can simply export your individual + settings as environment variables. Either directly in the \c Dockerfile when building the + container, or by copying and modifying the \c docker-manage.sh script. + + \section1 Set up the Server in a Virtual Environment Before you install the dependencies in the Python virtual environment, you need to install the diff --git a/doc/src/deployment-server-package-upload.qdoc b/doc/src/deployment-server-package-upload.qdoc index dc5b7b4..f2e09de 100644 --- a/doc/src/deployment-server-package-upload.qdoc +++ b/doc/src/deployment-server-package-upload.qdoc @@ -27,10 +27,10 @@ ****************************************************************************/ /*! - \page qtauto-deployment-server-package-upload.html + \ingroup qtauto-deployment-server + \page package-upload.html \previouspage Set up a Production server with Apache, Lighttpd or Nginx \nextpage Qt Automotive Suite Deployment Server - \contentspage {Qt Automotive Suite Deployment Server} \startpage Qt Automotive Suite Deployment Server @@ -43,7 +43,7 @@ server itself. \section1 Through Server Admin Page This was the first uploading method implemented. It uses django admin page, accessible by \c{/admin/} URL of -the Deployment Server. For Qt 5.14, the URL is \l{http://demoappsdeploy.qt.io:8514/admin/}. +the Deployment Server. To add application: \list diff --git a/doc/src/deployment-server-reference.qdoc b/doc/src/deployment-server-reference.qdoc index d4be3af..6036e67 100644 --- a/doc/src/deployment-server-reference.qdoc +++ b/doc/src/deployment-server-reference.qdoc @@ -27,10 +27,10 @@ ****************************************************************************/ /*! - \page qtauto-deployment-server-reference.html + \ingroup qtauto-deployment-server + \page reference.html \previouspage Qt Automotive Suite Deployment Server Installation \nextpage Set up a Production server with Apache, Lighttpd or Nginx - \contentspage {Qt Automotive Suite Deployment Server} \startpage Qt Automotive Suite Deployment Server \title Qt Automotive Suite Deployment Server API Reference diff --git a/doc/src/deployment-server.qdoc b/doc/src/deployment-server.qdoc index 50f2bee..9c6390c 100644 --- a/doc/src/deployment-server.qdoc +++ b/doc/src/deployment-server.qdoc @@ -27,13 +27,19 @@ ****************************************************************************/ /*! - \page qtauto-deployment-server-index.html - \contentspage {Qt Automotive Suite} + \ingroup qtauto-deployment-server + \page index.html \nextpage Qt Automotive Suite Deployment Server Installation \startpage Qt Automotive Suite Deployment Server \title Qt Automotive Suite Deployment Server + \note This project is not maintained anymore. It was ported to a Qt 6 cmake setup and a more + modern Django and Python version to at least keep it usable for legacy projects. + For non-production use-cases, please switch to the new + \l{Package-Server}{appman-package-server} + available in the \l{Qt Application Manager} starting with version 6.7. + The Qt Automotive Suite Deployment Server is a new component in the Qt Automotive Suite 5.12. Previously, it was known as the Neptune Appstore and used for demonstrations purposes. -- cgit v1.2.3