maxmustermann
/
pve-no-subscription
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated to PVE5

This commit is contained in:
Andreas Steinel 2018-03-20 22:43:22 +01:00
parent 05f9987d09
commit c630b60111
11 changed files with 78 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -3,4 +3,6 @@ debian/files
debian/pve-no-subscription.debhelper.log
debian/pve-no-subscription.substvars
debian/pve-no-subscription/
debian/debhelper-build-stamp
*.deb

6
Dockerfile Normal file
View File

@ -0,0 +1,6 @@
FROM debian:stretch
RUN apt-get update -qq && \
DEBIAN_FRONTEND=noninteractive apt-get install -qq make dpkg-dev debhelper lintian && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

15
Makefile
View File

@ -6,14 +6,12 @@ all:
install:
@mkdir -p $(DESTDIR)/etc/apt/apt.conf.d
@mkdir -p $(DESTDIR)/etc/apt/sources.list.d
@mkdir -p $(DESTDIR)/etc/apt/trusted.gpg.d
@mkdir -p $(DESTDIR)/usr/share/pve-no-subscription
@install -m 644 apt-hook $(DESTDIR)/etc/apt/apt.conf.d/99-pve-no-subscription
@install -m 755 no-subscription-warning.sh $(DESTDIR)/usr/share/pve-no-subscription
@install -m 644 no-subscription-warning-ext4.patch $(DESTDIR)/usr/share/pve-no-subscription
@install -m 644 no-subscription-warning-ext6.patch $(DESTDIR)/usr/share/pve-no-subscription
@install -m 644 no-subscription-warning-js.patch $(DESTDIR)/usr/share/pve-no-subscription
@install -m 644 no-subscription-warning-*.patch $(DESTDIR)/usr/share/pve-no-subscription
@install -m 644 pve-no-subscription.list $(DESTDIR)/etc/apt/sources.list.d
@install -m 644 pve-no-subscription.asc $(DESTDIR)/usr/share/pve-no-subscription/proxmox_ve.asc
package-clean:
@rm -f ../$(PACKAGE)_* debian/files debian/$(PACKAGE).substvars debian/$(PACKAGE).debhelper.log
@ -27,7 +25,12 @@ package: package-clean
@echo "-------------------------------[ dpkg-buildpackage ] -------------------------"
@env -i PATH=/usr/bin:/bin SHELL=/bin/sh dpkg-buildpackage -I.git -i'\.git/' < /dev/null
@echo "-----------------------------------[ lintian ] -------------------------------"
@lintian
@lintian || true
@echo "-----------------------------------[ package ] -------------------------------"
@ls -1 ../$(PACKAGE)*deb
@mv ../$(PACKAGE)*deb .
@ls -1 $(PACKAGE)*deb
docker-package:
@docker build -t pve-no-subscription .
@docker run -t --rm --user 1000 --volume $(PWD):/tmp/workdir --workdir /tmp/workdir pve-no-subscription make package

11
README.md Normal file
View File

