New release

diff --git a/FULLNAMES b/FULLNAMES
index c80b02a908d823353c0c7d62918365e6e396cf31..9c582a2ea0196e86b67a4e342c1e2ef0ce65c253 100644 (file)
--- a/FULLNAMES
+++ b/FULLNAMES
@@ -1 +1 @@
-Salt Minion 3002.2.0 (Python 3)
+Salt Minion 3002.2 (Python 3)

diff --git a/Makefile b/Makefile
index d61b85dd9fead2846ae26267b38c3a7ffb8866a8..27b6b0d0ccbdd4b2decdc3815e57a802c75b7a20 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,36 +7,26 @@ NRELEASE        = $(shell echo $(RELEASE) + 1 | bc )
 YEAR           = $(shell date +%Y )
 
 package:
-       sed    s/VERSION/$(VERSION)/g  oss-pkg-$(PACKAGE).spec.in > 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
+       sed    s/VERSION/$(VERSION)/g  crx-update-$(PACKAGE).spec.in > crx-update-$(PACKAGE).spec
+       sed -i s/RELEASE/$(NRELEASE)/g crx-update-$(PACKAGE).spec
+       sed -i s/PACKAGE/$(PACKAGE)/g  crx-update-$(PACKAGE).spec
+       sed -i s/YEAR/$(YEAR)/g        crx-update-$(PACKAGE).spec
        sed    s/VERSION/$(VERSION)/g  init.sls.in > repo-ng/init.sls
        ../oss-pkg-tools/create_hash.sh $(PACKAGE)
-       rm -rf oss-pkg-$(PACKAGE)
-       mkdir -p oss-pkg-$(PACKAGE)
-       sed s/PACKAGE/$(PACKAGE)/g  $(PACKAGE).sls > oss-pkg-$(PACKAGE)/$(PACKAGE).sls
-       if [ -d repo-ng ]; then cd oss-pkg-$(PACKAGE); ln -s ../repo-ng; cd ..; 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
-       find $(REPO)/noarch -name "oss-pkg-$(PACKAGE)-$(VERSION)-*.rpm"  -exec rm {} \;
-       mv /usr/src/packages/RPMS/noarch/oss-pkg-$(PACKAGE)-$(VERSION)-$(NRELEASE).noarch.rpm $(REPO)/noarch
+       rm -rf crx-update-$(PACKAGE)
+       mkdir -p crx-update-$(PACKAGE)
+       sed s/VERSION/$(VERSION)/g 100-update-salt.sh.in > crx-update-$(PACKAGE)/100-update-salt.sh
+       chmod 755 crx-update-$(PACKAGE)/100-update-salt.sh
+       sed s/PACKAGE/$(PACKAGE)/g  $(PACKAGE).sls > crx-update-$(PACKAGE)/$(PACKAGE).sls
+       if [ -d repo-ng ]; then cd crx-update-$(PACKAGE); ln -s ../repo-ng; cd ..; fi
+       tar hjcvpf crx-update-$(PACKAGE).tar.bz2 crx-update-$(PACKAGE)  
+       rm -rf crx-update-$(PACKAGE)
+       mv  crx-update-$(PACKAGE).tar.bz2  /usr/src/packages/SOURCES/
+       rpmbuild -bb crx-update-$(PACKAGE).spec
+       cp /usr/src/packages/RPMS/noarch/crx-update-$(PACKAGE)-$(VERSION)-$(NRELEASE).noarch.rpm /srv/www/repo/CRANIX/4.3/noarch
+       mv /usr/src/packages/RPMS/noarch/crx-update-$(PACKAGE)-$(VERSION)-$(NRELEASE).noarch.rpm /srv/www/repo/CRANIX/4.4/noarch
+       createrepo /srv/www/repo/CRANIX/4.3/
+       createrepo /srv/www/repo/CRANIX/4.4/
        echo $(NRELEASE) > RELEASE
        git commit -a -m "New release"
-       createrepo $(REPO)
-       git push
 
-init:
-       rm -fr .git
-       mv oss-pkg-packages.spec.in oss-pkg-$(PACKAGE).spec.in
-       sed -i 's/PACKAGE/$(PACKAGE)/g' oss-pkg-$(PACKAGE).spec.in
-       mkdir repo-ng
-       sed -i 's/PACKAGE/$(PACKAGE)/g' init.sls.in
-       mv temlate.sls $(PACKAGE).sls
-       sed -i 's/PACKAGE/$(PACKAGE)/g' $(PACKAGE).sls
-       git init
-       git add .
-       git commit -am "Initial version of $(PACKAGE)"
-       echo "Do not forget to adapt VERSION and the FULLNAMES file"

