diff --git a/CHANGELOG b/CHANGELOG index 162ade5..5e22cf2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -81,6 +81,7 @@ - Reimplmented auto upgrade after CLI/GUI split - Added initial tests - Exclude lists have been updated + - Removed Windows installer from the project. We need to come up with a better solution ## 2.2.2 - 14/12/2023 (internal build only) - Fixed backup paths of '/' root partitions diff --git a/PRIVATE/README.md b/PRIVATE/README.md index d4f3978..472e96f 100644 --- a/PRIVATE/README.md +++ b/PRIVATE/README.md @@ -8,4 +8,3 @@ In order to use them at compile time, one needs to run `compile.py --audience pr 1. You can create a file called _private_secret_keys.py to override default secret_keys.py file from npbackup 2. You may obfuscate the AES key at runtime by creating a file called `_private_obfuscation.py` that must contain a function `obfuscation(bytes) -> bytes` like `aes_key_derivate = obfuscation(aes_key)` where aes_key_derivate must be 32 bytes. -3. You can create a distribution default configuration file here called _private.npbackup.conf.dist that will be bundled with NPBackupInstaller if present \ No newline at end of file diff --git a/README.md b/README.md index a1cd382..cac3e29 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,6 @@ Works on x64 **Linux** , **NAS** solutions based on arm/arm64, **Windows** x64 a - VSS snapshots* - Automatic cloud file exclusions (reparse points) - Windows pre-built executables* - - Windows installer - Additional security - Repository uri / password, http metrics and upgrade server passwords are AES-256 encrypted - Repository permissions allowing to limit clients @@ -86,7 +85,7 @@ You may install npbackup via PyPI or use the pre-built executables. ### Prebuilt executables On linux, copy `npbackup` executable to `/usr/local/bin` and make it executable via `chmod +x /usr/local/bin/npbackup`. Any distribution with glibc >= 2.17 should do. -On Windows, you can directly execute `npbackup.exe` or use `NPBackupInstaller.exe` to install NPBackup into program files and create a run schedule. +On Windows, you can directly execute `npbackup.exe` that comes in the zip archive. The x64 binary is compatible with Windows 10+. The x86 binary is compatible with windows Vista and higher. On those old systems, you might need to install Visual C runtime 2015. ### PyPI installation @@ -105,7 +104,7 @@ Also copy the `excludes` directory if you plan to use the prefilled bigger exclu You can adjust the parameters directly in the file, or via a config GUI by launching `npbackup --config-file=npbackup.conf --config-gui` Once configured, you can launch manual backups via `npbackup --backup`. Those can be scheduled. -Windows schedule is created automatically by the installer program. On Linux, you'll have to create a cronjob or a systemd timer. +Windows schedule can be created from the configuration page. On Linux, you'll have to create a cronjob or a systemd timer. Since NPBackup is configured to only proceed with backups when no recent backups are detected, you should consider scheduling npbackup executions quite often. The default schedule should be somewhere around 15 minutes. diff --git a/SECURITY.md b/SECURITY.md index 4c62101..baa793c 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -8,7 +8,6 @@ While this is practical, it should never be allowed on non compiled builds or wi All these commands are run with npbackup held privileges. In order to avoid a potential attack, the config file has to be world readable only. -We need to document this, and perhaps add a line in installer script # NPF-SEC-00003: Avoid password command divulgation diff --git a/bin/compile.py b/bin/compile.py index 6154aae..3f0dd25 100644 --- a/bin/compile.py +++ b/bin/compile.py @@ -407,9 +407,6 @@ if __name__ == "__main__": npbackup_version = get_metadata(os.path.join(BASEDIR, "__version__.py"))[ "version" ] - installer_version = get_metadata( - os.path.join(BASEDIR, os.pardir, "bin", "NPBackupInstaller.py") - )["version"] private_build = check_private_build(audience) if private_build and audience != "private": diff --git a/bin/sign_windows.py b/bin/sign_windows.py index 5637082..a193ec3 100644 --- a/bin/sign_windows.py +++ b/bin/sign_windows.py @@ -7,8 +7,8 @@ __intname__ = "npbackup.sign_windows" __author__ = "Orsiris de Jong" __copyright__ = "Copyright (C) 2023-2024 NetInvent" __license__ = "GPL-3.0-only" -__build__ = "2024050101" -__version__ = "1.1.0" +__build__ = "2024052701" +__version__ = "1.1.1" import os @@ -21,7 +21,7 @@ except ImportError: basepath = r"C:\GIT\npbackup\BUILDS" audiences = ["private", "public"] arches = ["x86", "x64"] -binaries = ["npbackup-cli", "npbackup-gui", "npbackup-viewer", "NPBackupInstaller"] +binaries = ["npbackup-cli", "npbackup-gui", "npbackup-viewer"] signer = SignTool() diff --git a/examples/README.md b/examples/README.md index c39427f..71e67d6 100644 --- a/examples/README.md +++ b/examples/README.md @@ -1,4 +1 @@ This directory contains various example config files. - -The file npbackup.conf.dist file will be bundled as default with NPBackupInstaller. -You may copy npbackup.conf.dist to ../PRIVATE/_private.npbackup.conf.dist in order to add the later file in private build installers. \ No newline at end of file