From d019bd49a6f463a7fff7ba4ae05fc8e6699066f1 Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Thu, 28 Apr 2022 16:17:43 +0200 Subject: [PATCH] M #-: Get rid of obsolete .vib files (cherry picked from commit 419bfe5a450d5b33310f96df473873141809c255) --- install.sh | 7 - share/esx-fw-vnc/Makefile | 14 -- share/esx-fw-vnc/README.md | 44 ----- share/esx-fw-vnc/Vagrantfile | 35 ---- share/esx-fw-vnc/fw-vnc.vib | Bin 2392 -> 0 bytes share/esx-fw-vnc/fw-vnc.zip | Bin 4866 -> 0 bytes share/esx-fw-vnc/vib/descriptor.xml | 33 ---- .../fw-vnc/etc/vmware/firewall/vnc.xml | 175 ------------------ 8 files changed, 308 deletions(-) delete mode 100644 share/esx-fw-vnc/Makefile delete mode 100644 share/esx-fw-vnc/README.md delete mode 100644 share/esx-fw-vnc/Vagrantfile delete mode 100644 share/esx-fw-vnc/fw-vnc.vib delete mode 100644 share/esx-fw-vnc/fw-vnc.zip delete mode 100644 share/esx-fw-vnc/vib/descriptor.xml delete mode 100644 share/esx-fw-vnc/vib/payloads/fw-vnc/etc/vmware/firewall/vnc.xml diff --git a/install.sh b/install.sh index 41a2c334016..01fe4cdafa5 100755 --- a/install.sh +++ b/install.sh @@ -2333,13 +2333,6 @@ WEBSOCKIFY_SHARE_MODULE_FILES="share/websockify/websockify/__init__.py \ share/websockify/websockify/websocket.py \ share/websockify/websockify/websocketproxy.py" -#------------------------------------------------------------------------------- -# Installation packages for ESX hosts to enable VNC ports -#------------------------------------------------------------------------------- - -ESX_FW_VNC_SHARE_FILES="share/esx-fw-vnc/fw-vnc.vib \ - share/esx-fw-vnc/fw-vnc.zip" - #------------------------------------------------------------------------------- # HOOK scripts, to be installed under $VAR_LOCATION/remotes/hooks/autostart #------------------------------------------------------------------------------- diff --git a/share/esx-fw-vnc/Makefile b/share/esx-fw-vnc/Makefile deleted file mode 100644 index 6fb0a210a17..00000000000 --- a/share/esx-fw-vnc/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -.PHONY: fw-vnc.vib clean - -fw-vnc.vib: vmware-esx-vib-author-5.0.0-0.0.847598.i386.rpm - vagrant plugin install vagrant-sshfs - vagrant up - vagrant destroy -f - @echo "Package successfully $@ built" - -vmware-esx-vib-author-5.0.0-0.0.847598.i386.rpm: - wget -O $@ https://download3.vmware.com/software/vmw-tools/vibauthor/vmware-esx-vib-author-5.0.0-0.0.847598.i386.rpm - -clean: - -rm -rf fw-vnc.vib fw-vnc.zip vmware-esx-vib-author*.rpm - -vagrant destroy -f diff --git a/share/esx-fw-vnc/README.md b/share/esx-fw-vnc/README.md deleted file mode 100644 index 3cdae62ae0f..00000000000 --- a/share/esx-fw-vnc/README.md +++ /dev/null @@ -1,44 +0,0 @@ -# Building ESX VIB package - -Requirements: - -1. [Vagrant](https://www.vagrantup.com/) -2. [VirtualBox](https://www.virtualbox.org/) - -Other requirements (automatically get by `Makefile`): - -3. Vagrant plugin vagrant-sshfs -4. [VIB Author](https://labs.vmware.com/flings/vib-author) tool RPM in current directory - -# Build - -VIB package build is based on a deprecated, but still working, *VIB Author* tool. -This tool works fine on old EL/CentOS 6, that's why the build process -(unfortunately) requires the Vagrant+VirtualBox to provide the build -environment with the CentOS 6. - -There are two possible approaches to building the VIB package. - -### 1. Makefile - -Just start the `make` and required Vagrant plugin and latest known -VIB Author tool will be automatically downloaded and new VIB -packages built. - -``` -$ make -``` - -You can find the fresh packages in `fw-vnc.vib` and `fw-vnc.zip`. - -### 2. Manual - -1. download [VIB Author](https://labs.vmware.com/flings/vib-author) tool RPM into the current directory -2. start Vagrant - -``` -$ vagrant plugin install vagrant-sshfs -$ vagrant up && vagrant destroy -f -``` - -You can find the fresh packages in `fw-vnc.vib` and `fw-vnc.zip`. diff --git a/share/esx-fw-vnc/Vagrantfile b/share/esx-fw-vnc/Vagrantfile deleted file mode 100644 index 37037553c9d..00000000000 --- a/share/esx-fw-vnc/Vagrantfile +++ /dev/null @@ -1,35 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : -# -if Dir.glob('vmware-esx-vib-author*.rpm').size != 1 - STDERR.puts <5}TMrmJXZAcBnO zsDwQbVK^X$Au5;*h^Q!wxCAqbz>z=#BPs%ls6-~aD_ z|1F164W>XWWH^m!2sJ}#JQ9>7iv_V>Ju~*}UlxnUgLpF;Q5LY4kg~M6h9)SLFI(gR zu@RWjsc}R~QH&H-#lYO@A*@1`I3kbdXjK@@ogTomFofs9^ME)!m^uXH992RpCnY#5iEZ~gU6#J$fE9tw%Jcz@QprgIV`h@nB#PmBQ>~%2 z1X#s%hEff%V0)niqW}&)!|RjLl$?o2H8_VsqxArKT0V{jkBtL50X8K{s2HG-3d1={ zN(N2_C21Vy{>Be9dmAe!NSs3wG=so;6Tumbt5xdhxboRk;DS@u*AfgoAYmi}!o3>Y;es+*f+ZV0PU9Z8`wp!%%E z(wDz4d*(8*S^E3o%hpCGvRO2d2uyIl_~0603LJ|870a44I5U~F0_E^Uo@_)eG6^B(6m%TdT-~agPkSFlXAx| z{I^txnEdtp7Nhr}15a-}Y$4{opMJpfUunmExdZgVr_Ww~-sqVB;&QKBv4#Bb_Q~@$ z-U$!x&mTRFDojRA4V%`^ADy4`qlbI_f`Hp52kVy{+3UY^>dL)_!fQX~wY0s&g3}+F zO;J%!lf&)@Z=8jaW0%9lDXpFEzQfCkou3U%aqcgfD*m4GtvdIft%FNX)!?$DHZ6XS zzKvP(@6c^kX{9|=Uraro@EB+#@yX8N z?iCJ{O=sB;c^TULh#1>|k^1>3vdcc2IA>kH=0&pY)VhKT0jfXuw1)_9Esc&1O5k1& zNx+W}CYPL8eCNjIn1;~0mkAYL?<-Uf?Fs4#>fdO;>A6%8$t6}UB676jI?ETtDdP`Z zyGGAA`Bk`OANyEVczkVo!-ewv){8x93-kRRersBDXi@(rGh^L1?|w&GcIGMj>IZj7 zY9l5#1+F9O3X&Hub!{ULSLU1CZU3Wr_{m}Ms?dvHSN`DNB#|`?pXC3&YG?K6P{rtx z>rN%YfT8itpB*lB%J6FpTGvg8Hs2{yJa698o0yYeSRE+Yc&SP4AFmWfxk`H6ZyS)-tyrn@s8RQj4-!^%V!LACpI3dJ-zqRp z3~v6$B70vdXZO+uFU7sg2w}xWgFTNUtf;UJ#}-jB$+?#+3e)Y@-O4r+Ae@TcEv{ql zguCZ7jE9X}37faF-(`FIsKhVV)2CqfawTM+walUEes|`nF{{tb&UoKzQBRCE-?olO z%BdHBZy%dId6Ek~DSl_$etD4bSxq+EW^3|Q z>TjhDlJWHh!(Ww3B!z2g#rxATYvRXpyVw2$^IO=^w=F)uJa`uxIFJ?d(}GP4Z$=!o zdtmcroSbPXS0Tan_>0D@mLsWuQQk3AZ(z#qC#BZDr?zX|Rh-&(xY;E6XAwj^%rf86 z9}-pbajOWr3kKcxNTzwg@?$&O6h_XiRp(^aZ|)Tu=0&sxa>foUXx`;kw`a`fr`n>_ zw(g_Q^;>N!1Lx{omueg5O2e<1x_vI+b@6VR_Bjmr1jQn~byr>bQj>NC>Jaa`rPm-&0Da_oHA9X!#Ez^gc{ zJXaJE=qm@vjUxrD3z;26g0W>lu9Xc(rytOEotF~KgXaxW3(9zatdxP~+C#1$J$Qq; zIY;m(9LggEi@*KE@F6W=54y{#fgsgbCuwY*!z*;`OujI5TS6K2gG*JWKQuDyTtMkP zPwd?TB?p1oADX@w_0TBleqDmXqU`VCqQFaiG6M&;|DVsf|HM3_Gx1M z!F3js1M!QmR$==%@5WO%#!i$%Wg67_Cw*ZQ6SLL2=sh;X1bB?wr`}8lHBoXfI~-=y zGbxTPPk7%xDrVFiYy-IC5Ed~=_)eC*Y2)2Y*Ir!e)21gDMlya5^OJOnSf5I5KeJbj zI+r?|eff@>KC{(B_2cBDabo(^;v(svJoq%4WqC3kaH_aJp#MWEv2$lcQMSUi`MPo^ zG5_mjHkxuzHY54|;aj<|&#=UT+ClXTVcU{>v0>jx&h0Rd1-edzVR@L|4Bo~E{c_~d zx{)ijDt{BgVXg2sdNrz53rUkq%cp9Ip1vPG?QWY@K{kz^_)yI#R2|XBdWW^3W#Y)R zFdV0#D;art7-Mu}t(Pr0U{4AX<{7-tojtu+z#6g4VO-)KB}V*;fG&w3k|=a8a()e_ zXxy?GcH8Z}CuvotZS}|y5=}W8HDDj0!)V{CU{`;C8q^X`uWX9-!*w-ukZOmeab*p| zHS@fdIHBE&2Wm)_&Y+uPG*eWs?RjSr;(}S>sq{&Who`ojA``4;$aAcWP{zg*Hi6#i zYzfRJ7_z9{LoDEMQ$o6{e)64lzHqiaf0W%S(;6~LhBH6$FY8(!_Y)kWF8VIUk)JPY zDZD>3LFXm;-8I{CtJU)Cz3z_Wcc(!3B-geDc`z+S9kVw`;w&7H_qf|}sBLE8ZF8m9 zGSz5rG}uhz)z}{zB)*)@*L&@jWX_FdQZ?W6JLOsE)+doXA+XQ%3s35r|;_A{k@?rQ?2i| z^Y815u;qDP`O1h_>7g>j4p)f)*k9zT@V!W{yq+a6y&iU=xp(}ym5iycP+2UAiZ&Z} zxf-ys8s=Go>qR6s9yoO4keNO4E=xDB%`Y;uFr#YjdQ}wnO+jHkfzXYh=)TuM>Ueuf zzub20X&v*qUdb!ZWHq-Gs>xm-o=)SBwIR*Bs%e2Kyo932aD1Yb7k+X_ zM89ro=zjVMwi@@!N7uxQ5i)Fcny2v#3piz|69!`D=@Lg{%0bga?S2Zu}Bmb`K*~-DVqFG+O4jW=gpghJ&0u zAQBda92XpFG;}Skh>a;TB)1dtY*2M&%=)H#Ip>_T;bu2VVKfeun%G*XcJG5}E*UOk z)Klwh6M0Iz+QC$Gz#1ot7iCQd3usd_xrE+q7FS~`-N)LL(MqhkQ}{q2yne*9^&tN0 zwWf5*J#(A%&r|2V*uEoVhENP=pVPphttznj_kz^!z;pf`em-Y#woctsRx zCz{iKDf%FJe^q6qCENI<@2GINtwcVOYjIaLer$YCr9in@*CgXRrR)o;IK<$d$z325 zon;E3spb7pv2s<43Gq4$F2>1%#=u-S-rJ`N-JhN0xjjms37V>>@lT15L+RkJmYwLD zER{ns;aRohCeFS$*>oj<7XHlCY8&R>G`4#CA|W5jTBsaF5gVNzabi@vu3bVa*xkwaeMw%~gj9*dd zecFCF0Egkyz-LZ^**G4mx%f!CrJExtqm9-C-kCUTnY#R=$B%bVtP78-fRco?o1FTK)Ud7%ZUygHv1?U_dmxK32 zOAsS@a!p`}b1R)d+5e3ECa^Hc+p63BI#ppqc~%%UD6jc4kz62oUfe#?P}g}^a#6Hm zeOFPCoU6RO*05U-GLtJ{?Cry29DNMp0*1%yzu)(NBR6AKH{pC(S1=+i@s20#xkMDt z&t(!7+>_ki^#uxEHIFT+t|q;gyE_DxTx|OH4XnQFnE#$1EPnHq5hehj|CpS}KR;n- z!TXZi#+%d2*^*n$)!O;3wS}jnxt1^3!`caKYT@GIVPWpJ z`cJ~G%W#@->Dh;+{Yly&UGY-5FW6BbrP_LMd2^Q62auKQG2yQd_sG?gwg=dwxf8(Y zl?Ih!62hO&sDDl&hJOF55_off*?wxx>-#$J6{oCWkcdkEY@Q(z!)yl!A*PumZP8qA zTof%UMP&>|i3zuY8t*uqUn zT}`tT!r!c7Ai=9!6x`^?x(pha)zB;!FP7ahqqeoTbW5_*L?_ni;ia|?tu*Z`Y^ae6 znsT$%Sa%!_eg6Qu=p@X2)~Assv*4a4MJLupT#w=+xK7$jd=2mip~Ny=J;Qx1dkk1d z1JEJ`ykF`@CN8r*neUQg=fSrVBFw5>Hj}_=L>(ZoUsMd~!Llb1Fq8@#nzDPE9NIr^ zi`U1>RJA@%$AAqa#dOdR1jmiMiMB|8D|X>#8jlQF{O4`OLGS;v&HUPW1ul$mFE@Hua`dQqZ6Uh zsiZ8ppheL5zp3QdoWd`nSyAaJx-gi{)o15|ApKpvz z%l8NkxWSKwc%9W@Ag^HY)CT+noTD40YlTVjtb#h2kVw>E1W9erRd zEl##Et91J|7Jb6Gc^*sUuV8C;bah()pi}^1kH3WE)@OgZtUbJQ5aw1b9&rrYg<~t` zz71o5fky4Y^R!UlkPqq?z_ZDf7@R(O6hQbjZy*aXWQRVF40VJso@|rzmp>X9Iu6_V@Slk*M)!m&V@b}%nN2`<=2wn7n zJuU{`^K)bhF*XHAFc2Nj-`yK2cju8CTArq_xGEgCkA19Wk!F0(45?Q8%$SQI^ zr|FO$ff#3Bs@0uvf93d{{j2IVGA66Q!F#8xt{}>$Q+`d3`^I~(X*en2c!--B6bt@s zgtOBp`V)FF=*XR=I5@vYlGYG*3f~{k&jS6VJTTl)cqyXvX;5`;N3q~1YUm*% zXOR8Q>^9SBA)PG3EAjA*8@=>ldgU2?dm}$PGi&w-VMdxaVsZNZ7N=QM83l*Z4yOI7 zpI}f4zGjxvH>EBGJ;l4clIUbcEm$M)==~~Fvl5jx@FBJE){)+Ew&#(wZ}(|q*(KTV znIV@~3CHO9hwCce%RJeD3=Wmcwf4K`&MWa12US$_Y-RB=E;z)-^pM!oA^_Y6ygVLmiexaZV!+`NLI@dj;~q~Z#0XNL(e1_(+b z*Q(h1#+hoPiBlospj2@#_bG|4k40PELylfR_S*2P6~g6BW$mQ8g+xZ>q51>dCN>fc^Q`K8lkMW9g^y#Y;`opN~XNk%BF)XRCF9P(|mj?~pC0 zNXo*j9y`4XXcff3iLxnwrK80>zsf~>2pYD@M;>1cBfOG-X}#J zG*4w#H$F(*K7%8jBS&7~uHs`}*~&dMn9Y38m@c?_N^aWEUW(uqAUO)`ct7YUmT=p0 z5c9rF- z+nm<)ef#kaVUp)o-5?P6#?MT0#u>Tzra(;m2MO~xujjz(HG3VZ7VVv8T^?ihsLp(Q zWXs37p*FkK!}$|p612-%6VIQjZ|9$vhP6B7*q8Kb0skmJ;ZF}(X!fbg8UDkxAELPB zcDkT;vPeO3_gJz~P)X4K@3zik-Tu!}81&EbzneUNEB^+sf9d|2(;nMIe`DC+>c3&= tf7DWs`0(Fo^tbG9#`rH;U=Tgd|A#o#m4O)lyoLT~WRHCIgYci-e*kVt3*P_$ diff --git a/share/esx-fw-vnc/vib/descriptor.xml b/share/esx-fw-vnc/vib/descriptor.xml deleted file mode 100644 index ce5c4674f09..00000000000 --- a/share/esx-fw-vnc/vib/descriptor.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - bootbank - fw-vnc - 1.1.0-1 - OpenNebulaSystems - Firewall rules to enable VNC traffic - Firewall rules to enable VNC traffic - - - - - - - - - - - false - - - etc/vmware/firewall/vnc.xml - - community - true - true - false - true - false - - - - diff --git a/share/esx-fw-vnc/vib/payloads/fw-vnc/etc/vmware/firewall/vnc.xml b/share/esx-fw-vnc/vib/payloads/fw-vnc/etc/vmware/firewall/vnc.xml deleted file mode 100644 index c2d1d9f0c80..00000000000 --- a/share/esx-fw-vnc/vib/payloads/fw-vnc/etc/vmware/firewall/vnc.xml +++ /dev/null @@ -1,175 +0,0 @@ - - - VNC - true - false - - - - - inbound - tcp - dst - - 5900 - 5987 - - - - - inbound - tcp - dst - - 5990 - 6998 - - - - - inbound - tcp - dst - - 7000 - 7999 - - - - - inbound - tcp - dst - - 8001 - 8041 - - - - - inbound - tcp - dst - - 8046 - 8079 - - - - - inbound - tcp - dst - - 8081 - 8099 - - - - - inbound - tcp - dst - - 8101 - 8181 - - - - - inbound - tcp - dst - - 8183 - 8199 - - - - - inbound - tcp - dst - - 8201 - 8299 - - - - - inbound - tcp - dst - - 8303 - 8888 - - - - - inbound - tcp - dst - - 8890 - 8999 - - - - - inbound - tcp - dst - - 9001 - 9079 - - - - - inbound - tcp - dst - - 9081 - 11999 - - - -