Merge branch 'master' of github.com:hyphanet/wininstaller-innosetup

.github/workflows/ci.yml

@@ -43,23 +43,23 @@ jobs:
         "%programfiles(x86)%\Inno Setup 6\iscc.exe" "FreenetInstall_InnoSetup.iss"
       shell: cmd
 
-    - name: Sign the installer
-      uses: nextgens/[email protected]
-      if: ${{ github.event_name != 'pull_request' }}
-      with:
-        certificate: '${{ secrets.CERTIFICATES }}'
-        credentials: '${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}'
-        key-uri: "projects/fpi-codesign/locations/europe-west3/keyRings/code-signing/cryptoKeys/certificate/cryptoKeyVersions/1"
-        timestamp-url: 'http://timestamp.comodoca.com'
-        description: 'Freenet Installer'
-        description-url: 'https://freenetproject.org'
-        folder: "Output"
-        recursive: true
-
-    - name: Verify the signature
-      if: ${{ github.event_name != 'pull_request' }}
-      run: call "%programfiles(x86)%/Windows Kits/10/bin/10.0.17763.0/x86/signtool.exe" verify /v /pa "Output/FreenetInstaller.exe"
-      shell: cmd
+#     - name: Sign the installer
+#       uses: nextgens/[email protected]
+#       if: ${{ github.event_name != 'pull_request' }}
+#       with:
+#         certificate: '${{ secrets.CERTIFICATES }}'
+#         credentials: '${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}'
+#         key-uri: "projects/fpi-codesign/locations/europe-west3/keyRings/code-signing/cryptoKeys/certificate/cryptoKeyVersions/1"
+#         timestamp-url: 'http://timestamp.comodoca.com'
+#         description: 'Freenet Installer'
+#         description-url: 'https://freenetproject.org'
+#         folder: "Output"
+#         recursive: true
+# 
+#     - name: Verify the signature
+#       if: ${{ github.event_name != 'pull_request' }}
+#       run: call "%programfiles(x86)%/Windows Kits/10/bin/10.0.17763.0/x86/signtool.exe" verify /v /pa "Output/FreenetInstaller.exe"
+#       shell: cmd
 
     - name: Upload the installer as an artifact
       uses: actions/upload-artifact@v2

FreenetInstall_InnoSetup.iss

@@ -345,7 +345,7 @@ begin
   if not FileExists(ExpandConstant('{app}\freenet.ini')) then begin
     sConfigLines[0] := 'fproxy.port=' + sFproxyPort;
     sConfigLines[1] := 'fcp.port=' + sFcpPort;
-    sConfigLines[2] := 'pluginmanager.loadplugin=JSTUN;KeyUtils;ThawIndexBrowser;UPnP;Sharesite';
+    sConfigLines[2] := 'pluginmanager.loadplugin=JSTUN;KeyUtils;UPnP;Sharesite';
     sConfigLines[3] := 'node.updater.autoupdate=true';
     sConfigLines[4] := 'node.downloadsDir=.\downloads';
     sConfigLines[5] := 'End';