From 791e032536d0564559f93bb109ac49ade37a3c04 Mon Sep 17 00:00:00 2001 From: Gerard Braad Date: Sat, 17 Jun 2023 07:06:33 +0000 Subject: [PATCH] Scaffolding --- .cirrus.yml | 2 +- org.cockpit-project.starter-kit.metainfo.xml | 17 --------------- org.cockpit-project.tailscale.metainfo.xml | 17 +++++++++++++++ package.json | 6 +++--- ...-kit.spec.in => cockpit-tailscale.spec.in} | 8 +++---- packit.yaml | 4 ++-- src/app.jsx | 21 +------------------ src/index.html | 18 +--------------- src/index.js | 19 ----------------- src/manifest.json | 2 +- 10 files changed, 30 insertions(+), 84 deletions(-) delete mode 100644 org.cockpit-project.starter-kit.metainfo.xml create mode 100644 org.cockpit-project.tailscale.metainfo.xml rename packaging/{cockpit-starter-kit.spec.in => cockpit-tailscale.spec.in} (79%) diff --git a/.cirrus.yml b/.cirrus.yml index 93c72b3..51c019b 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -16,7 +16,7 @@ test_task: fix_kvm_script: sudo chmod 666 /dev/kvm # test PO template generation - pot_build_script: make po/starter-kit.pot + pot_build_script: make po/tailscale.pot # chromium has too little /dev/shm, and we can't make that bigger check_script: TEST_BROWSER=firefox TEST_JOBS=$(nproc) TEST_OS=$TEST_OS make check diff --git a/org.cockpit-project.starter-kit.metainfo.xml b/org.cockpit-project.starter-kit.metainfo.xml deleted file mode 100644 index 8e19746..0000000 --- a/org.cockpit-project.starter-kit.metainfo.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - org.cockpit_project.starter_kit - CC0-1.0 - Starter Kit - Scaffolding for a cockpit module - -

- Scaffolding for a cockpit module. -

- - org.cockpit_project.cockpit - starter-kit - https://github.com/cockpit-project/starter-kit - https://github.com/cockpit-project/starter-kit/issues - cockpit-devel_AT_lists.fedorahosted.org - diff --git a/org.cockpit-project.tailscale.metainfo.xml b/org.cockpit-project.tailscale.metainfo.xml new file mode 100644 index 0000000..0c5c198 --- /dev/null +++ b/org.cockpit-project.tailscale.metainfo.xml @@ -0,0 +1,17 @@ + + + org.cockpit_project.tailscale + CC0-1.0 + Tailscale + Tailscale application + +

+ Tailscale application for Cockpit +

+ + org.cockpit_project.tailscale + tailscale + https://github.com/spotsnel/tailscale-cockpit + https://github.com/spotsnel/tailscale-cockpit/issues + me@gbraad.nl + diff --git a/package.json b/package.json index dd26754..fd08975 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { - "name": "starter-kit", - "description": "Scaffolding for a cockpit module", + "name": "tailscale", + "description": "Tailscale application for Cockpit", "type": "module", "main": "index.js", - "repository": "git@github.com:cockpit/starter-kit.git", + "repository": "git@github.com:spotsnel/tailscale-cockpit.git", "author": "", "license": "LGPL-2.1", "scripts": { diff --git a/packaging/cockpit-starter-kit.spec.in b/packaging/cockpit-tailscale.spec.in similarity index 79% rename from packaging/cockpit-starter-kit.spec.in rename to packaging/cockpit-tailscale.spec.in index 44d6952..efb0639 100644 --- a/packaging/cockpit-starter-kit.spec.in +++ b/packaging/cockpit-tailscale.spec.in @@ -1,11 +1,11 @@ -Name: cockpit-starter-kit +Name: cockpit-tailscale Version: %{VERSION} Release: 1%{?dist} -Summary: Cockpit Starter Kit Example Module +Summary: Cockpit tailscale License: LGPLv2+ -Source0: https://github.com/cockpit-project/starter-kit/releases/download/%{version}/%{name}-%{version}.tar.xz -Source1: https://github.com/cockpit-project/starter-kit/releases/download/%{version}/%{name}-node-%{version}.tar.xz +Source0: https://github.com/spotsnel/tailscale-cockpit/releases/download/%{version}/%{name}-%{version}.tar.xz +Source1: https://github.com/spotsnel/tailscale-cockpit/releases/download/%{version}/%{name}-node-%{version}.tar.xz BuildArch: noarch ExclusiveArch: %{nodejs_arches} noarch BuildRequires: nodejs diff --git a/packit.yaml b/packit.yaml index 6258a2e..7d5ddd0 100644 --- a/packit.yaml +++ b/packit.yaml @@ -2,7 +2,7 @@ # To use this, enable Packit-as-a-service in GitHub: https://packit.dev/docs/packit-as-a-service/ # See https://packit.dev/docs/configuration/ for the format of this file -specfile_path: cockpit-starter-kit.spec +specfile_path: cockpit-tailscale.spec # use the nicely formatted release description from our upstream release, instead of git shortlog copy_upstream_release_description: true @@ -12,7 +12,7 @@ srpm_build_deps: actions: post-upstream-clone: - - make cockpit-starter-kit.spec + - make cockpit-tailscale.spec # replace Source1 manually, as create-archive: can't handle multiple tarballs - make node-cache - sh -c 'sed -i "/^Source1:/ s/https:.*/$(ls *-node*.tar.xz)/" cockpit-*.spec' diff --git a/src/app.jsx b/src/app.jsx index 6d2e4e2..13a7334 100644 --- a/src/app.jsx +++ b/src/app.jsx @@ -1,22 +1,3 @@ -/* - * This file is part of Cockpit. - * - * Copyright (C) 2017 Red Hat, Inc. - * - * Cockpit is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or - * (at your option) any later version. - * - * Cockpit is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Cockpit; If not, see . - */ - import cockpit from 'cockpit'; import React from 'react'; import { Alert } from "@patternfly/react-core/dist/esm/components/Alert/index.js"; @@ -37,7 +18,7 @@ export class Application extends React.Component { render() { return ( - Starter Kit + Tailscale - - Cockpit Starter Kit + Tailscale diff --git a/src/index.js b/src/index.js index 3cb37d9..1640735 100644 --- a/src/index.js +++ b/src/index.js @@ -1,22 +1,3 @@ -/* - * This file is part of Cockpit. - * - * Copyright (C) 2017 Red Hat, Inc. - * - * Cockpit is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or - * (at your option) any later version. - * - * Cockpit is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Cockpit; If not, see . - */ - import "cockpit-dark-theme"; import "patternfly/patternfly-5-cockpit.scss"; diff --git a/src/manifest.json b/src/manifest.json index 3a45f56..1c7611a 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -5,7 +5,7 @@ "tools": { "index": { - "label": "Starter Kit" + "label": "Tailscale" } } }