diff --git a/README.md b/README.md index 4700153..6efea09 100644 --- a/README.md +++ b/README.md @@ -1,119 +1,7 @@ -# Cockpit Starter Kit +# cockpitcertificates- -Scaffolding for a [Cockpit](http://www.cockpit-project.org) module. +A certificate management plugin for [Cockpit](https://cockpit-project.org/) -# Getting and building the source +Work in progress. -Make sure you have `npm` available (usually from your distribution package). -These commands check out the source and build it into the `dist/` directory: - -``` -git clone https://github.com/cockpit-project/starter-kit.git -cd starter-kit -make -``` - -# Installing - -`make install` compiles and installs the package in `/usr/share/cockpit/`. The -convenience targets `srpm` and `rpm` build the source and binary rpms, -respectively. Both of these make use of the `dist-gzip` target, which is used -to generate the distribution tarball. In `production` mode, source files are -automatically minified and compressed. Set `NODE_ENV=production` if you want to -duplicate this behavior. - -For development, you usually want to run your module straight out of the git -tree. To do that, link that to the location were `cockpit-bridge` looks for packages: - -``` -mkdir -p ~/.local/share/cockpit -ln -s `pwd`/dist ~/.local/share/cockpit/starter-kit -``` - -After changing the code and running `make` again, reload the Cockpit page in -your browser. - -You can also use -[watch mode](https://webpack.js.org/guides/development/#using-watch-mode) to -automatically update the webpack on every code change with - - $ npm run watch - -or - - $ make watch - -# Running eslint - -Cockpit Starter Kit uses [ESLint](https://eslint.org/) to automatically check -JavaScript code style in `.js` and `.jsx` files. - -The linter is executed within every build as a webpack preloader. - -For developer convenience, the ESLint can be started explicitly by: - - $ npm run eslint - -Violations of some rules can be fixed automatically by: - - $ npm run eslint:fix - -Rules configuration can be found in the `.eslintrc.json` file. - -# Automated Testing - -Run `make check` to build an RPM, install it into a standard Cockpit test VM -(centos-7 by default), and run the test/check-application integration test on -it. This uses Cockpit's Chrome DevTools Protocol based browser tests, through a -Python API abstraction. Note that this API is not guaranteed to be stable, so -if you run into failures and don't want to adjust tests, consider checking out -Cockpit's test/common from a tag instead of master (see the `test/common` -target in `Makefile`). - -After the test VM is prepared, you can manually run the test without rebuilding -the VM, possibly with extra options for tracing and halting on test failures -(for interactive debugging): - - TEST_OS=centos-7 test/check-application -tvs - -You can also run the test against a different Cockpit image, for example: - - TEST_OS=fedora-28 make check - -# Vagrant - -This directory contains a Vagrantfile that installs and starts cockpit on a -Fedora 26 cloud image. Run `vagrant up` to start it and `vagrant rsync` to -synchronize the `dist` directory to `/usr/local/share/cockit/starter-kit`. Use -`vagrant rsync-auto` to automatically sync when contents of the `dist` -directory change. - -# Customizing - -After cloning the Starter Kit you should rename the files, package names, and -labels to your own project's name. Use these commands to find out what to -change: - - find -iname '*starter*' - git grep -i starter - -# Automated release - -Once your cloned project is ready for a release, you should consider automating -that. [Cockpituous release](https://github.com/cockpit-project/cockpituous/tree/master/release) -aims to fully automate project releases to GitHub, Fedora, Ubuntu, COPR, Docker -Hub, and other places. The intention is that the only manual step for releasing -a project is to create a signed tag for the version number; pushing the tag -then triggers a GitHub webhook that calls a set of release scripts (on -Cockpit's CI infrastructure). - -starter-kit includes an example [cockpitous release script](./cockpituous-release) -that builds an upstream release tarball and source RPM. Please see the above -cockpituous documentation for details. - -# Further reading - - * The [Starter Kit announcement](http://cockpit-project.org/blog/cockpit-starter-kit.html) - blog post explains the rationale for this project. - * [Cockpit Deployment and Developer documentation](http://cockpit-project.org/guide/latest/) - * [Make your project easily discoverable](http://cockpit-project.org/blog/making-a-cockpit-application.html) +Based on the [Cockpit Starter Kit](https://github.com/cockpit-project/starter-kit). diff --git a/cockpit-starter-kit.spec.in b/cockpit-starter-kit.spec.in deleted file mode 100644 index 48f5b17..0000000 --- a/cockpit-starter-kit.spec.in +++ /dev/null @@ -1,32 +0,0 @@ -Name: cockpit-starter-kit -Version: @VERSION@ -Release: 1%{?dist} -Summary: Cockpit Starter Kit Example Module -License: LGPLv2+ - -Source: cockpit-starter-kit-%{version}.tar.gz -BuildArch: noarch -BuildRequires: libappstream-glib - -Requires: cockpit-system - -%define debug_package %{nil} - -%description -Cockpit Starter Kit Example Module - -%prep -%setup -n cockpit-starter-kit - -%install -%make_install -appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/* - -# drop source maps, they are large and just for debugging -find %{buildroot}%{_datadir}/cockpit/ -name '*.map' | xargs rm --verbose - -%files -%{_datadir}/cockpit/* -%{_datadir}/metainfo/* - -%changelog diff --git a/cockpituous-release b/cockpituous-release index 19bcb99..48cfce5 100644 --- a/cockpituous-release +++ b/cockpituous-release @@ -8,7 +8,7 @@ # Check cockpituous documentation for available release targets. RELEASE_SOURCE="_release/source" -RELEASE_SPEC="cockpit-starter-kit.spec" +RELEASE_SPEC="cockpit-certificates.spec" RELEASE_SRPM="_release/srpm" job release-source diff --git a/org.cockpit-project.starter-kit.metainfo.xml b/org.cockpit-project.certificates-kit.metainfo.xml similarity index 100% rename from org.cockpit-project.starter-kit.metainfo.xml rename to org.cockpit-project.certificates-kit.metainfo.xml diff --git a/package.json b/package.json index c95967c..38d14b1 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { - "name": "starter-kit", + "name": "certificates", "version": "0.1.0", "description": "Scaffolding for a cockpit module", "main": "index.js", - "repository": "git@github.com:cockpit/starter-kit.git", + "repository": "git@github.com:skobyda/certificates.git", "author": "", "license": "LGPL-2.1", "scripts": { diff --git a/po/de.po b/po/de.po index d117b0b..f137056 100644 --- a/po/de.po +++ b/po/de.po @@ -1,8 +1,8 @@ -# starter-kit German translations +# certificates German translations #, fuzzy msgid "" msgstr "" -"Project-Id-Version: starter-kit 1.0\n" +"Project-Id-Version: certificates 1.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-08-29 00:14+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" @@ -14,7 +14,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: src/index.html:20 -msgid "Cockpit Starter Kit" +msgid "Cockpit Certificates" msgstr "Cockpit Bausatz" #: src/app.jsx:42 @@ -22,7 +22,7 @@ msgid "Running on $0" msgstr "Läuft auf $0" #: src/manifest.json -msgid "Starter Kit" +msgid "Certificates" msgstr "Bausatz" #: src/app.jsx:29 diff --git a/src/app.jsx b/src/app.jsx index 1f671a9..4b3e864 100644 --- a/src/app.jsx +++ b/src/app.jsx @@ -34,11 +34,13 @@ export class Application extends React.Component { } render() { + const path = getRequests(); + return (
-

