Compare commits

..

No commits in common. "411f089bf80a8068d402c67d79d7928a401dfe2d" and "4db299f80582647d3b9ecec407833765afb3d039" have entirely different histories.

3 changed files with 65 additions and 52 deletions

View File

@ -1,54 +1,61 @@
kind: pipeline # this is needed by the RPM build plugin
name: default workspace:
base: /build
path: /
steps: pipeline:
- name: create_targz
image: registry.libreschool.org/libreschool-automation/rpm-pack:latest create_targz:
pull: always image: libreschool-automation/rpm-pack:latest
settings: dest: $$NAME-$$VERSION-$$RELEASE.tar.gz
dir: $$NAME-$$VERSION-$$RELEASE dir: $$NAME-$$VERSION-$$RELEASE
files: files:
- root - root
- createlinks.pl - createlinks.pl
- README.md - README.md
- COPYING - COPYING
when: when:
event: [ push, tag ] event: [ push, tag ]
- name: build build:
image: registry.libreschool.org/libreschool-automation/rpm-build:7 image: libreschool-automation/rpm-build:latest
pull: always
commands: commands:
- yum-builddep -y libreschool-startpage.spec - yum-builddep -y startpage.spec
- rpmbuild -ba libreschool-startpage.spec - rpmbuild -ba startpage.spec
- mkdir out ; mv *.rpm noarch/*.rpm out/ - mkdir out ; mv *.rpm noarch/*.rpm out/
when: when:
event: [ push, tag ] event: [ push, tag ]
- name: sign gitea_release:
image: registry.libreschool.org/libreschool-automation/rpm-sign:latest group: deploy
pull: always
settings:
files: out/*.rpm
gpg_key:
from_secret: gpg_key
passphrase:
from_secret: passphrase
when:
event: tag
- name: gitea_release
image: plugins/gitea-release image: plugins/gitea-release
settings: files: out/*.rpm
files: out/*.rpm checksum:
checksum: - md5
- md5 - sha1
- sha1 - sha256
- sha256 - sha512
- sha512 secrets: [ gitea_token ]
api_key: base_url: https://git.libreschool.org
from_secret: gitea_token
base_url: https://git.libreschool.org
file_exists: skip
when: when:
event: tag event: tag
# deploy_srpm:
# group: deploy
# image: drone-sftp
# host: repo.libreschool.org
# target: /https/nethserver/6/devel/Source/SPackages/
# secrets: [ sftp_username, sftp_key ]
# source: out/*.src.rpm
# when:
# event: tag
# deploy_rpm:
# group: deploy
# image: drone-sftp
# host: repo.libreschool.org
# target: /https/nethserver/6/devel/x86_64/Packages/
# secrets: [ sftp_username, sftp_key ]
# source: out/*.noarch.rpm
# when:
# event: tag

View File

@ -5,7 +5,7 @@ class Startpage extends \Nethgui\Controller\TabsController
{ {
protected function initializeAttributes(\Nethgui\Module\ModuleAttributesInterface $base) protected function initializeAttributes(\Nethgui\Module\ModuleAttributesInterface $base)
{ {
return \Nethgui\Module\SimpleModuleAttributesProvider::extendModuleAttributes($base, 'Management', 50); return \Nethgui\Module\SimpleModuleAttributesProvider::extendModuleAttributes($base, 'Configuration', 50);
} }
public function initialize() public function initialize()

View File

@ -1,8 +1,8 @@
Summary: Manage a start page for all clients Summary: Manage a start page for all clients
Name: libreschool-startpage Name: startpage
Version: 1.0.0 Version: 0.9
Release: 1 Release: 3.ns6
URL: https://git.libreschool.org/LibreSchool/libreschool-startpage URL: https://github.com/libreschool/startpage/
License: GPLv3+ License: GPLv3+
Packager: Paolo Asperti <paolo@asperti.com> Packager: Paolo Asperti <paolo@asperti.com>
Group: System Environment/Daemons Group: System Environment/Daemons
@ -13,7 +13,7 @@ Requires: httpd, sudo,
Requires: nethserver-base Requires: nethserver-base
Requires: python-jinja2 Requires: python-jinja2
Requires: net-tools Requires: net-tools
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}-%{release}.tar.gz
Source1: createlinks.pl Source1: createlinks.pl
BuildArch: noarch BuildArch: noarch
@ -71,5 +71,11 @@ rm -rf %{buildroot}
%doc README.md COPYING %doc README.md COPYING
%changelog %changelog
* Sun Mar 1 2020 Paolo Asperti <paolo@asperti.com> - 1.0.0-1 * Wed Jul 18 2018 Paolo Asperti <paolo@asperti.com> - 0.9-3
- initial release from old startpage package - ui fixing
* Sun Jul 8 2018 Paolo Asperti <paolo@asperti.com> - 0.9-2
- bug fixing
* Sun Jul 8 2018 Paolo Asperti <paolo@asperti.com> - 0.9-1
- initial release