From 08fb65180cfd9d38ae742f5945ff19a124564b75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Tue, 7 May 2024 20:15:16 +0200 Subject: [PATCH 01/30] Update service files --- playwright/package/_service | 5 +++-- products.d/_service | 20 ++++++++++++++++++++ web/package/_service | 4 ++-- 3 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 products.d/_service diff --git a/playwright/package/_service b/playwright/package/_service index c25ae2dd0b..7eee12adec 100644 --- a/playwright/package/_service +++ b/playwright/package/_service @@ -1,9 +1,10 @@ - @PARENT_TAG@~@TAG_OFFSET@ + @PARENT_TAG@+@TAG_OFFSET@ + v(.*) https://github.com/openSUSE/agama.git git - agama + master playwright enable package/cockpit-agama-playwright.changes diff --git a/products.d/_service b/products.d/_service new file mode 100644 index 0000000000..fa490c0896 --- /dev/null +++ b/products.d/_service @@ -0,0 +1,20 @@ + + + https://github.com/openSUSE/agama.git + @PARENT_TAG@+@TAG_OFFSET@ + v(.*) + git + master + products.d + enable + agama-products-opensuse.changes + agama-products-opensuse.spec + + + agama.obsinfo + agama + + + agama + + diff --git a/web/package/_service b/web/package/_service index b6815b5ab4..6d9bafb227 100644 --- a/web/package/_service +++ b/web/package/_service @@ -8,8 +8,8 @@ web enable package-lock.json - package/agama-web-ui.changes - package/agama-web-ui.spec + package/cockpit-agama.changes + package/cockpit-agama.spec node_modules.obscpio From 07d34f69b9cdc4c2a299ccf3dbc6d957eb69f3c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Tue, 7 May 2024 20:19:52 +0200 Subject: [PATCH 02/30] Make OBS project configurable --- .github/workflows/obs-staging-live.yml | 6 +++--- live/Makefile | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/obs-staging-live.yml b/.github/workflows/obs-staging-live.yml index 1005bf59e3..e2ac72276a 100644 --- a/.github/workflows/obs-staging-live.yml +++ b/.github/workflows/obs-staging-live.yml @@ -11,8 +11,8 @@ on: jobs: update_staging_package: - # do not run in forks - if: github.repository_owner == 'openSUSE' + # do not run in forks which do not set the OBS_PROJECT variable + if: vars.OBS_PROJECT != '' runs-on: ubuntu-latest @@ -38,7 +38,7 @@ jobs: OBS_PASSWORD: ${{ secrets.OBS_PASSWORD }} - name: Checkout agama-live - run: osc co -o dist systemsmanagement:Agama:Staging agama-live + run: osc co -o dist ${{ vars.OBS_PROJECT }} agama-live working-directory: ./live - name: Build sources diff --git a/live/Makefile b/live/Makefile index 5a263b9e36..3ab01fb4c2 100644 --- a/live/Makefile +++ b/live/Makefile @@ -11,6 +11,10 @@ DESTDIR = ./dist # to build a different flavor run "make build FLAVOR=" FLAVOR = openSUSE +# the default OBS project, +# to use a different project run "make build OBS_PROJECT=" +OBS_PROJECT = "systemsmanagement:Agama:Staging" + # files to copy from src/ COPY_FILES = $(patsubst $(SRCDIR)/%,$(DESTDIR)/%,$(wildcard $(SRCDIR)/*)) @@ -48,7 +52,7 @@ $(DESTDIR)/%.tar.xz: % $$(shell find % -type f,l) # build the ISO locally build: $(DESTDIR) - if [ ! -e $(DESTDIR)/.osc ]; then make clean; osc co -o $(DESTDIR) systemsmanagement:Agama:Staging agama-live; fi + if [ ! -e $(DESTDIR)/.osc ]; then make clean; osc co -o $(DESTDIR) $(OBS_PROJECT) agama-live; fi $(MAKE) all (cd $(DESTDIR) && osc build -M $(FLAVOR) images) From b40615377e860e715c7505305518f188cdb998d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Tue, 7 May 2024 20:39:00 +0200 Subject: [PATCH 03/30] Make OBS project configurable --- .github/workflows/obs-service-shared.yml | 4 ++-- .github/workflows/obs-staging-live.yml | 4 ++-- .github/workflows/obs-staging-playwright.yml | 2 +- .github/workflows/obs-staging-products.yml | 2 +- .github/workflows/obs-staging-rust.yml | 2 +- .github/workflows/obs-staging-service.yml | 2 +- .github/workflows/obs-staging-shared.yml | 8 ++++---- .github/workflows/obs-staging-web.yml | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/obs-service-shared.yml b/.github/workflows/obs-service-shared.yml index a7f4871fd0..fd97a2f193 100644 --- a/.github/workflows/obs-service-shared.yml +++ b/.github/workflows/obs-service-shared.yml @@ -18,8 +18,8 @@ on: jobs: update_service: - # do not run in forks - if: github.repository == 'openSUSE/agama' + # do not run in forks which do not set the OBS_PROJECT variable + if: vars.OBS_PROJECT != '' runs-on: ubuntu-latest diff --git a/.github/workflows/obs-staging-live.yml b/.github/workflows/obs-staging-live.yml index e2ac72276a..e32c65ea37 100644 --- a/.github/workflows/obs-staging-live.yml +++ b/.github/workflows/obs-staging-live.yml @@ -37,7 +37,7 @@ jobs: OBS_USER: ${{ secrets.OBS_USER }} OBS_PASSWORD: ${{ secrets.OBS_PASSWORD }} - - name: Checkout agama-live + - name: Checkout ${{ vars.OBS_PROJECT }} agama-live run: osc co -o dist ${{ vars.OBS_PROJECT }} agama-live working-directory: ./live @@ -53,6 +53,6 @@ jobs: run: osc diff && osc status working-directory: ./live/dist - - name: Commit agama-live + - name: Commit agama-live to ${{ vars.OBS_PROJECT }} run: osc commit -m "Updated to Agama $GITHUB_SHA" working-directory: ./live/dist diff --git a/.github/workflows/obs-staging-playwright.yml b/.github/workflows/obs-staging-playwright.yml index 3c9d58bc87..eaee03ab4f 100644 --- a/.github/workflows/obs-staging-playwright.yml +++ b/.github/workflows/obs-staging-playwright.yml @@ -15,5 +15,5 @@ jobs: # pass all secrets secrets: inherit with: - project_name: systemsmanagement:Agama:Staging + project_name: ${{ vars.OBS_PROJECT }} package_name: cockpit-agama-playwright diff --git a/.github/workflows/obs-staging-products.yml b/.github/workflows/obs-staging-products.yml index d67b067714..68e5398d38 100644 --- a/.github/workflows/obs-staging-products.yml +++ b/.github/workflows/obs-staging-products.yml @@ -15,5 +15,5 @@ jobs: # pass all secrets secrets: inherit with: - project_name: systemsmanagement:Agama:Staging + project_name: ${{ vars.OBS_PROJECT }} package_name: agama-products-opensuse diff --git a/.github/workflows/obs-staging-rust.yml b/.github/workflows/obs-staging-rust.yml index 0e804b3c2f..65955bff8e 100644 --- a/.github/workflows/obs-staging-rust.yml +++ b/.github/workflows/obs-staging-rust.yml @@ -16,5 +16,5 @@ jobs: secrets: inherit with: install_packages: obs-service-cargo_audit obs-service-cargo_vendor - project_name: systemsmanagement:Agama:Staging + project_name: ${{ vars.OBS_PROJECT }} package_name: agama diff --git a/.github/workflows/obs-staging-service.yml b/.github/workflows/obs-staging-service.yml index 342f2e38f0..65566a5a89 100644 --- a/.github/workflows/obs-staging-service.yml +++ b/.github/workflows/obs-staging-service.yml @@ -16,4 +16,4 @@ jobs: # pass all secrets secrets: inherit with: - project_name: systemsmanagement:Agama:Staging + project_name: ${{ vars.OBS_PROJECT }} diff --git a/.github/workflows/obs-staging-shared.yml b/.github/workflows/obs-staging-shared.yml index 55eae4315e..3e94e96899 100644 --- a/.github/workflows/obs-staging-shared.yml +++ b/.github/workflows/obs-staging-shared.yml @@ -28,8 +28,8 @@ on: jobs: update_staging_package: - # do not run in forks - if: github.repository == 'openSUSE/agama' + # do not run in forks which do not set the OBS_PROJECT variable + if: vars.OBS_PROJECT != '' runs-on: ubuntu-latest @@ -59,7 +59,7 @@ jobs: OBS_USER: ${{ secrets.OBS_USER }} OBS_PASSWORD: ${{ secrets.OBS_PASSWORD }} - - name: Checkout ${{ inputs.package_name }} + - name: Checkout ${{ inputs.project_name }} ${{ inputs.package_name }} run: osc co ${{ inputs.project_name }} ${{ inputs.package_name }} - name: Update service revision @@ -78,7 +78,7 @@ jobs: run: osc diff && osc status working-directory: ./${{ inputs.project_name }}/${{ inputs.package_name }} - - name: Commit ${{ inputs.package_name }} + - name: Commit ${{ inputs.package_name }} to ${{ inputs.project_name }} run: |- osc commit -m "Updated to $(sed -e '/^version:/!d' -e 's/version: *\(.*\)/\1/' agama.obsinfo) ($(sed -e '/^commit:/!d' -e 's/commit: *\(.*\)/\1/' agama.obsinfo))" working-directory: ./${{ inputs.project_name }}/${{ inputs.package_name }} diff --git a/.github/workflows/obs-staging-web.yml b/.github/workflows/obs-staging-web.yml index fa2a9731f8..0453177191 100644 --- a/.github/workflows/obs-staging-web.yml +++ b/.github/workflows/obs-staging-web.yml @@ -16,5 +16,5 @@ jobs: secrets: inherit with: install_packages: obs-service-node_modules - project_name: systemsmanagement:Agama:Staging + project_name: ${{ vars.OBS_PROJECT }} package_name: cockpit-agama From b95bab4cd1fd8b47ecb2f48a0b7007b59409606a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Tue, 7 May 2024 20:46:06 +0200 Subject: [PATCH 04/30] OBS project configuration --- .github/workflows/obs-service-shared.yml | 6 +++--- .github/workflows/obs-staging-playwright.yml | 1 - .github/workflows/obs-staging-products.yml | 1 - .github/workflows/obs-staging-rust.yml | 1 - .github/workflows/obs-staging-service.yml | 2 -- .github/workflows/obs-staging-shared.yml | 21 ++++++++------------ .github/workflows/obs-staging-web.yml | 1 - 7 files changed, 11 insertions(+), 22 deletions(-) diff --git a/.github/workflows/obs-service-shared.yml b/.github/workflows/obs-service-shared.yml index fd97a2f193..7cebaf623f 100644 --- a/.github/workflows/obs-service-shared.yml +++ b/.github/workflows/obs-service-shared.yml @@ -62,14 +62,14 @@ jobs: OBS_USER: ${{ secrets.OBS_USER }} OBS_PASSWORD: ${{ secrets.OBS_PASSWORD }} - - name: Commit the rubygem-agama-yast package to ${{ inputs.project_name }} + - name: Commit the rubygem-agama-yast package to ${{ vars.OBS_PROJECT }} run: rake osc:commit working-directory: ./service env: # do not build the package with "osc", it takes long time # and does not provide much value SKIP_OSC_BUILD: 1 - OBS_PROJECT: ${{ inputs.project_name }} + OBS_PROJECT: ${{ vars.OBS_PROJECT }} - name: Submit the rubygem-agama-yast package # only when a tag has been pushed @@ -78,4 +78,4 @@ jobs: run: rake osc:sr:force working-directory: ./service env: - OBS_PROJECT: ${{ inputs.project_name }} + OBS_PROJECT: ${{ vars.OBS_PROJECT }} diff --git a/.github/workflows/obs-staging-playwright.yml b/.github/workflows/obs-staging-playwright.yml index eaee03ab4f..3f57c4838b 100644 --- a/.github/workflows/obs-staging-playwright.yml +++ b/.github/workflows/obs-staging-playwright.yml @@ -15,5 +15,4 @@ jobs: # pass all secrets secrets: inherit with: - project_name: ${{ vars.OBS_PROJECT }} package_name: cockpit-agama-playwright diff --git a/.github/workflows/obs-staging-products.yml b/.github/workflows/obs-staging-products.yml index 68e5398d38..62be838b14 100644 --- a/.github/workflows/obs-staging-products.yml +++ b/.github/workflows/obs-staging-products.yml @@ -15,5 +15,4 @@ jobs: # pass all secrets secrets: inherit with: - project_name: ${{ vars.OBS_PROJECT }} package_name: agama-products-opensuse diff --git a/.github/workflows/obs-staging-rust.yml b/.github/workflows/obs-staging-rust.yml index 65955bff8e..f3c11fcb37 100644 --- a/.github/workflows/obs-staging-rust.yml +++ b/.github/workflows/obs-staging-rust.yml @@ -16,5 +16,4 @@ jobs: secrets: inherit with: install_packages: obs-service-cargo_audit obs-service-cargo_vendor - project_name: ${{ vars.OBS_PROJECT }} package_name: agama diff --git a/.github/workflows/obs-staging-service.yml b/.github/workflows/obs-staging-service.yml index 65566a5a89..8077ce892b 100644 --- a/.github/workflows/obs-staging-service.yml +++ b/.github/workflows/obs-staging-service.yml @@ -15,5 +15,3 @@ jobs: uses: ./.github/workflows/obs-service-shared.yml # pass all secrets secrets: inherit - with: - project_name: ${{ vars.OBS_PROJECT }} diff --git a/.github/workflows/obs-staging-shared.yml b/.github/workflows/obs-staging-shared.yml index 3e94e96899..4b4953697d 100644 --- a/.github/workflows/obs-staging-shared.yml +++ b/.github/workflows/obs-staging-shared.yml @@ -21,11 +21,6 @@ on: required: true type: string - project_name: - description: OBS project name - required: true - type: string - jobs: update_staging_package: # do not run in forks which do not set the OBS_PROJECT variable @@ -59,8 +54,8 @@ jobs: OBS_USER: ${{ secrets.OBS_USER }} OBS_PASSWORD: ${{ secrets.OBS_PASSWORD }} - - name: Checkout ${{ inputs.project_name }} ${{ inputs.package_name }} - run: osc co ${{ inputs.project_name }} ${{ inputs.package_name }} + - name: Checkout ${{ vars.OBS_PROJECT }} ${{ inputs.package_name }} + run: osc co ${{ vars.OBS_PROJECT }} ${{ inputs.package_name }} - name: Update service revision # only when a tag has been pushed @@ -68,23 +63,23 @@ jobs: run: |- echo "Updating revision to ${{ github.ref_name }}" sed -i -e 's#.*#${{ github.ref_name }}#' _service - working-directory: ./${{ inputs.project_name }}/${{ inputs.package_name }} + working-directory: ./${{ vars.OBS_PROJECT }}/${{ inputs.package_name }} - name: Run services run: osc service manualrun - working-directory: ./${{ inputs.project_name }}/${{ inputs.package_name }} + working-directory: ./${{ vars.OBS_PROJECT }}/${{ inputs.package_name }} - name: Check status run: osc diff && osc status - working-directory: ./${{ inputs.project_name }}/${{ inputs.package_name }} + working-directory: ./${{ vars.OBS_PROJECT }}/${{ inputs.package_name }} - - name: Commit ${{ inputs.package_name }} to ${{ inputs.project_name }} + - name: Commit ${{ inputs.package_name }} to ${{ vars.OBS_PROJECT }} run: |- osc commit -m "Updated to $(sed -e '/^version:/!d' -e 's/version: *\(.*\)/\1/' agama.obsinfo) ($(sed -e '/^commit:/!d' -e 's/commit: *\(.*\)/\1/' agama.obsinfo))" - working-directory: ./${{ inputs.project_name }}/${{ inputs.package_name }} + working-directory: ./${{ vars.OBS_PROJECT }}/${{ inputs.package_name }} - name: Submit the package # only when a tag has been pushed if: ${{ github.ref_type == 'tag' }} run: osc sr --yes -m "Releasing version ${{ github.ref_name }}" - working-directory: ./${{ inputs.project_name }}/${{ inputs.package_name }} + working-directory: ./${{ vars.OBS_PROJECT }}/${{ inputs.package_name }} diff --git a/.github/workflows/obs-staging-web.yml b/.github/workflows/obs-staging-web.yml index 0453177191..5a2eb0f662 100644 --- a/.github/workflows/obs-staging-web.yml +++ b/.github/workflows/obs-staging-web.yml @@ -16,5 +16,4 @@ jobs: secrets: inherit with: install_packages: obs-service-node_modules - project_name: ${{ vars.OBS_PROJECT }} package_name: cockpit-agama From 2898735e22f006b4ae50e9748afaa0c4d265fafd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Wed, 8 May 2024 14:00:55 +0200 Subject: [PATCH 05/30] Update _service in OBS from Git --- .github/workflows/obs-staging-products.yml | 1 + .github/workflows/obs-staging-rust.yml | 1 + .github/workflows/obs-staging-shared.yml | 9 +++++++++ .github/workflows/obs-staging-web.yml | 1 + 4 files changed, 12 insertions(+) diff --git a/.github/workflows/obs-staging-products.yml b/.github/workflows/obs-staging-products.yml index 62be838b14..15f6a5091e 100644 --- a/.github/workflows/obs-staging-products.yml +++ b/.github/workflows/obs-staging-products.yml @@ -16,3 +16,4 @@ jobs: secrets: inherit with: package_name: agama-products-opensuse + service_file: products.d/_service diff --git a/.github/workflows/obs-staging-rust.yml b/.github/workflows/obs-staging-rust.yml index f3c11fcb37..47cc271a8d 100644 --- a/.github/workflows/obs-staging-rust.yml +++ b/.github/workflows/obs-staging-rust.yml @@ -17,3 +17,4 @@ jobs: with: install_packages: obs-service-cargo_audit obs-service-cargo_vendor package_name: agama + service_file: rust/package/_service diff --git a/.github/workflows/obs-staging-shared.yml b/.github/workflows/obs-staging-shared.yml index 4b4953697d..3d5ea57c28 100644 --- a/.github/workflows/obs-staging-shared.yml +++ b/.github/workflows/obs-staging-shared.yml @@ -21,6 +21,11 @@ on: required: true type: string + service_file: + description: Optional service file to copy from the sources + required: false + type: string + jobs: update_staging_package: # do not run in forks which do not set the OBS_PROJECT variable @@ -65,6 +70,10 @@ jobs: sed -i -e 's#.*#${{ github.ref_name }}#' _service working-directory: ./${{ vars.OBS_PROJECT }}/${{ inputs.package_name }} + - name: Copy optional service file + if: inputs.service_file != '' + run: cp -f ${{ inputs.service_file }} ./${{ vars.OBS_PROJECT }}/${{ inputs.package_name }} + - name: Run services run: osc service manualrun working-directory: ./${{ vars.OBS_PROJECT }}/${{ inputs.package_name }} diff --git a/.github/workflows/obs-staging-web.yml b/.github/workflows/obs-staging-web.yml index 5a2eb0f662..a30f9d5f7c 100644 --- a/.github/workflows/obs-staging-web.yml +++ b/.github/workflows/obs-staging-web.yml @@ -17,3 +17,4 @@ jobs: with: install_packages: obs-service-node_modules package_name: cockpit-agama + service_file: web/package/_service From 5a48298bf7d98168a15fe337662a56760023f23c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Thu, 9 May 2024 09:30:16 +0200 Subject: [PATCH 06/30] Enable the web server service --- live/config.sh | 1 + live/root/etc/systemd/system/agama-auto.service | 2 +- rust/share/agama-web-server.service | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/live/config.sh b/live/config.sh index 422643bb8b..83948f7138 100644 --- a/live/config.sh +++ b/live/config.sh @@ -17,6 +17,7 @@ systemctl enable sshd.service systemctl enable NetworkManager.service systemctl enable avahi-daemon.service systemctl enable agama.service +systemctl enable agama-web-server.service systemctl enable agama-auto.service systemctl enable agama-hostname.service systemctl enable agama-proxy-setup.service diff --git a/live/root/etc/systemd/system/agama-auto.service b/live/root/etc/systemd/system/agama-auto.service index 08be3630ee..5fba1c89e5 100644 --- a/live/root/etc/systemd/system/agama-auto.service +++ b/live/root/etc/systemd/system/agama-auto.service @@ -4,7 +4,7 @@ Description=Agama automatic profile runner After=dbus.socket # it needs to NetworkManager, so it has access to it After=NetworkManager.service -# it needs dinstaller, of course +# it needs Agama, of course After=agama.service Requires=agama.service diff --git a/rust/share/agama-web-server.service b/rust/share/agama-web-server.service index 8c701d8675..89d7ca62df 100644 --- a/rust/share/agama-web-server.service +++ b/rust/share/agama-web-server.service @@ -1,6 +1,6 @@ [Unit] Description=Agama Web Server -After=network-online.target agama.service +After=network-online.target agama.service agama-hostname.service [Service] Type=simple From 70a15bf785d53e730e34379d5a265dff817b65c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Thu, 9 May 2024 09:33:22 +0200 Subject: [PATCH 07/30] Install git --- .github/workflows/obs-staging-live.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/obs-staging-live.yml b/.github/workflows/obs-staging-live.yml index e32c65ea37..d33badc77f 100644 --- a/.github/workflows/obs-staging-live.yml +++ b/.github/workflows/obs-staging-live.yml @@ -29,7 +29,7 @@ jobs: - name: Install tools run: zypper --non-interactive install --no-recommends - make osc + git make osc - name: Configure osc run: .github/workflows/configure_osc.sh From 14718c4951612462ffc0ce5547e9d11839b6d3b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Thu, 9 May 2024 09:43:26 +0200 Subject: [PATCH 08/30] Allow running the autosubmission jobs manually --- .github/workflows/obs-staging-live.yml | 3 +++ .github/workflows/obs-staging-playwright.yml | 4 ++++ .github/workflows/obs-staging-products.yml | 3 +++ .github/workflows/obs-staging-rust.yml | 2 ++ .github/workflows/obs-staging-service.yml | 3 +++ .github/workflows/obs-staging-web.yml | 3 +++ 6 files changed, 18 insertions(+) diff --git a/.github/workflows/obs-staging-live.yml b/.github/workflows/obs-staging-live.yml index d33badc77f..8fb4ce29dc 100644 --- a/.github/workflows/obs-staging-live.yml +++ b/.github/workflows/obs-staging-live.yml @@ -9,6 +9,9 @@ on: # run only when a live ISO source is changed - live/** + # allow running manually + workflow_dispatch: + jobs: update_staging_package: # do not run in forks which do not set the OBS_PROJECT variable diff --git a/.github/workflows/obs-staging-playwright.yml b/.github/workflows/obs-staging-playwright.yml index 3f57c4838b..850c363de1 100644 --- a/.github/workflows/obs-staging-playwright.yml +++ b/.github/workflows/obs-staging-playwright.yml @@ -9,6 +9,9 @@ on: # run only when a Playwright source is changed - playwright/** + # allow running manually + workflow_dispatch: + jobs: update_staging: uses: ./.github/workflows/obs-staging-shared.yml @@ -16,3 +19,4 @@ jobs: secrets: inherit with: package_name: cockpit-agama-playwright + service_file: playwright/package/_service diff --git a/.github/workflows/obs-staging-products.yml b/.github/workflows/obs-staging-products.yml index 15f6a5091e..f7bed76802 100644 --- a/.github/workflows/obs-staging-products.yml +++ b/.github/workflows/obs-staging-products.yml @@ -9,6 +9,9 @@ on: # run only when a Rust source is changed - products.d/** + # allow running manually + workflow_dispatch: + jobs: update_staging: uses: ./.github/workflows/obs-staging-shared.yml diff --git a/.github/workflows/obs-staging-rust.yml b/.github/workflows/obs-staging-rust.yml index 47cc271a8d..6480fe441b 100644 --- a/.github/workflows/obs-staging-rust.yml +++ b/.github/workflows/obs-staging-rust.yml @@ -8,6 +8,8 @@ on: paths: # run only when a Rust source is changed - rust/** + # allow running manually + workflow_dispatch: jobs: update_staging: diff --git a/.github/workflows/obs-staging-service.yml b/.github/workflows/obs-staging-service.yml index 8077ce892b..c9d7cc7c08 100644 --- a/.github/workflows/obs-staging-service.yml +++ b/.github/workflows/obs-staging-service.yml @@ -10,6 +10,9 @@ on: - service/** - Rakefile + # allow running manually + workflow_dispatch: + jobs: update_service: uses: ./.github/workflows/obs-service-shared.yml diff --git a/.github/workflows/obs-staging-web.yml b/.github/workflows/obs-staging-web.yml index a30f9d5f7c..5b7a01945e 100644 --- a/.github/workflows/obs-staging-web.yml +++ b/.github/workflows/obs-staging-web.yml @@ -9,6 +9,9 @@ on: # run only when a web frontend source is changed - web/** + # allow running manually + workflow_dispatch: + jobs: update_staging: uses: ./.github/workflows/obs-staging-shared.yml From 7fff7cfc453e81f19bbfac211008494e57c9cc28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Thu, 9 May 2024 10:13:49 +0200 Subject: [PATCH 09/30] Update actions/checkout to v4 --- .github/workflows/ci-doc-check.yml | 2 +- .github/workflows/ci-integration-tests.yml | 2 +- .github/workflows/ci-rubocop.yml | 2 +- .github/workflows/ci-rust.yml | 2 +- .github/workflows/ci-service.yml | 2 +- .github/workflows/ci-web.yml | 2 +- .github/workflows/github-pages.yml | 2 +- .github/workflows/obs-service-shared.yml | 4 ++-- .github/workflows/obs-staging-shared.yml | 2 +- .github/workflows/weblate-merge-po.yml | 4 ++-- .github/workflows/weblate-merge-products-po.yml | 4 ++-- .github/workflows/weblate-merge-service-po.yml | 4 ++-- .github/workflows/weblate-update-pot.yml | 4 ++-- 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci-doc-check.yml b/.github/workflows/ci-doc-check.yml index 9531228a1e..759f8a1c33 100644 --- a/.github/workflows/ci-doc-check.yml +++ b/.github/workflows/ci-doc-check.yml @@ -39,7 +39,7 @@ jobs: steps: - name: Git Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Fix the file owner # fix the file owner diff --git a/.github/workflows/ci-integration-tests.yml b/.github/workflows/ci-integration-tests.yml index ec1dff1975..81b01ad142 100644 --- a/.github/workflows/ci-integration-tests.yml +++ b/.github/workflows/ci-integration-tests.yml @@ -21,7 +21,7 @@ jobs: # TODO: Cache the Ruby gems and node packages - name: Git Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: # fetch complete history with tags, agama.gemspec calls "git describe --tags" # that would fail with just last commit checked out diff --git a/.github/workflows/ci-rubocop.yml b/.github/workflows/ci-rubocop.yml index 067ee6b367..55aa0bf125 100644 --- a/.github/workflows/ci-rubocop.yml +++ b/.github/workflows/ci-rubocop.yml @@ -48,7 +48,7 @@ jobs: steps: - name: Git Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Rubocop run: /usr/bin/rubocop.*-1.24.1 diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml index ffc9857543..d6802c9c13 100644 --- a/.github/workflows/ci-rust.yml +++ b/.github/workflows/ci-rust.yml @@ -58,7 +58,7 @@ jobs: steps: - name: Git Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Configure and refresh repositories # disable unused repositories to have faster refresh diff --git a/.github/workflows/ci-service.yml b/.github/workflows/ci-service.yml index c7dced78cc..17061a1cc0 100644 --- a/.github/workflows/ci-service.yml +++ b/.github/workflows/ci-service.yml @@ -57,7 +57,7 @@ jobs: steps: - name: Git Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Configure and refresh repositories # disable unused repositories to have faster refresh diff --git a/.github/workflows/ci-web.yml b/.github/workflows/ci-web.yml index 4878e021f3..223f2050be 100644 --- a/.github/workflows/ci-web.yml +++ b/.github/workflows/ci-web.yml @@ -46,7 +46,7 @@ jobs: # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v3 diff --git a/.github/workflows/github-pages.yml b/.github/workflows/github-pages.yml index aa341b39a6..69794c4444 100644 --- a/.github/workflows/github-pages.yml +++ b/.github/workflows/github-pages.yml @@ -31,7 +31,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install DocBook tooling run: | diff --git a/.github/workflows/obs-service-shared.yml b/.github/workflows/obs-service-shared.yml index 7cebaf623f..ef3629f05b 100644 --- a/.github/workflows/obs-service-shared.yml +++ b/.github/workflows/obs-service-shared.yml @@ -43,14 +43,14 @@ jobs: - name: Git Checkout (full history) if: ${{ github.ref_type != 'tag' }} - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: # fetch all history, we need to find the latest tag and offset for the version number fetch-depth: 0 - name: Git Checkout (release tag only) if: ${{ github.ref_type == 'tag' }} - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Fix file owner # workaround for a strict git check diff --git a/.github/workflows/obs-staging-shared.yml b/.github/workflows/obs-staging-shared.yml index 3d5ea57c28..10afd27c63 100644 --- a/.github/workflows/obs-staging-shared.yml +++ b/.github/workflows/obs-staging-shared.yml @@ -38,7 +38,7 @@ jobs: steps: - name: Git Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Configure and refresh repositories # disable unused repositories to have a faster refresh diff --git a/.github/workflows/weblate-merge-po.yml b/.github/workflows/weblate-merge-po.yml index 6c0d46ad29..1f5a0f85cb 100644 --- a/.github/workflows/weblate-merge-po.yml +++ b/.github/workflows/weblate-merge-po.yml @@ -43,12 +43,12 @@ jobs: git config --global user.email "yast-devel@opensuse.org" - name: Checkout sources - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: agama - name: Checkout Agama-weblate sources - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: agama-weblate repository: openSUSE/agama-weblate diff --git a/.github/workflows/weblate-merge-products-po.yml b/.github/workflows/weblate-merge-products-po.yml index 2f08620718..cbf706b36c 100644 --- a/.github/workflows/weblate-merge-products-po.yml +++ b/.github/workflows/weblate-merge-products-po.yml @@ -43,12 +43,12 @@ jobs: git config --global user.email "yast-devel@opensuse.org" - name: Checkout sources - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: agama - name: Checkout Agama-weblate sources - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: agama-weblate repository: openSUSE/agama-weblate diff --git a/.github/workflows/weblate-merge-service-po.yml b/.github/workflows/weblate-merge-service-po.yml index 615b3f5bd1..9639476090 100644 --- a/.github/workflows/weblate-merge-service-po.yml +++ b/.github/workflows/weblate-merge-service-po.yml @@ -43,12 +43,12 @@ jobs: git config --global user.email "yast-devel@opensuse.org" - name: Checkout sources - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: agama - name: Checkout Agama-weblate sources - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: agama-weblate repository: openSUSE/agama-weblate diff --git a/.github/workflows/weblate-update-pot.yml b/.github/workflows/weblate-update-pot.yml index d9ce376442..ec7dac0486 100644 --- a/.github/workflows/weblate-update-pot.yml +++ b/.github/workflows/weblate-update-pot.yml @@ -32,7 +32,7 @@ jobs: zypper --non-interactive install --no-recommends diffutils git gettext-tools npm-default "rubygem(ruby:$RUBY_VERSION:yast-rake)" "rubygem(ruby:$RUBY_VERSION:gettext)" yast2-devtools - name: Checkout Agama sources - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: agama @@ -46,7 +46,7 @@ jobs: run: msgfmt --check-format agama/web/agama.pot - name: Checkout Weblate sources - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: agama-weblate repository: openSUSE/agama-weblate From b916cac6e9e3ae19c3f7895d20e5f8bc8dff94e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Thu, 9 May 2024 10:28:42 +0200 Subject: [PATCH 10/30] Delete unused files --- live/agama-live.kiwi | 142 ------------------------------------------- live/config.sh | 134 ---------------------------------------- live/src/config.sh | 1 + 3 files changed, 1 insertion(+), 276 deletions(-) delete mode 100644 live/agama-live.kiwi delete mode 100644 live/config.sh diff --git a/live/agama-live.kiwi b/live/agama-live.kiwi deleted file mode 100644 index 3e4df52e3a..0000000000 --- a/live/agama-live.kiwi +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - - YaST Team - yast2-maintainers@suse.de - Agama Live ISO - - - - - - - 7.0.0 - zypper - en_US - us - Europe/Berlin - true - false - bgrt - openSUSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/live/config.sh b/live/config.sh deleted file mode 100644 index 83948f7138..0000000000 --- a/live/config.sh +++ /dev/null @@ -1,134 +0,0 @@ -#! /bin/bash - -set -x - -# KIWI functions -test -f /.kconfig && . /.kconfig -test -f /.profile && . /.profile - -# greeting -echo "Configure image: [$kiwi_iname]..." - -# setup baseproduct link -suseSetupProduct - -# activate services -systemctl enable sshd.service -systemctl enable NetworkManager.service -systemctl enable avahi-daemon.service -systemctl enable agama.service -systemctl enable agama-web-server.service -systemctl enable agama-auto.service -systemctl enable agama-hostname.service -systemctl enable agama-proxy-setup.service -systemctl enable setup-systemd-proxy-env.path -systemctl enable x11-autologin.service -systemctl enable spice-vdagent.service -systemctl enable zramswap - -# default target -systemctl set-default graphical.target - -# adjust owner of extracted files -chown -R root:root /root -find /etc -user 1000 | xargs chown root:root - -### setup dracut for live system - -label=${kiwi_install_volid:-$kiwi_iname} -arch=$(uname -m) - -echo "Setting default live root: live:LABEL=$label" -mkdir /etc/cmdline.d -echo "root=live:LABEL=$label" >/etc/cmdline.d/10-liveroot.conf -echo "root_disk=live:LABEL=$label" >>/etc/cmdline.d/10-liveroot.conf -# if there's a default network location, add it here -# echo "root_net=" >> /etc/cmdline.d/10-liveroot.conf -echo 'install_items+=" /etc/cmdline.d/10-liveroot.conf "' >/etc/dracut.conf.d/10-liveroot-file.conf -echo 'add_dracutmodules+=" dracut-menu "' >>/etc/dracut.conf.d/10-liveroot-file.conf - -if [ "${arch}" = "s390x" ];then - # workaround for custom bootloader setting - touch /config.bootoptions -fi - -################################################################################ -# Reducing the used space - -# Clean-up logs -rm /var/log/zypper.log /var/log/zypp/history - -du -h -s /usr/{share,lib}/locale/ -# delete translations and unusupported languages (makes ISO about 22MiB smaller) -# build list of ignore options for "ls" with supported languages like "-I cs* -I de* -I es* ..." -readarray -t IGNORE_OPTS < <(ls /usr/share/cockpit/agama/po.*.js.gz | sed -e "s#/usr/share/cockpit/agama/po\.\(.*\)\.js\.gz#-I\n\\1*#") -# additionally keep the en_US translations -ls -1 "${IGNORE_OPTS[@]}" -I en_US /usr/share/locale/ | xargs -I% sh -c "echo 'Removing translations %...' && rm -rf /usr/share/locale/%" - -# delete locale definitions for unsupported languages (explicitly keep the C and en_US locales) -ls -1 "${IGNORE_OPTS[@]}" -I "en_US*" -I "C.*" /usr/lib/locale/ | xargs -I% sh -c "echo 'Removing locale %...' && rm -rf /usr/lib/locale/%" - -# delete unused translations (MO files) -for t in zypper gettext-runtime p11-kit polkit-1 xkeyboard-config; do - rm /usr/share/locale/*/LC_MESSAGES/$t.mo -done -du -h -s /usr/{share,lib}/locale/ - -# remove documentation -du -h -s /usr/share/doc/packages/ -rm -rf /usr/share/doc/packages/* -# remove man pages -du -h -s /usr/share/man -rm -rf /usr/share/man/* - -## removing drivers and firmware makes the Live ISO about 370MiB smaller -# sound related, Agama does not use sound, added by icewm dependencies -rpm -e --nodeps alsa alsa-utils alsa-ucm-conf - -# driver and firmware cleanup -# Note: openSUSE Tumbleweed Live completely removes firmware for some server -# network cars, because you very likely won't run TW KDE Live on a server. -# But for Agama installer it makes more sense to run on server. So we keep it -# and remove the drivers for sound cards and TV cards instead. Those do not -# make sense on a server. -du -h -s /lib/modules /lib/firmware -# delete sound drivers -rm -rfv /lib/modules/*/kernel/sound -# delete TV cards and radio cards -rm -rfv /lib/modules/*/kernel/drivers/media/ - -# remove the unused firmware (not referenced by kernel drivers) -/fw_cleanup.rb --delete -# remove the script, not needed anymore -rm /fw_cleanup.rb -du -h -s /lib/modules /lib/firmware - -################################################################################ -# The rest of the file was copied from the openSUSE Tumbleweed Live ISO -# https://build.opensuse.org/package/view_file/openSUSE:Factory:Live/livecd-tumbleweed-kde/config.sh?expand=1 -# - -# disable the services included by dependencies -for s in purge-kernels; do - systemctl -f disable $s || true -done - -# Only used for OpenCL and X11 acceleration on vmwgfx (?), saves ~50MiB -rpm -e --nodeps Mesa-gallium -# Too big and will have to be dropped anyway (unmaintained, known security issues) -rm -rf /usr/lib*/libmfxhw*.so.* /usr/lib*/mfx/ - -# the new, optional nvidia gsp firmware blobs are huge - ~ 70MB -du -h -s /lib/firmware/nvidia -find /lib/firmware/nvidia -name gsp | xargs -r rm -rf -du -h -s /lib/firmware/nvidia -# The gems are unpackaged already, no need to store them twice -du -h -s /usr/lib*/ruby/gems/*/cache/ -rm -rf /usr/lib*/ruby/gems/*/cache/ - -# Not needed, boo#1166406 -rm -f /boot/vmlinux*.[gx]z -rm -f /lib/modules/*/vmlinux*.[gx]z - -# Remove generated files (boo#1098535) -rm -rf /var/cache/zypp/* /var/lib/zypp/AnonymousUniqueId /var/lib/systemd/random-seed diff --git a/live/src/config.sh b/live/src/config.sh index 6698ec685f..e9d2923aa2 100644 --- a/live/src/config.sh +++ b/live/src/config.sh @@ -17,6 +17,7 @@ systemctl enable sshd.service systemctl enable NetworkManager.service systemctl enable avahi-daemon.service systemctl enable agama.service +systemctl enable agama-web-server.service systemctl enable agama-auto.service systemctl enable agama-hostname.service systemctl enable agama-proxy-setup.service From 2582d54b979a8bbdc42f6b0d32d889c4989f7e52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Thu, 9 May 2024 10:46:20 +0200 Subject: [PATCH 11/30] Synchronize the files --- live/src/agama-live.kiwi | 65 ++++------------------------------------ web/package/_service | 4 +-- 2 files changed, 8 insertions(+), 61 deletions(-) diff --git a/live/src/agama-live.kiwi b/live/src/agama-live.kiwi index 215d61be30..74898995d7 100644 --- a/live/src/agama-live.kiwi +++ b/live/src/agama-live.kiwi @@ -10,10 +10,7 @@ - - - 7.0.0 @@ -26,72 +23,27 @@ bgrt openSUSE - + - + - + - - - - - - true - true - /dev/ram1 - false - false - - 3000 - - - - - - - true - true - /dev/ram1 - false - false - - 1900 - - - - - - - true - true - /dev/ram1 - false - false - - 1900 - - - - - - - @@ -140,10 +92,10 @@ - + @@ -161,15 +113,10 @@ - - - - - - + - + diff --git a/web/package/_service b/web/package/_service index 6d9bafb227..b6815b5ab4 100644 --- a/web/package/_service +++ b/web/package/_service @@ -8,8 +8,8 @@ web enable package-lock.json - package/cockpit-agama.changes - package/cockpit-agama.spec + package/agama-web-ui.changes + package/agama-web-ui.spec node_modules.obscpio From 42d0d6132b67e2780e0e74337ac510e226c4037f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Thu, 9 May 2024 13:45:06 +0200 Subject: [PATCH 12/30] Update package name --- .github/workflows/obs-staging-web.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/obs-staging-web.yml b/.github/workflows/obs-staging-web.yml index 5b7a01945e..bef124e2fb 100644 --- a/.github/workflows/obs-staging-web.yml +++ b/.github/workflows/obs-staging-web.yml @@ -1,4 +1,4 @@ -name: Submit cockpit-agama +name: Submit agama-web-ui on: # runs on pushes targeting the default branch @@ -19,5 +19,5 @@ jobs: secrets: inherit with: install_packages: obs-service-node_modules - package_name: cockpit-agama + package_name: agama-web-ui service_file: web/package/_service From 638a11241f1ac277de4c5a38698fed4843e0d3d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Thu, 9 May 2024 13:59:58 +0200 Subject: [PATCH 13/30] Update the Github URL in _service file --- .github/workflows/obs-staging-shared.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/obs-staging-shared.yml b/.github/workflows/obs-staging-shared.yml index 10afd27c63..9ffd119e0e 100644 --- a/.github/workflows/obs-staging-shared.yml +++ b/.github/workflows/obs-staging-shared.yml @@ -72,7 +72,10 @@ jobs: - name: Copy optional service file if: inputs.service_file != '' - run: cp -f ${{ inputs.service_file }} ./${{ vars.OBS_PROJECT }}/${{ inputs.package_name }} + run: | + sed -i -e 's#.*#https://github.com/${{ github.repository }}.git#' > ./${{ vars.OBS_PROJECT }}/${{ inputs.package_name }}/_service + cd ./${{ vars.OBS_PROJECT }}/${{ inputs.package_name }} + osc addremove - name: Run services run: osc service manualrun From 46d9875ce0882c5714264e35abac387e5fb23000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Thu, 9 May 2024 14:01:23 +0200 Subject: [PATCH 14/30] Add sources OBS --- .github/workflows/obs-staging-shared.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/obs-staging-shared.yml b/.github/workflows/obs-staging-shared.yml index 9ffd119e0e..8ee5ec732b 100644 --- a/.github/workflows/obs-staging-shared.yml +++ b/.github/workflows/obs-staging-shared.yml @@ -75,14 +75,13 @@ jobs: run: | sed -i -e 's#.*#https://github.com/${{ github.repository }}.git#' > ./${{ vars.OBS_PROJECT }}/${{ inputs.package_name }}/_service cd ./${{ vars.OBS_PROJECT }}/${{ inputs.package_name }} - osc addremove - name: Run services run: osc service manualrun working-directory: ./${{ vars.OBS_PROJECT }}/${{ inputs.package_name }} - name: Check status - run: osc diff && osc status + run: osc addremove && osc diff && osc status working-directory: ./${{ vars.OBS_PROJECT }}/${{ inputs.package_name }} - name: Commit ${{ inputs.package_name }} to ${{ vars.OBS_PROJECT }} From 7076dae85f6480a4a006450cae12aa2fd4ea79e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Thu, 9 May 2024 14:04:52 +0200 Subject: [PATCH 15/30] Fixed _service file update --- .github/workflows/obs-staging-shared.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/obs-staging-shared.yml b/.github/workflows/obs-staging-shared.yml index 8ee5ec732b..eaeedcc2b5 100644 --- a/.github/workflows/obs-staging-shared.yml +++ b/.github/workflows/obs-staging-shared.yml @@ -73,8 +73,7 @@ jobs: - name: Copy optional service file if: inputs.service_file != '' run: | - sed -i -e 's#.*#https://github.com/${{ github.repository }}.git#' > ./${{ vars.OBS_PROJECT }}/${{ inputs.package_name }}/_service - cd ./${{ vars.OBS_PROJECT }}/${{ inputs.package_name }} + sed -e 's#.*#https://github.com/${{ github.repository }}.git#' ${{ inputs.service_file }} > ./${{ vars.OBS_PROJECT }}/${{ inputs.package_name }}/_service - name: Run services run: osc service manualrun From 981ae5117d955cd89835314a636b5e490f467814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Thu, 9 May 2024 14:42:17 +0200 Subject: [PATCH 16/30] Patch the _service so it works from forks --- .github/workflows/obs-staging-shared.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/obs-staging-shared.yml b/.github/workflows/obs-staging-shared.yml index eaeedcc2b5..209fa75364 100644 --- a/.github/workflows/obs-staging-shared.yml +++ b/.github/workflows/obs-staging-shared.yml @@ -46,6 +46,7 @@ jobs: - name: Install tools run: zypper --non-interactive install --no-recommends + git cpio obs-service-download_files obs-service-format_spec_file @@ -71,9 +72,12 @@ jobs: working-directory: ./${{ vars.OBS_PROJECT }}/${{ inputs.package_name }} - name: Copy optional service file + # patch the URL in the file so it works also from forks, + # forks also by default do not inherit the tags so remove the version format option if: inputs.service_file != '' run: | sed -e 's#.*#https://github.com/${{ github.repository }}.git#' ${{ inputs.service_file }} > ./${{ vars.OBS_PROJECT }}/${{ inputs.package_name }}/_service + if [ -z "$(git tag -l)" ]; then sed -i -e 's#.*##' ./${{ vars.OBS_PROJECT }}/${{ inputs.package_name }}/_service; fi - name: Run services run: osc service manualrun From 79428b753a3e69237f7af550e0331dec489c1a98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Thu, 9 May 2024 14:46:07 +0200 Subject: [PATCH 17/30] Checkout with git tool --- .github/workflows/obs-staging-shared.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/obs-staging-shared.yml b/.github/workflows/obs-staging-shared.yml index 209fa75364..c4e27ac104 100644 --- a/.github/workflows/obs-staging-shared.yml +++ b/.github/workflows/obs-staging-shared.yml @@ -37,9 +37,6 @@ jobs: image: registry.opensuse.org/opensuse/tumbleweed:latest steps: - - name: Git Checkout - uses: actions/checkout@v4 - - name: Configure and refresh repositories # disable unused repositories to have a faster refresh run: zypper modifyrepo -d repo-non-oss repo-openh264 repo-update && zypper ref @@ -54,6 +51,11 @@ jobs: osc ${{ inputs.install_packages }} + - name: Git Checkout + uses: actions/checkout@v4 + with: + fetch-tags: true + - name: Configure osc run: .github/workflows/configure_osc.sh env: From 884c3552f9ee09a1b8f8ac5b90d931a0e2b13ed3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Thu, 9 May 2024 14:59:31 +0200 Subject: [PATCH 18/30] git safe dir --- .github/workflows/obs-staging-shared.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/obs-staging-shared.yml b/.github/workflows/obs-staging-shared.yml index c4e27ac104..311b6ed715 100644 --- a/.github/workflows/obs-staging-shared.yml +++ b/.github/workflows/obs-staging-shared.yml @@ -78,6 +78,7 @@ jobs: # forks also by default do not inherit the tags so remove the version format option if: inputs.service_file != '' run: | + git config --global --add safe.directory "$GITHUB_WORKSPACE" sed -e 's#.*#https://github.com/${{ github.repository }}.git#' ${{ inputs.service_file }} > ./${{ vars.OBS_PROJECT }}/${{ inputs.package_name }}/_service if [ -z "$(git tag -l)" ]; then sed -i -e 's#.*##' ./${{ vars.OBS_PROJECT }}/${{ inputs.package_name }}/_service; fi From d098792b7e49e7bd884d07d8ff703e068dc42380 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Thu, 9 May 2024 15:17:50 +0200 Subject: [PATCH 19/30] Configure git --- .github/workflows/obs-staging-live.yml | 9 ++++++--- .github/workflows/obs-staging-shared.yml | 4 +++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/obs-staging-live.yml b/.github/workflows/obs-staging-live.yml index 8fb4ce29dc..cce8091242 100644 --- a/.github/workflows/obs-staging-live.yml +++ b/.github/workflows/obs-staging-live.yml @@ -23,9 +23,6 @@ jobs: image: registry.opensuse.org/opensuse/tumbleweed:latest steps: - - name: Git Checkout - uses: actions/checkout@v4 - - name: Configure and refresh repositories # disable unused repositories to have a faster refresh run: zypper modifyrepo -d repo-non-oss repo-openh264 repo-update && zypper ref @@ -34,6 +31,12 @@ jobs: run: zypper --non-interactive install --no-recommends git make osc + - name: Git Checkout + uses: actions/checkout@v4 + + - name: Configure git + run: git config --global --add safe.directory "$GITHUB_WORKSPACE" + - name: Configure osc run: .github/workflows/configure_osc.sh env: diff --git a/.github/workflows/obs-staging-shared.yml b/.github/workflows/obs-staging-shared.yml index 311b6ed715..fa079b47d6 100644 --- a/.github/workflows/obs-staging-shared.yml +++ b/.github/workflows/obs-staging-shared.yml @@ -65,6 +65,9 @@ jobs: - name: Checkout ${{ vars.OBS_PROJECT }} ${{ inputs.package_name }} run: osc co ${{ vars.OBS_PROJECT }} ${{ inputs.package_name }} + - name: Configure git + run: git config --global --add safe.directory "$GITHUB_WORKSPACE" + - name: Update service revision # only when a tag has been pushed if: ${{ github.ref_type == 'tag' }} @@ -78,7 +81,6 @@ jobs: # forks also by default do not inherit the tags so remove the version format option if: inputs.service_file != '' run: | - git config --global --add safe.directory "$GITHUB_WORKSPACE" sed -e 's#.*#https://github.com/${{ github.repository }}.git#' ${{ inputs.service_file }} > ./${{ vars.OBS_PROJECT }}/${{ inputs.package_name }}/_service if [ -z "$(git tag -l)" ]; then sed -i -e 's#.*##' ./${{ vars.OBS_PROJECT }}/${{ inputs.package_name }}/_service; fi From c43f63f5bc70fd1e56bfff0957097eaa39988fed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Thu, 9 May 2024 15:19:25 +0200 Subject: [PATCH 20/30] HTTPS URL --- web/package/_service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/package/_service b/web/package/_service index b6815b5ab4..a1ca8be132 100644 --- a/web/package/_service +++ b/web/package/_service @@ -2,7 +2,7 @@ @PARENT_TAG@+@TAG_OFFSET@ v(.*) - http://github.com/openSUSE/agama.git + https://github.com/openSUSE/agama.git git master web From ef025cfa56056a84b47245027575de6a2294b735 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Thu, 9 May 2024 15:27:53 +0200 Subject: [PATCH 21/30] Rename agama-cli -> agama --- .github/workflows/obs-staging-rust.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/obs-staging-rust.yml b/.github/workflows/obs-staging-rust.yml index 6480fe441b..e14ca8c207 100644 --- a/.github/workflows/obs-staging-rust.yml +++ b/.github/workflows/obs-staging-rust.yml @@ -1,4 +1,4 @@ -name: Submit agama-cli +name: Submit agama on: # runs on pushes targeting the default branch @@ -8,6 +8,7 @@ on: paths: # run only when a Rust source is changed - rust/** + # allow running manually workflow_dispatch: From b2d6ab2b147329b5bc05e83876b997f864618e2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Thu, 9 May 2024 16:11:42 +0200 Subject: [PATCH 22/30] Rename cockpit-agama-playwright to agama-playwright --- .github/workflows/obs-staging-playwright.yml | 4 ++-- live/src/agama-live.kiwi | 2 +- playwright/package/_service | 4 ++-- ...-agama-playwright.changes => agama-playwright.changes} | 0 ...ockpit-agama-playwright.spec => agama-playwright.spec} | 8 ++++---- 5 files changed, 9 insertions(+), 9 deletions(-) rename playwright/package/{cockpit-agama-playwright.changes => agama-playwright.changes} (100%) rename playwright/package/{cockpit-agama-playwright.spec => agama-playwright.spec} (85%) diff --git a/.github/workflows/obs-staging-playwright.yml b/.github/workflows/obs-staging-playwright.yml index 850c363de1..dc4a22990f 100644 --- a/.github/workflows/obs-staging-playwright.yml +++ b/.github/workflows/obs-staging-playwright.yml @@ -1,4 +1,4 @@ -name: Submit cockpit-agama-playwright +name: Submit agama-playwright on: # runs on pushes targeting the default branch @@ -18,5 +18,5 @@ jobs: # pass all secrets secrets: inherit with: - package_name: cockpit-agama-playwright + package_name: agama-playwright service_file: playwright/package/_service diff --git a/live/src/agama-live.kiwi b/live/src/agama-live.kiwi index 74898995d7..e3103e7f0a 100644 --- a/live/src/agama-live.kiwi +++ b/live/src/agama-live.kiwi @@ -116,7 +116,7 @@ - + diff --git a/playwright/package/_service b/playwright/package/_service index 7eee12adec..183d4985f7 100644 --- a/playwright/package/_service +++ b/playwright/package/_service @@ -7,8 +7,8 @@ master playwright enable - package/cockpit-agama-playwright.changes - package/cockpit-agama-playwright.spec + package/agama-playwright.changes + package/agama-playwright.spec agama.obsinfo diff --git a/playwright/package/cockpit-agama-playwright.changes b/playwright/package/agama-playwright.changes similarity index 100% rename from playwright/package/cockpit-agama-playwright.changes rename to playwright/package/agama-playwright.changes diff --git a/playwright/package/cockpit-agama-playwright.spec b/playwright/package/agama-playwright.spec similarity index 85% rename from playwright/package/cockpit-agama-playwright.spec rename to playwright/package/agama-playwright.spec index 126821cf2f..d15e827b9c 100644 --- a/playwright/package/cockpit-agama-playwright.spec +++ b/playwright/package/agama-playwright.spec @@ -1,5 +1,5 @@ # -# spec file for package cockpit-agama-playwright +# spec file for package agama-playwright # # Copyright (c) 2023 SUSE LLC # @@ -16,10 +16,10 @@ # -Name: cockpit-agama-playwright +Name: agama-playwright Version: 0 Release: 0 -Summary: Integration tests for the Agama Cockpit module +Summary: Integration tests for the Agama installer License: GPL-2.0-only URL: https://github.com/openSUSE/agama # source_validator insists that if obscpio has no version then @@ -30,7 +30,7 @@ BuildRequires: coreutils Requires: playwright %description -Playwright integration tests for the Agama Cockpit module. +Playwright integration tests for the Agama installer. %prep %autosetup -p1 -n agama From ebf5b48b773cd72a6c5e6ccf57d6094adadfcd86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Thu, 9 May 2024 17:00:59 +0200 Subject: [PATCH 23/30] Deleted Cockpit related files --- live/root/etc/cockpit/cockpit.conf | 6 ------ live/root/etc/systemd/system/cockpit.socket.d/listen.conf | 8 -------- 2 files changed, 14 deletions(-) delete mode 100644 live/root/etc/cockpit/cockpit.conf delete mode 100644 live/root/etc/systemd/system/cockpit.socket.d/listen.conf diff --git a/live/root/etc/cockpit/cockpit.conf b/live/root/etc/cockpit/cockpit.conf deleted file mode 100644 index 741cc4b362..0000000000 --- a/live/root/etc/cockpit/cockpit.conf +++ /dev/null @@ -1,6 +0,0 @@ -[WebService] -LoginTitle = Agama Installer -Shell = /agama/index.html - -[Session] -IdleTimeout = 0 diff --git a/live/root/etc/systemd/system/cockpit.socket.d/listen.conf b/live/root/etc/systemd/system/cockpit.socket.d/listen.conf deleted file mode 100644 index 74514d041a..0000000000 --- a/live/root/etc/systemd/system/cockpit.socket.d/listen.conf +++ /dev/null @@ -1,8 +0,0 @@ -# see https://cockpit-project.org/guide/latest/listen -[Socket] -# the empty line disables the default port 9090 from the original unit -ListenStream= -# the standard HTTP port (Cockpit automatically redirects all HTTP traffic to HTTPS) -ListenStream=80 -# the standard HTTPS port -ListenStream=443 From 907482bee3655c3b393b4e12bd8843ba40adab1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Thu, 9 May 2024 17:06:00 +0200 Subject: [PATCH 24/30] Fixed service submission --- .github/workflows/obs-service-shared.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/obs-service-shared.yml b/.github/workflows/obs-service-shared.yml index ef3629f05b..cb709dc06f 100644 --- a/.github/workflows/obs-service-shared.yml +++ b/.github/workflows/obs-service-shared.yml @@ -10,12 +10,6 @@ on: OBS_PASSWORD: required: true - inputs: - project_name: - description: OBS project name - required: true - type: string - jobs: update_service: # do not run in forks which do not set the OBS_PROJECT variable @@ -52,9 +46,8 @@ jobs: if: ${{ github.ref_type == 'tag' }} uses: actions/checkout@v4 - - name: Fix file owner - # workaround for a strict git check - run: chown -R -c 0 . + - name: Configure git + run: git config --global --add safe.directory "$GITHUB_WORKSPACE" - name: Configure osc run: .github/workflows/configure_osc.sh From 6e73b0dfa77c9f7c53c99987eda800c7cc47646f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Thu, 9 May 2024 17:11:28 +0200 Subject: [PATCH 25/30] Install diffutils --- .github/workflows/obs-service-shared.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/obs-service-shared.yml b/.github/workflows/obs-service-shared.yml index cb709dc06f..4c4a33693f 100644 --- a/.github/workflows/obs-service-shared.yml +++ b/.github/workflows/obs-service-shared.yml @@ -28,6 +28,7 @@ jobs: - name: Install tools run: zypper --non-interactive install --no-recommends bzip2 + diffutils git obs-service-format_spec_file osc From 92b0821e0198ebefd85a3cf9adc3fd9035a5f54b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Thu, 9 May 2024 17:57:32 +0200 Subject: [PATCH 26/30] Added FireFox profile template --- live/root/root/.mozilla/firefox/profile/user.js | 6 ------ .../root/.mozilla/firefox/profile/user.js.template | 11 +++++++++++ 2 files changed, 11 insertions(+), 6 deletions(-) delete mode 100644 live/root/root/.mozilla/firefox/profile/user.js create mode 100644 live/root/root/.mozilla/firefox/profile/user.js.template diff --git a/live/root/root/.mozilla/firefox/profile/user.js b/live/root/root/.mozilla/firefox/profile/user.js deleted file mode 100644 index 2548c9d999..0000000000 --- a/live/root/root/.mozilla/firefox/profile/user.js +++ /dev/null @@ -1,6 +0,0 @@ -// Mozilla User Preferences - -// do not remember or generate passwords -user_pref("signon.management.page.breach-alerts.enabled", false); -user_pref("signon.rememberSignons", false); -user_pref("signon.generation.enabled", false); diff --git a/live/root/root/.mozilla/firefox/profile/user.js.template b/live/root/root/.mozilla/firefox/profile/user.js.template new file mode 100644 index 0000000000..630dd805ac --- /dev/null +++ b/live/root/root/.mozilla/firefox/profile/user.js.template @@ -0,0 +1,11 @@ +// Mozilla User Preferences + +// do not remember or generate passwords +user_pref("signon.management.page.breach-alerts.enabled", false); +user_pref("signon.rememberSignons", false); +user_pref("signon.generation.enabled", false); + +// start always in the custom homepage +user_pref("browser.startup.page", 1); +// custom homepage: the value is expected to be replaced with the login URL by the startup script +user_pref("browser.startup.homepage", "__HOMEPAGE__"); \ No newline at end of file From 5967a3aaaa32d485f00f0de8710994f4588430c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Thu, 9 May 2024 18:11:28 +0200 Subject: [PATCH 27/30] Do not read Cockpit manifests.js --- web/src/index.html | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/web/src/index.html b/web/src/index.html index 6262f0fd48..918d6d681b 100644 --- a/web/src/index.html +++ b/web/src/index.html @@ -11,11 +11,10 @@
- From a05090ae7699541648d8dd19d9fbab6ff7403243 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Thu, 9 May 2024 20:49:04 +0200 Subject: [PATCH 28/30] Drop manifest.json --- doc/i18n.md | 19 +++++++++---------- web/cspell.json | 1 - web/src/manifest.json | 11 ----------- web/webpack.config.js | 14 +------------- 4 files changed, 10 insertions(+), 35 deletions(-) delete mode 100644 web/src/manifest.json diff --git a/doc/i18n.md b/doc/i18n.md index 07c61f522c..35de9425bc 100644 --- a/doc/i18n.md +++ b/doc/i18n.md @@ -28,7 +28,7 @@ - [Building POT File](#building-pot-file) - [Loading Web UI Translations](#loading-web-ui-translations) - [Development Server](#development-server) - - [D-Bus Backend](#d-bus-backend) + - [Backend Locale](#backend-locale) - [Backend Translations](#backend-translations) - [Troubleshooting](#troubleshooting) @@ -51,7 +51,7 @@ Users have two ways how to change the used language in the Agama interface. The sidebar of the web UI contains a component that allows to change the language. It was introduced in Agama 5 and it is the recommended way. The list of supported languages is read from the -[manifest.json](https://github.com/openSUSE/agama/blob/master/web/src/manifest.json) +[languages.json](https://github.com/openSUSE/agama/blob/master/web/src/languages.json) file. Check the [The Web Frontend](#the-web-frontend) for further details. ### URL Query Parameter @@ -147,7 +147,7 @@ GitHub action. - It checks out both `agama` and `agama-weblate` repositories - It copies the PO files from the `agama-weblate` to the `agama` repository -- It updates the `manifest.json` file with the list of supported languages. +- It updates the `languages.json` file with the list of supported languages. - It creates a pull request with the changes If there are no changes besides the timestamps in the PO files the pull request @@ -187,16 +187,15 @@ from the backend part so it is important to set the same language in both parts and make sure the translations are available there. The list of supported languages is read from the -[manifest.json](https://github.com/openSUSE/agama/blob/master/web/src/manifest.json), -under the `locales` key. Such a list is automatically refreshed when any of the -PO files is updated (see [Uploading Translatable -Texts](#uploading-translatable-texts)). +[languages.json](https://github.com/openSUSE/agama/blob/master/web/src/languages.json). +Such a list is automatically refreshed when any of the PO files is updated (see +[Uploading Translatable Texts](#uploading-translatable-texts)). The [update-manifest.py script](https://github.com/openSUSE/agama/blob/master/web/share/update-manifest.py) is the responsible for updating the list of supported languages. It goes through all PO files, filters out the ones with less than 70% of translated -content and adds the corresponding locales to the `manifest.json`. +content and adds the corresponding locales to the `languages.json`. The name of the locale is taken from [langtable](https://pypi.org/project/langtable/), so be sure to have it @@ -205,10 +204,10 @@ instead of `es_es`), the script uses the [locales.json map](https://github.com/openSUSE/agama/blob/master/web/share/locales.json) to determine which territory to use. -If you need to manually update the `manifest.json` file, run: +If you need to manually update the `languages.json` file, run: ``` -web/share/update-manifest.py web/src/manifest.json +web/share/update-languages.py > web/src/languages.json ``` ### Marking Texts for Translation diff --git a/web/cspell.json b/web/cspell.json index 57a61da4fa..d1926048ce 100644 --- a/web/cspell.json +++ b/web/cspell.json @@ -6,7 +6,6 @@ "src/languages.json", "src/lib/cockpit.js", "src/lib/cockpit-po-plugin.js", - "src/manifest.json", "src/**/test-data/*" ], "import": [ diff --git a/web/src/manifest.json b/web/src/manifest.json deleted file mode 100644 index 2e2bd4cfff..0000000000 --- a/web/src/manifest.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "agama", - "requires": { - "cockpit": "137" - }, - "tools": { - "index": { - "label": "Agama" - } - } -} diff --git a/web/webpack.config.js b/web/webpack.config.js index 284b570909..b12dda738c 100644 --- a/web/webpack.config.js +++ b/web/webpack.config.js @@ -37,7 +37,6 @@ const packageJson = JSON.parse(fs.readFileSync('package.json')); // Non-JS files which are copied verbatim to dist/ const copy_files = [ "./src/index.html", - "./src/manifest.json", // TODO: consider using something more complete like https://github.com/jantimon/favicons-webpack-plugin "./src/assets/favicon.svg", ]; @@ -95,19 +94,8 @@ module.exports = { devServer: { hot: true, // additionally watch these files for changes - watchFiles: ["./src/manifest.json", "./po/*.po"], + watchFiles: ["./po/*.po"], proxy: [ - // TODO: modify it to not depend on cockpit - // forward the manifests.js request and patch the response with the - // current Agama manifest from the ./src/manifest.json file - // "/manifests.js": { - // target: cockpitTarget + "/cockpit/@localhost/", - // // ignore SSL problems (self-signed certificate) - // secure: false, - // // the response is modified by the onProxyRes handler - // selfHandleResponse : true, - // onProxyRes: manifests_handler, - // }, { context: ["/api/ws"], target: agamaServer.replace(/^http/, "ws"), From 772add915c4e0cdfc5c22da4181837e1b0f9a744 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Fri, 10 May 2024 08:43:19 +0200 Subject: [PATCH 29/30] Better comment --- .github/workflows/obs-staging-shared.yml | 5 +++-- live/root/root/.mozilla/firefox/profile/user.js.template | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/obs-staging-shared.yml b/.github/workflows/obs-staging-shared.yml index fa079b47d6..0f03ab72b1 100644 --- a/.github/workflows/obs-staging-shared.yml +++ b/.github/workflows/obs-staging-shared.yml @@ -77,8 +77,9 @@ jobs: working-directory: ./${{ vars.OBS_PROJECT }}/${{ inputs.package_name }} - name: Copy optional service file - # patch the URL in the file so it works also from forks, - # forks also by default do not inherit the tags so remove the version format option + # patch the URL in the file so it works also from forks, forks also by + # default do not inherit the tags so remove the version format option if + # no tag is present if: inputs.service_file != '' run: | sed -e 's#.*#https://github.com/${{ github.repository }}.git#' ${{ inputs.service_file }} > ./${{ vars.OBS_PROJECT }}/${{ inputs.package_name }}/_service diff --git a/live/root/root/.mozilla/firefox/profile/user.js.template b/live/root/root/.mozilla/firefox/profile/user.js.template index 630dd805ac..41166d8ab7 100644 --- a/live/root/root/.mozilla/firefox/profile/user.js.template +++ b/live/root/root/.mozilla/firefox/profile/user.js.template @@ -8,4 +8,4 @@ user_pref("signon.generation.enabled", false); // start always in the custom homepage user_pref("browser.startup.page", 1); // custom homepage: the value is expected to be replaced with the login URL by the startup script -user_pref("browser.startup.homepage", "__HOMEPAGE__"); \ No newline at end of file +user_pref("browser.startup.homepage", "__HOMEPAGE__"); From a358ee8612f118ac2cdff9f4a8f8a46e9dd8357e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Fri, 10 May 2024 09:21:38 +0200 Subject: [PATCH 30/30] Comment --- rust/share/agama-web-server.service | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rust/share/agama-web-server.service b/rust/share/agama-web-server.service index 89d7ca62df..91b481b7e6 100644 --- a/rust/share/agama-web-server.service +++ b/rust/share/agama-web-server.service @@ -1,5 +1,7 @@ [Unit] Description=Agama Web Server +# agama-hostname might change the host name which is used when creating +# a self signed certificate, run it before the web server After=network-online.target agama.service agama-hostname.service [Service]