From bf0fb12cb7a34aee15a9dd343cf958b80dabda12 Mon Sep 17 00:00:00 2001 From: CEPHALIX GIT ADMIN Date: Mon, 22 Oct 2018 22:20:36 +0200 Subject: [PATCH 1/1] Initial version --- LICENSE | 1 + Makefile | 29 +++++++++++++++++++++ RELEASE | 1 + VERSION | 1 + Win10ActKMS.sls | 21 +++++++++++++++ oss-pkg-Win10ActKMS.sls | 58 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 111 insertions(+) create mode 100644 LICENSE create mode 100644 Makefile create mode 100644 RELEASE create mode 100644 VERSION create mode 100644 Win10ActKMS.sls create mode 100644 oss-pkg-Win10ActKMS.sls diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..c70fc0d --- /dev/null +++ b/LICENSE @@ -0,0 +1 @@ +Copyright (c) 2017 Peter Varkoly and Helmuth Varkoly Nürnberg. All rights reserverd. \ No newline at end of file diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..50c588a --- /dev/null +++ b/Makefile @@ -0,0 +1,29 @@ +PACKAGE = $(shell basename `pwd` ) +DESTDIR = / +REPO = /srv/www/repo/salt-packages/ +VERSION = $(shell cat VERSION ) +RELEASE = $(shell cat RELEASE ) +NRELEASE = $(shell echo $(RELEASE) + 1 | bc ) +YEAR = $(shell date +%Y ) + + +package: + if [ ! -e oss-pkg-$(PACKAGE).spec ]; then cp ../template/package.spec oss-pkg-$(PACKAGE).spec; fi + sed -i s/VERSION/$(VERSION)/g oss-pkg-$(PACKAGE).spec + sed -i s/RELEASE/$(NRELEASE)/g oss-pkg-$(PACKAGE).spec + sed -i s/PACKAGE/$(PACKAGE)/g oss-pkg-$(PACKAGE).spec + sed -i s/YEAR/$(YEAR)/g oss-pkg-$(PACKAGE).spec + mkdir -p oss-pkg-$(PACKAGE) + if [ ! -e $(PACKAGE).sls ]; then cp ../template/template.sls $(PACKAGE).sls; fi + sed s/PACKAGE/$(PACKAGE)/g $(PACKAGE).sls > oss-pkg-$(PACKAGE)/$(PACKAGE).sls + if [ -d repo-ng ]; then ln -s ../repo-ng/ oss-pkg-$(PACKAGE)/repo-ng; fi + tar hjcvpf oss-pkg-$(PACKAGE).tar.bz2 oss-pkg-$(PACKAGE) + rm -rf oss-pkg-$(PACKAGE) + mv oss-pkg-$(PACKAGE).tar.bz2 /usr/src/packages/SOURCES/ + rpmbuild -bb oss-pkg-$(PACKAGE).spec + mv /usr/src/packages/RPMS/noarch/oss-pkg-$(PACKAGE)-$(VERSION)-$(NRELEASE).noarch.rpm $(REPO)/noarch + echo $(NRELEASE) > RELEASE + git commit -a -m "New release" + git push + + diff --git a/RELEASE b/RELEASE new file mode 100644 index 0000000..c227083 --- /dev/null +++ b/RELEASE @@ -0,0 +1 @@ +0 \ No newline at end of file diff --git a/VERSION b/VERSION new file mode 100644 index 0000000..d3827e7 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +1.0 diff --git a/Win10ActKMS.sls b/Win10ActKMS.sls new file mode 100644 index 0000000..0dded16 --- /dev/null +++ b/Win10ActKMS.sls @@ -0,0 +1,21 @@ +############################################################################### +# SLS: PACKAGE +# Copyright (c) 2018 Helmuth Varkoly, Nuermberg, Germany. +# All rights reserved. +# +# Author: Helmuth Varkoly +# +# Description: SLS to use with OSS's softwaremanagement +############################################################################### +{% set status = salt.license.licensed %} +{% set LIC = salt['grains.get']('LIC_Win10ActKMS') %} + +PACKAGE: +{% if status != 'True' %} + cmd.run: + - name: 'cscript.exe //B "%systemroot%\system32\slmgr.vbs" /ipk {{ LIC }}' + - name: 'cscript.exe //B "%systemroot%\system32\slmgr.vbs" /skms KMS_SERVER_IP:KMS_SERVER_PORT' + - name: 'cscript.exe //B "%systemroot%\system32\slmgr.vbs" /ato' + - name: 'cscript.exe //B "%systemroot%\system32\slmgr.vbs" /upk' +{% endif %} + diff --git a/oss-pkg-Win10ActKMS.sls b/oss-pkg-Win10ActKMS.sls new file mode 100644 index 0000000..079b12d --- /dev/null +++ b/oss-pkg-Win10ActKMS.sls @@ -0,0 +1,58 @@ +# +# Spec file for PACKAGE +# Copyright (c) YEAR Helmuth Varkoly and Peter Varkoly Nuremberg, Germany. All rights reserved. +# + +Name: oss-pkg-PACKAGE +Summary: Package to install PACKAGE on OSS-Clients +Version: VERSION +Release: RELEASE +License: GPL-2.0 +Vendor: Peter Varkoly and Helmuth Varkoly +Packager: peter@varkoly.de +Group: Productivity/ +Source: %{name}.tar.bz2 +BuildArch: noarch +BuildRequires:unzip +#Requires: +Requires: filesystem +PreReq: salt-master +PreReq: %fillup_prereq +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +Package to install PACKAGE on OSS-Clients + +Authors: +-------- + helmuth@varkoly.de + peter@varkoly.de + + +%prep +%setup -n %{name} + +%build + +%install + +mkdir -p %{buildroot}/srv/salt/win/repo-ng/PACKAGE +mkdir -p %{buildroot}/srv/salt/packages/ +cp PACKAGE.sls %{buildroot}/srv/salt/packages/ +cp -a repo-ng/* %{buildroot}/srv/salt/win/repo-ng/PACKAGE + +%clean +rm -rf %{buildroot} + +%pre + +%post + +/usr/sbin/oss_api.sh POST 'softwares/add' '{"name":"PACKAGE","manually":false,"description":"PACKAGE","softwareVersions":[{"version":"VERSION"}]}' + +%files +%defattr(644,root,root) +/srv/salt/win/repo-ng/PACKAGE +/srv/salt/packages/PACKAGE.sls + + -- 2.43.0