Starter Kit

+

Certificates

- { cockpit.format(_("Running on $0"), this.state.hostname) } + { cockpit.format(_("Running on $0"), path) }

); diff --git a/src/index.html b/src/index.html index 5182d9b..55b4c60 100644 --- a/src/index.html +++ b/src/index.html @@ -17,7 +17,7 @@ along with this package; If not, see . --> - Cockpit Starter Kit + Cockpit Certificates diff --git a/src/manifest.json b/src/manifest.json index 3e2454a..336fb09 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -6,7 +6,7 @@ "tools": { "index": { - "label": "Starter Kit" + "label": "Certificates" } } } diff --git a/test/check-application b/test/check-application index 2ad5d68..d214ba4 100755 --- a/test/check-application +++ b/test/check-application @@ -18,9 +18,9 @@ class TestApplication(testlib.MachineCase): b = self.browser m = self.machine - self.login_and_go("/starter-kit") + self.login_and_go("/certificates") # verify expected heading - b.wait_text(".container-fluid h2", "Starter Kit") + b.wait_text(".container-fluid h2", "Certificates") # verify expected host name hostname = m.execute("hostname").strip() @@ -43,10 +43,10 @@ class TestApplication(testlib.MachineCase): b.reload(ignore_cache=True) b.wait_present("#content") # menu label (from manifest) should be translated - b.wait_text("#host-apps a[href='/starter-kit']", "Bausatz") + b.wait_text("#host-apps a[href='/certificates']", "Bausatz") - b.go("/starter-kit") - b.enter_page("/starter-kit") + b.go("/certificates") + b.enter_page("/certificates") # page label (from js) should be translated b.wait_in_text(".container-fluid p", "Läuft auf")