diff --git a/RELEASE b/RELEASE
index d00491fd7e5bb6fa28c517a0bb32b8b506539d4d..0cfbf08886fca9a91cb753ec8734c84fcbe52c9f 100644 (file)
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-1
+2

diff --git a/VERSION b/VERSION
index 84d564fe16a7a342b1ef78f561501f4bf4d7eb9d..46731661c462482726247407085ef45ee54eb8e3 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3002.2.0
+3002.2

diff --git a/oss-pkg-SaltMinion.spec.in b/crx-update-SaltMinion.spec.in
similarity index 69%
rename from oss-pkg-SaltMinion.spec.in
rename to crx-update-SaltMinion.spec.in
index 364eafe675abb5a35776d3a82d30cbd77a551071..c6ad6ca81add7125dee02cb6cffa1b6907051636 100644 (file)
--- a/oss-pkg-SaltMinion.spec.in
+++ b/crx-update-SaltMinion.spec.in
@@ -1,10 +1,10 @@
 #
-# Spec file for SaltMinion
+# Spec file for SaltMinion Update
 # Copyright (c) YEAR Helmuth Varkoly and Peter Varkoly Nuremberg, Germany.  All rights reserved.
 #
 
-Name:         oss-pkg-SaltMinion
-Summary:      Package to install SaltMinion on OSS-Clients
+Name:         crx-update-SaltMinion
+Summary:      Package to install SaltMinion on CRANIX-Clients
 Version:      VERSION
 Release:      RELEASE
 License:      GPL-2.0
@@ -38,8 +38,10 @@ Authors:
 
 mkdir -p %{buildroot}/srv/salt/win/repo-ng/SaltMinion
 mkdir -p %{buildroot}/srv/salt/packages/
+mkdir -p %{buildroot}/usr/share/cranix/plugins/clients/start/
 cp SaltMinion.sls  %{buildroot}/srv/salt/packages/
 cp -a repo-ng/* %{buildroot}/srv/salt/win/repo-ng/SaltMinion
+cp 100-update-salt.sh %{buildroot}/usr/share/cranix/plugins/clients/start/
 
 %clean
 rm -rf %{buildroot}
@@ -51,8 +53,14 @@ rm -rf %{buildroot}
 /usr/sbin/crx_api_post_file.sh 'softwares/add' /srv/salt/win/repo-ng/SaltMinion/HASH.json
 
 %files
+%dir /usr/share/cranix/
+%dir /usr/share/cranix/plugins/
+%dir /usr/share/cranix/plugins/clients/
+%dir /usr/share/cranix/plugins/clients/start
 %defattr(644,root,root)
 /srv/salt/win/repo-ng/SaltMinion
 /srv/salt/packages/SaltMinion.sls
+%defattr(755,root,root)
+/usr/share/cranix/plugins/clients/start/100-update-salt.sh
 
 

diff --git a/init.sls.in b/init.sls.in
index f772bec273f3b522cdf116fb645bdd8bfa612b1e..7ad73831367971019bd0586b9b0513fa0db43840 100644 (file)
--- a/init.sls.in
+++ b/init.sls.in
@@ -13,16 +13,18 @@
 {% else %}
 {% set ARCH = "x86" %}
 {% endif %}
+{% set version = "VERSION" %}
+{% set name = grains['id'] %}
 
 SaltMinion:
-  'VERSION':
-      full_name: 'Salt Minion 3002.2.0 (Python 3)'
+  '{{ version }}':
+      full_name: 'Salt Minion {{ version }} (Python 3)'
       {% if ARCH == 'x64' %}
-      installer: salt://win/repo-ng/SaltMinion/Salt-Minion-3002.2-Py3-AMD64-Setup.exe
+      installer: salt://win/repo-ng/SaltMinion/Salt-Minion-{{ version }}-Py3-AMD64-Setup.exe
       {% else %}
-      installer: salt://win/repo-ng/SaltMinion/Salt-Minion-3002.2-Py3-x86-Setup.exe
+      installer: salt://win/repo-ng/SaltMinion/Salt-Minion-{{ version }}-Py3-x86-Setup.exe
       {% endif %}
-      install_flags: '/S'
+      install_flags: '/S /master=admin /minion-name={{ name }}'
       locale: de_DE
       msiexec: False
       reboot: False