@ -0,0 +1,11 @@
# Proxmox VE No-Subscription Patch
This patch removes the 'No valid subscription' warning in Proxmox VE and should only be used
in test or demo environments. Please consider [buying a subscription](https://www.proxmox.com/en/proxmox-ve/pricing)
and supporting the development of Proxmox VE.
## Technical Implementation
The patch does automatically be invoked after a package update. It is built as
an APT hook that automagically applies the patch if necessary.

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
pve-no-subscription (1.5) UNRELEASED; urgency=low
* Porting APT sources file to Stretch
* Adding patch for new structure found in PVE 5
-- Andreas Steinel <A.Steinel@gmail.com> Tue, 20 Mar 2018 21:18:53 +0100
pve-no-subscription (1.4) UNRELEASED; urgency=low
* Adding patch for new file in js

2
debian/compat vendored
View File

@ -1 +1 @@
7
9

4
debian/control vendored
View File

@ -1,10 +1,10 @@
Source: pve-no-subscription
Section: admin
Priority: optional
Build-Depends: debhelper (>= 7)
Build-Depends: debhelper (>= 9)
Build-Depends-Indep: make (>= 3.81)
Maintainer: Andreas Steinel <A.Steinel@gmail.com>
Standards-Version: 3.9.6
Standards-Version: 3.9.8
Vcs-Git: https://github.com/lnxbil/pve-no-subscription.git
Vcs-Browser: https://github.com/lnxbil/pve-no-subscription

31
no-subscription-warning-js2.patch Normal file
View File

@ -0,0 +1,31 @@
--- /usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js.orig 2018-03-20 21:15:12.881689428 +0100
+++ /usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js 2018-03-20 21:15:40.006260631 +0100
@@ -353,7 +353,7 @@
success: function(response, opts) {
var data = response.result.data;
- if (data.status !== 'Active') {
+ if (false) {
Ext.Msg.show({
title: gettext('No valid subscription'),
icon: Ext.Msg.WARNING,
--- /usr/share/pve-manager/js/pvemanagerlib.js.orig 2018-03-20 21:08:02.704629461 +0100
+++ /usr/share/pve-manager/js/pvemanagerlib.js 2018-03-20 21:11:08.248537461 +0100
@@ -327,7 +327,7 @@
'p': gettext('Premium')
},
- noSubKeyHtml: 'You do not have a valid subscription for this server. Please visit <a target="_blank" href="http://www.proxmox.com/products/proxmox-ve/subscription-service-plans">www.proxmox.com</a> to get a list of available options.',
+ noSubKeyHtml: 'This server is receiving updates from the Proxmox VE No-Subscription Repository. Please visit <a target="_blank" href="http://www.proxmox.com/products/proxmox-ve/subscription-service-plans">www.proxmox.com</a> to get a list of available options.',
kvm_ostypes: {
'Linux': [
@@ -29941,7 +29941,7 @@
pveGuidePath: '/pve-docs/index.html',
onlineHelp: 'getting_help',
- invalidHtml: '<h1>No valid subscription</h1>' + PVE.Utils.noSubKeyHtml,
+ invalidHtml: '<h1>Community Edition</h1>' + PVE.Utils.noSubKeyHtml,
communityHtml: 'Please use the public community <a target="_blank" href="http://forum.proxmox.com">forum</a> for any questions.',

8
no-subscription-warning.sh
View File

@ -32,7 +32,15 @@ case "$TYPE" in
cd / && patch --no-backup-if-mismatch -l -p0 < /usr/share/pve-no-subscription/no-subscription-warning-js.patch
echo "------------------------------------------------------------------------------"
fi
if [ $( grep -c "if (data.status !== 'Active') {" /usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js ) -gt 0 ]
then
echo "---------------[ Patching with No-Subscription-Removal-Patch ]----------------"
cd / && patch --no-backup-if-mismatch -l -p0 < /usr/share/pve-no-subscription/no-subscription-warning-js2.patch
echo "------------------------------------------------------------------------------"
fi
;;
*)
echo "Unknown Type! Sourcefile not found!"
;;

30
pve-no-subscription.asc
View File

@ -1,30 +0,0 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.10 (GNU/Linux)
mQGiBEkGw8URBACes0Nn6KGrblcNfylEonfSuqEyCDz4P0SoPc09ieqhacdJYZZu
gOJkdAQMESUvVG9S/KolkQI0eR3VqW5PxdC7Uon8lnLofy+iicJhaZvBQA8voOJ9
Myv4SrrBPrsa64pLppZ2zYJ2Vj+x26tvYRG1L8G20FDKejnrcLmAOLz+twCgo5rj
Lcyh1gGAE/ktluKIS6EpfmsEAJAjyiiDs2HZcBh7RrlV25kZEk7rwwrrMXmkGpBb
iElZjbRY6cHl+IvwEHD89ShuADuiEOVMqQ8nSbaFQAblqBK+Q1klZUxmppw1UfG5
+x3X7MrULg0YAgAMqwBPgYrAYfV6tdzO3HY6dP5aRNBVYxCgvnXpHw4XW4GC8qRO
NmBPBACLSxG4Q2md/6jHVnoQT4UsPA5Nn2imKsLqS62WQBQyM8W+LtlyxT+QAf+t
+D/XFv5ZUQQq766cR4WnmOkNLAqmFaSrUF2T58UPxOC6TsTkrFkI+kVJFqHedag2
9n+EFXK/DzrsmElWiMyYuMYkOzNn/2cbYnpLq4zO5cwi7BNoRrQxUHJveG1veCBS
ZWxlYXNlIEtleSA8cHJveG1veC1yZWxlYXNlQHByb3htb3guY29tPohgBBMRAgAg
BQJJBsPFAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQwjrH9JiH+VqTLwCf
TVzFdNADeZ00bKpyE8u4BHZJK+4AmwVbhpnb4EkSHYqNhrhEIVSynxm0uQINBEkG
w8oQCAD323YC4+yp1fJGyI2o8GjnPWKRbmJPhoaeungGkFD0M2Ke2/NlgoQnwwyH
FRCLxmjc48r++hlSN+OhVuGrvSl5mh0R3Tv5m17OD1KmkAMT9TcrZ7mqn2D79iv3
TkO27Z76Rs+Wnfu/dc+85wCJDGx9oK8hmJTu6Qc62AkdVCfTULoKSQ3u7LFkGQP9
I+wtOLnLIc8TpGNuwJ97gIAsfZEkbg3zS39loPwQdIV4b48Hfiz7uMEc4Zwx2bqL
+6sp1vK3jfr7Vb1vQyqG9pvDQ5LSbjh9PCCEmbLtyEIDx8hogNZ9M0ShgZzOwRj4
vF/sdAdxIT4/7TlMi8jzZqFYSDN/AAMFCACBFBtH1KF45gt70BwgDDv+2zxCy3nP
3kT2W2f2P3OzTSsu0HGGrIZFtllemAVv89sXlJvZEOzIDvWFizwTiaSW0orj1ni4
Rz5tNIKnv2T1nJbKWnK7hKO+VKopSCADfFW4FxOwnkV1tV/k7WtCsP+y7X4b/9PA
EFDYY81MZo3pXvvk989SmoNL2mAdcVYRn1vVCAsciVX6QZFuaupFl4J+57G0OO9P
tNXn9Hesw7qMo0H52WLp/l8WOhKcghV3+2V4NgpPqZiWD0bOclSO41gmeRWyNo0h
lVzmRVZF0Np9gXzIBVvaq3pHMglb8rOLm/AsNxgZlDe1PqJiSWFZR96EiEkEGBEC
AAkFAkkGw8oCGwwACgkQwjrH9JiH+VrCsgCfQQwtSer1YsUF9zYG5jzVONe2Ms0A
nRwQSm7uGTkFGHhEVkqTPwzNUzg6
=6GBj
-----END PGP PUBLIC KEY BLOCK-----

2
pve-no-subscription.list
View File

@ -1,2 +1,2 @@
deb [arch=amd64] http://download.proxmox.com/debian jessie pve-no-subscription
deb [arch=amd64] http://download.proxmox.com/debian stretch pve-no-subscription