Skip to content

A local-first personal finance app

New Fly install doc (#127)

Jed Fox7f880446cc6c
diff --git a/docs/Backup-Restore/Restore.md b/docs/Backup-Restore/Restore.md
index 86e4c781de..35ddf3cbad 100644
--- a/docs/Backup-Restore/Restore.md
+++ b/docs/Backup-Restore/Restore.md
@@ -21,12 +21,12 @@ To do this,
1. From the next screen select Import File
- ![](/img/restore/actual-config-10.png)
+ ![](/img/migrating/actual-import-1.png)
1. Select Actual and then locate your Zip file, this will then import what you previously exported into
Actual.
- ![](/img/restore/actual-config-11.png)
+ ![](/img/migrating/actual-import-2.png)
That is it. A fresh budget will show in your budget list. If the imported data is a copy of your current budget, you may want to rename the new budget by clicking on it's name so you can tell them apart. Once you verify the new imported budget is correct, you can navigate back to the budget selection screen by closing the current budget and deleting the old copy.
diff --git a/docs/FAQ.md b/docs/FAQ.md
index 98b4483f37..75b8fcb239 100644
--- a/docs/FAQ.md
+++ b/docs/FAQ.md
@@ -14,20 +14,15 @@ title: 'Frequently Asked Questions'
- **Q.** _Can I import my Actual Budget from the hosted instance of Actual to my Self Hosted version_
- **A.** Yes, this has been added to the web version recently, we made a [guide for exporting](/Installing/fly/Fly-git#exporting-data-from-actual)
- and then [one for importing](/Installing/fly/Fly-git#importing-data-into-actual)
+ **A.** Yes, this has been added to the web version recently, see [our documentation on migrating from the subscription service](./Getting-Started/migration/actual-import.md).
- **Q.** _How do I update my version of Actual after it has been updated?_
**A.** That depends how you’re hosting it.
- PikaPods seems to refresh their image automatically.
- - Actual builds and publishes an updated docker image on each merge.
- - If you're on Fly.io we have a [guide for that too](/Installing/fly/Fly-git#updating-actual).
-
-- **Q.** _How do I make sure my data on Fly.io isn't deleted when I update?_
-
- **A.** We have a guide for you [here](/Installing/fly/Fly-git#persisting-the-data-in-fly)
+ - Actual builds and publishes an updated docker image with each release.
+ - If you’re on Fly.io we have a [guide for that too](./Installing/Fly.md#updating-actual).
- **Q.** _I have deployed actual to Fly.io but I am being charged, why is this?_
diff --git a/docs/Getting-Started/migration/actual-import.md b/docs/Getting-Started/migration/actual-import.md
index 9636991bd5..5214be4216 100644
--- a/docs/Getting-Started/migration/actual-import.md
+++ b/docs/Getting-Started/migration/actual-import.md
@@ -4,6 +4,12 @@ title: 'Import an Actual Budget Backup'
This guide is for importing a backup that has been taken from Actual, you should have a zip file which will contain all the files required, this guide can also be used if you are importing a demo budget.
+### Export Backup File
+
+From https://app.actualbudget.com, log in and select the budget you wish to export. Click the “…” menu next to your budget name and choose “Settings.” Under the “File” tab, click “Export data.” This will download a zip file containing all of your budget data.
+
+![](/img/migrating/[email protected])
+
### Import Backup File
- Open Actual Budget
@@ -11,10 +17,10 @@ This guide is for importing a backup that has been taken from Actual, you should
- From the drop down menu select **Close File**
- Select **Import file** from the dialog that appears.
-![](/img/migrating/actual-config-10.png)
+![](/img/migrating/actual-import-1.png)
- Select **Actual**
-![](/img/migrating/actual-config-12.png)
+![](/img/migrating/actual-import-2.png)
-- Choose the exported zip file
\ No newline at end of file
+- Choose the exported zip file
diff --git a/docs/Getting-Started/migration/nynab.md b/docs/Getting-Started/migration/nynab.md
index 4389f98119..846f2539eb 100644
--- a/docs/Getting-Started/migration/nynab.md
+++ b/docs/Getting-Started/migration/nynab.md
@@ -12,11 +12,11 @@ While we don't maintain this tool, you can also use https://json-exporter-for-yn
- Select the drop down menu and **Close File**
- Select **Import file**
-![](/img/migrating/actual-config-10.png)
+![](/img/migrating/actual-import-1.png)
- Select **nYnab**
-![](/img/migrating/actual-config-12.png)
+![](/img/migrating/actual-import-2.png)
- Choose the exported json file
diff --git a/docs/Installing/Fly.md b/docs/Installing/Fly.md
new file mode 100644
index 0000000000..af957417e5
--- /dev/null
+++ b/docs/Installing/Fly.md
@@ -0,0 +1,287 @@
+---
+title: 'Fly.io'
+---
+
+In order to deploy Actual to Fly.io, you’ll need to use their command line interface from a terminal program. If you’ve never used a terminal before, don’t worry! We’ll walk you through every step of the process.
+
+## Setup
+
+### Creating a Fly.io Account
+
+First, you’ll need to sign up for an account. Go to [fly.io](https://fly.io) and click “Get Started,” then fill in the form. Note that Fly may require you to enter credit card details. See [their docs on how they use credit cards](https://fly.io/docs/about/credit-cards/) for more information. If you follow the steps in this guide, you will remain well within the free plan limits. For more details, check out [Fly’s pricing documentation](https://fly.io/docs/about/pricing/).
+
+### Accessing the `fly` command line tool
+
+There are two ways to access the `fly` command line tool. You can either install it on your local machine, or you can use the web-based terminal that Fly provides. We recommend using the web-based terminal, as it’s the easiest way to get started. However, if you run into issues with the web-based terminal, you can always install the `fly` command line tool on your local machine.
+
+#### Web-based terminal
+
+Go to https://fly.io/terminal/ and click “Launch Web CLI” at the bottom of the page. You may be asked to log into Fly.
+
+Create a new folder named `actual` by typing in this command once the `/app/bin $` prompt appears. Once you’ve typed in the command, press the `Enter` key on your keyboard.
+
+```
+mkdir actual; cd actual
+```
+
+Your terminal should look like this if you’ve done everything correctly:
+
+```
+/app/bin $ mkdir actual; cd actual
+/app/bin/actual $
+```
+
+#### Local installation
+
+If you prefer to install the `fly` command line tool on your local machine, you’ll need to start by opening a command line terminal on your computer.
+
+- **Windows**: Open the Start menu and search for “PowerShell.” Click on the “PowerShell” app to open it.
+- **macOS**: Open the “Terminal” app from the Utilities folder in your Applications folder.
+- **Linux**: Open your terminal app of choice.
+
+Next, follow [the instructions to install the `fly` command line tool](https://fly.io/docs/hands-on/install-flyctl/). When entering the commands, make sure _not_ to include the `$` character at the beginning of each line.
+
+<details><summary>Detailed instructions with screenshots for Windows</summary>
+
+Note: the exact commands you’ll need to run may have changed, check the website linked above to make sure you have the latest ones.
+
+1. Open up PowerShell on your local machine and paste the following command into the window:
+ ```powershell
+ iwr https://fly.io/install.ps1 -useb | iex
+ ```
+ ![](/img/fly/windows-install-1.png)
+2. Flyctl should start installing
+
+ ![](/img/fly/windows-install-2.png)
+
+3. Once done you should get a message saying `Run flyctl --help to get started`:
+
+ ![](/img/fly/windows-install-3.png)
+
+</details>
+
+<details><summary>Detailed instructions with screenshots for macOS</summary>
+
+Note: the exact commands you’ll need to run may have changed, check the website linked above to make sure you have the latest ones.
+
+Additionally, you might get an error such as `command not found: fly` when you try to use the `fly` command later. If that happens, you’ll need to change the `fly` part of the command to `~/.fly/bin/fly` instead.
+
+1. In the Finder, choose “Go → Utilities” from the menu bar.
+
+ ![](/img/fly/[email protected])
+
+2. Scroll down in the list until you find “Terminal.” Double-click on it to open it.
+
+ ![](/img/fly/[email protected])
+
+3. A window should pop up that will look a bit like this. Note that some of the text may be different, or you may see the last line ending with a `$` instead of a `%`. Both of those are normal.
+
+ ![](/img/fly/[email protected])
+
+4. Type or paste the following command to start the install. Make sure you press the `Enter` key on your keyboard after you’ve typed it in.
+
+ ```bash
+ curl -L https://fly.io/install.sh | sh
+ ```
+
+ ![](/img/fly/[email protected])
+
+5. Once that has finished, you should see something like this:
+
+ ![](/img/fly/[email protected])
+
+</details>
+
+### Logging into Fly.io
+
+Type `fly auth login` and press enter to open your browser and log your terminal into Fly.io.
+
+## Configuring the app
+
+Now that you’ve gotten the CLI set up, you’re ready to deploy your app to Fly.io. First, you’ll need our template Fly configuration:
+
+### Web-based terminal
+
+1. Type in (or copy-paste) the command `cat > fly.toml` and press enter. Your cursor should move to a new blank line.
+2. Copy the contents of the `fly.toml` template file below and paste it into the terminal.
+3. Hit return on your keyboard so your cursor is at the beginning of a new line.
+4. Press control+d on your keyboard to save the file. (Use the “control” key even on macOS! Terminals are weird)
+
+<details><summary>Click to expand <code>fly.toml</code> template</summary>
+
+```toml title=fly.toml
+[env]
+ PORT = "5006"
+ TINI_SUBREAPER = "1"
+
+[experimental]
+ auto_rollback = true
+ cmd = ["node", "--max-old-space-size=180", "app.js"]
+
+[mounts]
+ source="actual_data"
+ destination="/data"
+
+[[services]]
+ http_checks = []
+ internal_port = 5006
+ processes = ["app"]
+ protocol = "tcp"
+ script_checks = []
+
+ [services.concurrency]
+ hard_limit = 25
+ soft_limit = 20
+ type = "connections"
+
+ [[services.ports]]
+ force_https = true
+ handlers = ["http"]
+ port = 80
+
+ [[services.ports]]
+ handlers = ["tls", "http"]
+ port = 443
+
+ [[services.tcp_checks]]
+ grace_period = "10s"
+ interval = "15s"
+ restart_limit = 0
+ timeout = "2s"
+```
+
+</details>
+
+### Local terminal
+
+1. Create a new folder somewhere on your computer. You can call it whatever you want.
+2. <a rel="download" target="_top" href="/fly.toml">Download the template <code>fly.toml</code> file by clicking here</a> and move it into the folder you just created.
+3. Switch back to your terminal and navigate to the folder you just created.
+ - On macOS, drag the folder from Finder to Terminal and hold the command key when dropping it into the terminal window.
+ - On Windows, [FIXME!]
+ - On Linux, use the `cd` command.
+
+## Deploying the app
+
+Now that you’ve got the configuration file set up, you’re ready to deploy your app to Fly.io. To do so, run the following commands. Wait for each command to finish before running the next one.
+
+First, tell Fly about Actual:
+
+```bash
+fly launch --image actualbudget/actual-server:latest
+```
+
+This command will ask a series of questions:
+
+- “_An existing fly.toml file was found. Would you like to copy its configuration to the new app?_” Type `y` and press enter to use the config file we’ve provided.
+- “_Choose an app name (leave blank to generate one)_” Your app will be available online at <code>https://<em>the-name-you-choose</em>.fly.dev</code>. You can choose any name you want, but it must be unique. If you’re not sure what to choose, you can leave it blank and Fly will generate a random name for you. Either type the name and press enter, or just press enter.
+- _Choose a region for deployment_ This is the physical location where the server will be set up. You can choose any region you want, but we recommend choosing the one closest to you. Use the up and down arrow keys to pick a region, then press enter to choose the highlighted option.
+- _Would you like to set up a Postgresql database now?_ Type `n` and press enter to skip this step.
+- _Would you like to set up an Upstash Redis database now?_ Type `n` and press enter to skip this step.
+- _Would you like to deploy now?_ We’re not quite done yet! Type `n` and press enter. We’ll deploy the app once we’re done.
+
+Next, we’ll need to set up a “volume,” a place Fly can store your data so it doesn’t get lost when you restart or upgrade the server. To do so, run the following command:
+
+```bash
+fly volumes create actual_data
+```
+
+You may receive a warning message:
+
+- “_Warning! Individual volumes are pinned to individual hosts. You should create two or more volumes per application. You will have downtime if you only create one. Do you still want to use the volumes feature?_” Actual is only designed to work with one volume, and downtime should only happen when you are manually updating Actual in the future. Type `y` and press enter to continue.
+
+You may be asked to pick a region. Select the same one you chose for the main server, if asked.
+
+It may take a few seconds to create the volume. Once that’s done, you’re ready to deploy! Run this command to deploy your app:
+
+```bash
+fly deploy
+```
+
+The deploy can take a couple of minutes. Once it finishes, you’ll see a message like this:
+
+```
+No machines in group app, launching a new machine
+ Machine 148ed726c17298 [app] update finished: success
+Finished launching new machines
+Updating existing machines in 'some-app-1234' with rolling strategy
+ Finished deploying
+
+Visit your newly deployed app at https://some-app-1234.fly.dev/
+```
+
+You can now visit your very own instance of Actual by opening the link on the last line of the output.
+
+## Configuring Actual
+
+Now that Actual has been launched, you should now be able to navigate to Actual using the URL
+provided by the Fly command above earlier.
+
+<details><summary>Forgot the URL? Here’s how to find it</summary>
+
+If you forget the URL, you can always find it by opening [https://fly.io/dashboard](https://fly.io/dashboard) in a browser. Click on the application you created:
+
+![](/img/fly/fly-dash.png)
+
+Once you are in there, you should see Hostname section under Application Information - click the
+link
+
+![](/img/fly/fly-dash-2.png)
+
+This will now open Actual so we can start configuring it.
+
+</details>
+
+1. Set a password - remember this, you will need it in the future.
+
+ ![](/img/fly/[email protected])
+
+1. You’ll see a welcome screen. Either click “Import my budget” to [import your budget from YNAB or the subscription version of Actual](../Getting-Started/migration/migration-intro.md), or click “Start fresh” to create a blank budget file.
+
+ ![](/img/fly/[email protected])
+
+1. If everything went well you should then be taken to your very first budget.
+
+ ![](/img/fly/actual-register.png)
+
+Actual is now up and running. Congratulations! Consider checking out [our tour](../Getting-Started/using-actual/index.md) next.
+
+## Updating Actual
+
+When updates to Actual are released, you’ll need to re-deploy your app to get the latest version.
+
+### Web-based terminal
+
+Go to https://fly.io/terminal/ and click “Launch Web CLI” at the bottom of the page. You may be asked to log into Fly.
+
+Run the following command, changing the `your-app-name` part to the name you chose when you first deployed Actual:
+
+```bash
+fly deploy --image actualbudget/actual-server:latest --app your-app-name
+```
+
+For example, if your copy of Actual was available at `https://spring-firefly-8368.fly.dev/`, you would run:
+
+```bash
+fly deploy --image actualbudget/actual-server:latest --app spring-firefly-8368
+```
+
+### Local terminal
+
+Open a terminal window and navigate to the folder where you set up Actual. Run the following command:
+
+```bash
+fly deploy
+```
+
+## Frequent Issues
+
+- **Q.** _I have deployed actual to Fly.io but I am being charged, why is this?_
+
+ **A.** While we wouldn’t know for certain without seeing your configuration, it is likely that during
+ deployment you created a Postgres database. Actual doesn’t need this so you can just delete it and
+ charges should then stop. If you're unsure, please [reach out to us](/Contact).
+
+- **Q.** _How can I try out a beta/unstable version of Actual?_
+
+ **A.** We publish unstable releases of Actual every day. These versions may have known or unknown issues that could corrupt your budget. If you’d like to try them out, follow the [instructions to update](#updating-actual) above, but change `actualbudget/actual-server:latest` to `actualbudget/actual-server:edge`.
diff --git a/docs/Installing/fly/Fly-git.md b/docs/Installing/fly/Fly-git.md
deleted file mode 100644
index 135f55e3ff..0000000000
--- a/docs/Installing/fly/Fly-git.md
+++ /dev/null
@@ -1,258 +0,0 @@
----
-title: 'Deploying Actual with Git'
----
-
-# Deploying Actual on fly.io with git
-
-### Installing Git On Your Local Machine
-
-Download git for Windows from here: [https://git-scm.com/download/win](https://git-scm.com/download/win)
-
-1. Identify the version that is suitable for your operating system
-
- If you are unsure if you are running 32bit run this command in the command prompt:
-
- ```cmd
- wmic os get OSArchitecture
- ```
-
- ![](/img/fly/cmd-arch.png)
-
-1. Download the setup file that is right for your system:
-
- ![](/img/fly/git-download.png)
-
- It should then start downloading:
-
- ![](/img/fly/git-download-progress.png)
-
-1. Once it is done, open it up - if asked click yes that you are happy for it to make changes to
- your device.
-
- ![](/img/fly/git-install-1.png)
-
-1. Copy the settings as they are below and click next, next...
-
- ![](/img/fly/git-install-2.png)
-
- ![](/img/fly/git-install-3.png)
-
- ![](/img/fly/git-install-4.png)
-
- ![](/img/fly/git-install-5.png)
-
- ![](/img/fly/git-install-6.png)
-
- ![](/img/fly/git-install-7.png)
-
- ![](/img/fly/git-install-8.png)
-
- ![](/img/fly/git-install-9.png)
-
- ![](/img/fly/git-install-10.png)
-
- ![](/img/fly/git-install-11.png)
-
- ![](/img/fly/git-install-12.png)
-
- ![](/img/fly/git-install-13.png)
-
- ![](/img/fly/git-install-14.png)
-
- ![](/img/fly/git-install-15.png)
-
- ![](/img/fly/git-install-16.png)
-
-1. Then git should begin installing:
-
- ![](/img/fly/git-install-17.png)
-
-1. Open up a command prompt and type
-
- ```cmd
- git --version
- ```
-
- to make sure it has installed correctly. If it has, you should see a version number as below:
-
- ![](/img/fly/git-install-18.png)
-
-That is it, Git is now installed.
-
-## Deploying Actual
-
-I got Actual deployed to [fly.io](https://fly.io) below are the instructions I used - understandably
-these are for Windows only but should work (with a few tweaks) for MacOSX & Linux.
-
-1. Press start (or hit the windows key on your keyboard), type **cmd**
-
- ![](/img/fly/windows-start-1.png)
-
- when CMD appears in the search results, **right click** it and run it as **Administrator**
-
- ![](/img/fly/windows-start-2.png)
-
-1. Navigate to the C:\ drive
- ```cmd
- cd C:\
- ```
- ![](/img/fly/cmd-1.png)
-1. Create a folder called GitHub. (`mkdir` is a command to *m*a*k*e a *dir*ectory)
- ```cmd
- mkdir github
- ```
- ![](/img/fly/cmd-2.png)
-1. Once that is complete run this command
-
- ```cmd
- flyctl auth login
- ```
-
- ![](/img/fly/cmd-9.png)
-
- This should open a web browser and ask you to login - you will need to provide credit card
- details to proceed but actual shouldn't cost much if anything at all.
-
- ![](/img/fly/cmd-10.png)
-
-1. Now we need to move into the GitHub directory we just created on the C:\ drive, to do that we can
- use this command
-
- ```cmd
- cd C:\github
- ```
-
- ![](/img/fly/cmd-3.png)
-
- **Note:** CD means *c*hange *d*irectory
-
-1. Now run this command
-
- ```cmd
- git clone https://github.com/actualbudget/actual-server.git
- ```
-
- ![](/img/fly/git-install-19.png)
-
- This will pull down the latest files for actual-server from the git hub repository to our local
- machine.
-
-1. Then we need to move into that folder, to do that use this command
-
- ```cmd
- cd actual-server
- ```
-
- ![](/img/fly/cmd-4.png)
-
- Let's check to make sure we are in the correct place
-
- ```cmd
- dir
- ```
-
- ![](/img/fly/cmd-5.png)
-
- You should see a list of files, one of them being `fly.template.toml`. If you don't see them
- go back to step 6
-
-1. Copy `fly.template.toml` that is in the folder called actual-server within C:\GitHub and copy it
- back into the same directory with the name `fly.toml`
- ```cmd
- copy fly.template.toml fly.toml
- ```
- ![](/img/fly/cmd-6.png)
-1. Open the fly.toml file in notepad or a text editor of your choice like Visual Studio Code
-
- ```cmd
- notepad fly.toml
- ```
-
- ![](/img/fly/cmd-7.png)
-
- On line 1 change `app = "%NAME%"` to something of your choosing like `app = "Actual"` and save
- the file
-
- ![](/img/fly/cmd-8.png)
-
-1. Go back to the command prompt and run
- ```cmd
- flyctl launch
- ```
-1. You will see a message that says `An existing fly.toml file was found for app Actual Budget ?
-Would you like to copy its configuration to the new app? (y/N)`
-
- Type Y and hit enter
-
- ![](/img/fly/cmd-11.png)
-
-1. It asked me to give my application a name, I just left it blank and it picked one for me. I did
- this because no matter what I typed it errored.
-
- ![](/img/fly/cmd-12.png)
-
-1. Select your location using the up/down arrow keys when prompted:
-
- ![](/img/fly/cmd-13.png)
-
-1. When prompted with `? Would you like to setup a Postgresql database now? (y/N)`
-
- Type N and press enter:
-
- ![](/img/fly/cmd-14.png)
-
-1. When prompted with `? Would you like to deploy now? (y/N)`
-
- Type Y and press enter:
-
- ![](/img/fly/cmd-15.png)
-
- The application should begin deploying.
-
- ![](/img/fly/cmd-17.png)
-
-1. If you get a message about Windows Firewall, click 'Allow Access'
-
- ![](/img/fly/cmd-16.png)
-
-When complete you should see something like this:
-
-![](/img/fly/cmd-18.png)
-
-## Configuring Actual
-
-Now everything is setup and configured, you should now be able to navigate to Actual using the URL
-provided by Fly in the dashboard.
-
-1. To find that open [https://fly.io/dashboard](https://fly.io/dashboard) in a browser and click the
- application you created, in my case **myfirstbudget**, it might have a really random name if you
- left it blank a few steps ago
-
- ![](/img/fly/fly-dash.png)
-
-1. Once you are in there, you should see Hostname section under Application Information - click the
- link
-
- ![](/img/fly/fly-dash-2.png)
-
- https://myfirstbudget.fly.dev
-
- This will now open Actual so we can start configuring it.
-
-1. You should then see this screen
-
- ![](/img/fly/actual-config-1.png)
-
- Click the 'Use this domain' link
-
- ![](/img/fly/actual-config-2.png)
-
-1. Set a password - remember this, you will need it in the future.
-
- ![](/img/fly/actual-config-3.png)
-
-1. If everything went well you should then be taken to your very first budget.
-
- ![](/img/fly/actual-register.png)
-
-Actual is now up and running. Congratulations!
diff --git a/docs/Installing/fly/Fly-image.md b/docs/Installing/fly/Fly-image.md
deleted file mode 100644
index 39a2bf0a8a..0000000000
--- a/docs/Installing/fly/Fly-image.md
+++ /dev/null
@@ -1,145 +0,0 @@
----
-title: 'Deploying Actual with a container image'
----
-
-# Deploying Actual on fly.io with a container image
-
-## Deploying
-
-[fly.io](https://fly.io) allows running the application directly and provides a free tier. You
-should be comfortable with using the command line to set it up though.
-
-1. [Install the `flyctl`](https://fly.io/docs/flyctl/installing/) utility.
-1. [Create an account](https://fly.io/app/sign-in). You can also create your account by running
-
- ```sh
- fly auth signup
- ```
-
- Although you are required to enter payment details, the resources required to run Actual are
- within the free tier, and you shouldn't be charged.
-
-1. Copy
- [`fly.template.toml`](https://github.com/actualbudget/actual-server/raw/master/fly.template.toml)
- to an empty local directory, and rename the file `fly.toml`.
-
- - _Optional_: Open `fly.toml` and customize the app name on the first line of the file. e.g.:
- ```toml
- app = "actual-budget"
- ```
- App names must be _globally_ unique, so there is a meaningful probability that your chosen name
- is unavailable. Later steps allow the fly.io system to generate a unique name for you.
-
-1. <a name="mount_config" />Persisting data means the server will retain your configuration and
- budget. Without this, each deployment or restart will wipe away all the data on the server. You
- would need to intialize (also known and listed as 'bootstrapping' in the user interface) the
- instance again and re-upload your files. We want our Actual server to persist data, so we need to
- mount a volume.
-
- Open `fly.toml` in a text editor and add the following:
-
- ```toml
- [mounts]
- source="actual_data"
- destination="/data"
- ```
-
-1. `cd` into the empty directory containing your new `fly.toml` file from above, and create your app using the following command:
- ```sh
- fly launch --image actualbudget/actual-server:latest
- ```
- 1. Select `Yes` when prompted to copy existing configuration.
- ```sh
- ? Would you like to copy its configuration to the new app? (y/N) y
- ```
- 1. Press `enter` to accept an auto-generated app name. You may enter a name if you wish, but it
- must be globally unique across all fly apps.
- ```sh
- ? App Name (leave blank to use an auto-generated name):
- ```
- 1. Select a deployment region. The closest region should be highlighted by default, so you may
- simply hit `enter` if you do not have specific needs.
- ```sh
- ? Select region: [Use arrows to move, type to filter]
- ams (Amsterdam, Netherlands)
- ...
- ```
- 1. Select `No` when prompted to create a Postgres database.
- ```sh
- ? Would you like to setup a Postgresql database now? (y/N) n
- ```
- 1. Select `No` when prompted to create an Upsatsh Redis database.
- ```sh
- ? Would you like to set up an Upstash Redis database now? (y/N) n
- ```
- 1. Select `No` when prompted to deploy now.
- ```sh
- ? Would you like to deploy now? (y/N) n
- ```
-1. Continue to the [Persisting server data](#persisting-server-data) section.
-
-## Persisting server data
-
-If you choose not to set up a persistent volume, each deployment or restart will wipe away all the
-data on the server. You would need to intialize (also known and listed as 'bootstrapping' in the
-user interface) the the instance again and upload your files. To avoid that, let's move the data
-somewhere that persists. With [fly.io](https://fly.io) we can create a [volume](https://fly.io/docs/reference/volumes/).
-
-1. In the directory containing your `fly.toml` configuration, run this command:
- ```sh
- fly volumes create actual_data
- ```
-1. Select a deployment region. The closest region should be highlighted by default, so you may
- simply hit `enter` if you do not have specific needs.
-
- \*Fly volumes are encrypted at rest by default. See the fly.io docs if you wish to disable this,
- though we do **_not_** recommend doing so.\*
-
-1. If you have not already added a mount to your fly config, follow [the instructions above](#mount_config)
- to do so.
-1. Deploy your application:
- ```sh
- fly deploy
- ```
- ![image](https://user-images.githubusercontent.com/2792750/181817536-599fd99b-d8f1-4a80-b268-1c3da2b05a40.png)
-
-You should have a running app now! Actual will check if the `/data`[¹](#note_1) directory exists and use it
-automatically. You can open the app using
-
-```sh
-fly apps open
-```
-
-## Updating Actual
-
-Whenever you want to update Actual, return to the directory containing your `fly.toml` file and run
-
-```sh
-fly deploy
-```
-
-If you wish to change the image source (eg to run an unstable build, or a specific tag), run
-
-```sh
-fly deploy --image [desired image tag]
-```
-
-with `[desired image tag]` replaced with your desired tag.
-
-<a name="note_1" />¹ _You can also configure the data dir with the `ACTUAL_USER_FILES` environment
-variable._
-
-## Frequent Issues
-
-- **Q.** _I have deployed actual to Fly.io but I am being charged, why is this?_
-
- **A.** While we wouldn’t know for certain without seeing your configuration, it is likely that during
- deployment you created a Postgres database. Actual doesn’t need this so you can just delete it and
- charges should then stop. If you're unsure, please [reach out to us](/Contact).
-
-## Official Images
-
-These images are published based on the `master` branch of the [actual-server repo][upstream].
-
-- Docker hub: [actualbudget/actual-server](https://hub.docker.com/r/actualbudget/actual-server)
-- Github Container Registry: [ghcr.io/actualbudget/actual-server](https://ghcr.io/actualbudget/actual-server)
diff --git a/docs/Installing/fly/Fly-persisting.md b/docs/Installing/fly/Fly-persisting.md
deleted file mode 100644
index f52bd9449f..0000000000
--- a/docs/Installing/fly/Fly-persisting.md
+++ /dev/null
@@ -1,54 +0,0 @@
----
-title: 'Persisting the data in Fly'
----
-
-## Persisting the data in Fly
-
-When we update Actual, if we don't persist the data it will be erased each time we come to update.
-
-1. Run the following command
-
- ```cmd
- flyctl volumes create actual_data --region lhr
- ```
-
- This will create a volume in the london region. Replace `lhr` with another region code if
- desired.
-
- ![](/img/fly/cmd-19.png)
-
-1. You should then get a message to say it was successful
-
- ![](/img/fly/cmd-20.png)
-
-1. Open up `fly.toml` in notepad - you can do this from the command line
- ```cmd
- notepad fly.toml
- ```
-1. Add the following to the file
-
- ```toml
- [mounts]
- source="actual_data"
- destination="/data"
- ```
-
- If you created a volume with a different name, put that in the source. Save the file.
-
- ![](/img/fly/cmd-21.png)
-
-1. Now from the command prompt run
-
- ```cmd
- flyctl deploy
- ```
-
- ![](/img/fly/cmd-22.png)
-
- Your application should be re-deployed with the updated configuration
-
- ![](/img/fly/cmd-23.png)
-
-If all went well, you should now be able to see your volume from the fly.io dashboard.
-
-![](/img/fly/fly-dash-3.png)
diff --git a/docs/Installing/fly/Fly-prerequisites.md b/docs/Installing/fly/Fly-prerequisites.md
deleted file mode 100644
index a70fff1729..0000000000
--- a/docs/Installing/fly/Fly-prerequisites.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-title: 'Fly Pre-requisites'
----
-
-## Pre-requisites
-
-There are some things we need to do before we get started though.
-
-:::note
-If deploying via Terminal on a Mac be sure that you have granted Terminal `Full Disk Access` rights
-:::
-
-### Fly.io Account
-
-Create an account with [fly.io](https://fly.io/app/sign-up). Although you are required to enter
-payment details, everything we do here will work on the free tier and you won't be charged.
-
-### Flyctl tool installation
-
-1. Open up PowerShell on your local machine and paste the following command into the window:
- ```powershell
- iwr https://fly.io/install.ps1 -useb | iex
- ```
- ![](/img/fly/fly-install-1.png)
-1. Flyctl should start installing
-
- ![](/img/fly/fly-install-2.png)
-
-1. Once done you should get a message saying `Run flyctl --help to get started`:
-
- ![](/img/fly/fly-install-3.png)
-
-Flyctl is now installed.
diff --git a/docs/Installing/fly/Fly-updating.md b/docs/Installing/fly/Fly-updating.md
deleted file mode 100644
index e730889736..0000000000
--- a/docs/Installing/fly/Fly-updating.md
+++ /dev/null
@@ -1,67 +0,0 @@
----
-title: 'Updating Actual'
----
-
-## Updating Actual
-
-:::caution Before starting this step, backup your budget! You can find out how to do that [here](#exporting-data-from-actual).
-Failure to do this may result in budget loss.
-:::
-
-This section focuses on updating the actual-server
-
-Press the start menu or windows key on your keyboard and type **cmd**
-
-![](/img/fly/windows-start-1.png)
-
-when command prompt appears in the search results, **right click** it and run it as **Administrator**
-
-![](/img/fly/windows-start-2.png)
-
-Navigate to the C:\ drive using this command
-
-```cmd
-cd C:\
-```
-
-![](/img/fly/cmd-1.png)
-
-Assuming you followed this guide before, navigate to the github directory you created to clone
-actual and then into the actual-server directory
-
-```cmd
-cd github\actual-server
-```
-
-![](/img/fly/cmd-26.png)
-
-We now need to clone the latest changes made to the actual-server repo, to do this, run the
-following command from your command prompt:
-
-```cmd
-git pull origin master
-```
-
-![](/img/fly/cmd-25.png)
-
-:::info
-As the fly.toml is excluded in the gitignore changes made upstream will not be pulled down, ensure you check the fly.toml against the fly.template.toml using the steps below before proceeding
-:::
-
-At this point, open the fly.toml (this should be located in `C:\github\actual-server`) by right clicking on it and selecting `Open` it should open in a text editor.
-
-Open the fly.template.toml by doing the same steps as above.
-
-Once the two files are open, compare the fly.toml to the fly.template.toml ensuring that everything below the `app = "%NAME%"` is the same.
-
-Once that is done, run the deployment command to push your changes to fly.
-
-```cmd
-flyctl deploy.
-```
-
-Once that is complete, [delete your browsing history](https://www.howtogeek.com/304218/how-to-clear-your-history-in-any-browser/)
-and web files.
-
-Load up your budget and if required [restore your backup](#importing-data-into-actual) and that is
-Actual Server updated.
diff --git a/docs/Installing/fly/Fly.io.md b/docs/Installing/fly/Fly.io.md
deleted file mode 100644
index 08fac7cad2..0000000000
--- a/docs/Installing/fly/Fly.io.md
+++ /dev/null
@@ -1,53 +0,0 @@
-[git-guide]: ./Fly-git
-[image-guide]: ./Fly-image
-[terraform-guide]: ./Fly-terraform
-[ci-build]: https://github.com/actualbudget/actual-server/blob/master/.github/workflows/build.yml
-
-# Hosting Actual with [fly.io](https://fly.io)
-
-You should deploy your server so it's always running. [Fly.io](https://fly.io) provides an easy
-option with a free plan.
-
-See the next section for a brief comparison of fly.io deployment options. If you're stuck or find a
-step unclear, [contact us](/Contact) for support.
-
-## Deployment methods
-
-Fly offers a variety of ways to get an application deployed on their infrastructure. We currently
-have community contributed documentation for the following deployment methods
-
-- Deploying [from a clone of the main git repository][git-guide]
-- Deploying [from a published Docker container image][image-guide]
-
-Each of these methods come with tradeoffs.
-
-The git approach allows users a high degree of control. With sufficient knowledge, you can target
-the current release, work in progress, or a fork (a unique code history that uses Actual as its
-starting point). You can make fine grained changes to any aspect of your Actual server instance.
-However, some users will find that this level of control adds complexity to their deployment. As
-your deployment is based on your local copy of the source code, you will be responsible for keeping
-track of updates and ensuring your local copy is up to date.
-
-The container image approach offers less granular control. Images are intended to be a specific
-version of the application, identical everywhere that image is deployed. While there are some
-deployment parameters you can alter, you'll only have access to configuration that the current
-version of the application makes available. In return for surrendering source code level access, you
-get relative simplicity. The image includes everything the application needs, and thus none of that
-tooling needs to be installed on your machine. New versions of the image are built by the main
-repository[¹](#deployment_1); if you opt to deploy the `:latest` tag, you can be confident you're up
-to date with the latest full release.
-
-As a (terrible) analogy, the git approach provides you a car with no restrictions. If you decide the
-engine should be tuned differently, you can open the hood and go to work with your wrench. The image
-approach also provides you a car, but the engine bay is sealed. If you want different cylinder
-timing, you'll need a new image.
-
-<a name="deployment_1" />¹ _You can find the image build workflow [here][ci-build]_
-
-## Frequent Issues
-
-- **Q.** _I have deployed actual to Fly.io but I am being charged, why is this?_
-
- **A.** While we wouldn’t know for certain without seeing your configuration, it is likely that during
- deployment you created a Postgres database. Actual doesn’t need this so you can just delete it and
- charges should then stop. If you're unsure, please [reach out to us](/Contact).
diff --git a/docs/Installing/overview.md b/docs/Installing/overview.md
index 659c65809e..f45c4cd956 100644
--- a/docs/Installing/overview.md
+++ b/docs/Installing/overview.md
@@ -8,7 +8,7 @@ While running a server can be a complicated endeavour, we’ve tried to make it
- If you’re not comfortable with the command line and are willing to pay a small amount of money to have your version of Actual hosted on the cloud for you, we recommend [PikaPods](PikaPods.md).
- If you’re willing to run a few commands in the terminal:
- - [Fly.io](fly/Fly.io.md) offers free cloud hosting. (Make sure you read the section about [persisting your data](fly/Fly-persisting.md)!)
+ - [Fly.io](Fly.md) offers free cloud hosting.
- You could [directly install Actual locally](Local/your-own-machine.md) on macOS, Windows, or Linux if you don’t want to use a tool like Docker. (This method is the best option if you want to contribute to Actual!)
- If you want to use Docker, we have instructions for [using our provided Docker containers](Docker.md).
diff --git a/sidebars.js b/sidebars.js
index 3ae02ee9a8..340fc704e8 100644
--- a/sidebars.js
+++ b/sidebars.js
@@ -64,21 +64,22 @@ const sidebars = {
label: 'In the Cloud',
collapsible: false,
items: [
- {
- type: 'category',
- label: 'Fly.io',
- link: {
- type: 'doc',
- id: 'Installing/fly/Fly.io',
- },
- items: [
- 'Installing/fly/Fly-prerequisites',
- 'Installing/fly/Fly-git',
- 'Installing/fly/Fly-image',
- 'Installing/fly/Fly-updating',
- 'Installing/fly/Fly-persisting',
- ],
- },
+ 'Installing/Fly',
+ // {
+ // type: 'category',
+ // label: 'Fly.io',
+ // link: {
+ // type: 'doc',
+ // id: 'Installing/fly/Fly.io',
+ // },
+ // items: [
+ // 'Installing/fly/Fly-prerequisites',
+ // 'Installing/fly/Fly-git',
+ // 'Installing/fly/Fly-image',
+ // 'Installing/fly/Fly-updating',
+ // 'Installing/fly/Fly-persisting',
+ // ],
+ // },
'Installing/PikaPods',
],
},
diff --git a/static/fly.toml b/static/fly.toml
new file mode 100644
index 0000000000..04c73b781e
--- /dev/null
+++ b/static/fly.toml
@@ -0,0 +1,38 @@
+[env]
+ PORT = "5006"
+ TINI_SUBREAPER = "1"
+
+[experimental]
+ auto_rollback = true
+ cmd = ["node", "--max-old-space-size=180", "app.js"]
+
+[mounts]
+ source="actual_data"
+ destination="/data"
+
+[[services]]
+ http_checks = []
+ internal_port = 5006
+ processes = ["app"]
+ protocol = "tcp"
+ script_checks = []
+
+ [services.concurrency]
+ hard_limit = 25
+ soft_limit = 20
+ type = "connections"
+
+ [[services.ports]]
+ force_https = true
+ handlers = ["http"]
+ port = 80
+
+ [[services.ports]]
+ handlers = ["tls", "http"]
+ port = 443
+
+ [[services.tcp_checks]]
+ grace_period = "10s"
+ interval = "15s"
+ restart_limit = 0
+ timeout = "2s"
diff --git a/static/img/fly/actual-config-1.png b/static/img/fly/actual-config-1.png
deleted file mode 100644
index 053c91b912..0000000000
Binary files a/static/img/fly/actual-config-1.png and /dev/null differ
diff --git a/static/img/fly/[email protected] b/static/img/fly/[email protected]
new file mode 100644
index 0000000000..1b78608bed
Binary files /dev/null and b/static/img/fly/[email protected] differ
diff --git a/static/img/fly/actual-config-2.png b/static/img/fly/actual-config-2.png
deleted file mode 100644
index dfced78cb0..0000000000
Binary files a/static/img/fly/actual-config-2.png and /dev/null differ
diff --git a/static/img/fly/[email protected] b/static/img/fly/[email protected]
new file mode 100644
index 0000000000..ed71483e5e
Binary files /dev/null and b/static/img/fly/[email protected] differ
diff --git a/static/img/fly/actual-config-3.png b/static/img/fly/actual-config-3.png
deleted file mode 100644
index 19e108cd04..0000000000
Binary files a/static/img/fly/actual-config-3.png and /dev/null differ
diff --git a/static/img/fly/cmd-1.png b/static/img/fly/cmd-1.png
deleted file mode 100644
index 79383ebd9b..0000000000
Binary files a/static/img/fly/cmd-1.png and /dev/null differ
diff --git a/static/img/fly/cmd-10.png b/static/img/fly/cmd-10.png
deleted file mode 100644
index 1e52499843..0000000000
Binary files a/static/img/fly/cmd-10.png and /dev/null differ
diff --git a/static/img/fly/cmd-11.png b/static/img/fly/cmd-11.png
deleted file mode 100644
index 3beb465aa5..0000000000
Binary files a/static/img/fly/cmd-11.png and /dev/null differ
diff --git a/static/img/fly/cmd-12.png b/static/img/fly/cmd-12.png
deleted file mode 100644
index 453a69a901..0000000000
Binary files a/static/img/fly/cmd-12.png and /dev/null differ
diff --git a/static/img/fly/cmd-13.png b/static/img/fly/cmd-13.png
deleted file mode 100644
index 08ba8717e7..0000000000
Binary files a/static/img/fly/cmd-13.png and /dev/null differ
diff --git a/static/img/fly/cmd-14.png b/static/img/fly/cmd-14.png
deleted file mode 100644
index 07bce39927..0000000000
Binary files a/static/img/fly/cmd-14.png and /dev/null differ
diff --git a/static/img/fly/cmd-15.png b/static/img/fly/cmd-15.png
deleted file mode 100644
index c0cf9f1615..0000000000
Binary files a/static/img/fly/cmd-15.png and /dev/null differ
diff --git a/static/img/fly/cmd-16.png b/static/img/fly/cmd-16.png
deleted file mode 100644
index 85f653e217..0000000000
Binary files a/static/img/fly/cmd-16.png and /dev/null differ
diff --git a/static/img/fly/cmd-17.png b/static/img/fly/cmd-17.png
deleted file mode 100644
index 70ce04e076..0000000000
Binary files a/static/img/fly/cmd-17.png and /dev/null differ
diff --git a/static/img/fly/cmd-18.png b/static/img/fly/cmd-18.png
deleted file mode 100644
index 3392385c60..0000000000
Binary files a/static/img/fly/cmd-18.png and /dev/null differ
diff --git a/static/img/fly/cmd-19.png b/static/img/fly/cmd-19.png
deleted file mode 100644
index f5cff20b2b..0000000000
Binary files a/static/img/fly/cmd-19.png and /dev/null differ
diff --git a/static/img/fly/cmd-2.png b/static/img/fly/cmd-2.png
deleted file mode 100644
index b65ab47c37..0000000000
Binary files a/static/img/fly/cmd-2.png and /dev/null differ
diff --git a/static/img/fly/cmd-20.png b/static/img/fly/cmd-20.png
deleted file mode 100644
index 441f9b5af8..0000000000
Binary files a/static/img/fly/cmd-20.png and /dev/null differ
diff --git a/static/img/fly/cmd-21.png b/static/img/fly/cmd-21.png
deleted file mode 100644
index 31b01c3235..0000000000
Binary files a/static/img/fly/cmd-21.png and /dev/null differ
diff --git a/static/img/fly/cmd-22.png b/static/img/fly/cmd-22.png
deleted file mode 100644
index d1b3096fb9..0000000000
Binary files a/static/img/fly/cmd-22.png and /dev/null differ
diff --git a/static/img/fly/cmd-23.png b/static/img/fly/cmd-23.png
deleted file mode 100644
index 4241c1505d..0000000000
Binary files a/static/img/fly/cmd-23.png and /dev/null differ
diff --git a/static/img/fly/cmd-25.png b/static/img/fly/cmd-25.png
deleted file mode 100644
index dcaf36690a..0000000000
Binary files a/static/img/fly/cmd-25.png and /dev/null differ
diff --git a/static/img/fly/cmd-26.png b/static/img/fly/cmd-26.png
deleted file mode 100644
index c9d73fb5a0..0000000000
Binary files a/static/img/fly/cmd-26.png and /dev/null differ
diff --git a/static/img/fly/cmd-3.png b/static/img/fly/cmd-3.png
deleted file mode 100644
index 070730478b..0000000000
Binary files a/static/img/fly/cmd-3.png and /dev/null differ
diff --git a/static/img/fly/cmd-4.png b/static/img/fly/cmd-4.png
deleted file mode 100644
index c25042e49f..0000000000
Binary files a/static/img/fly/cmd-4.png and /dev/null differ
diff --git a/static/img/fly/cmd-5.png b/static/img/fly/cmd-5.png
deleted file mode 100644
index efa8174fdd..0000000000
Binary files a/static/img/fly/cmd-5.png and /dev/null differ
diff --git a/static/img/fly/cmd-6.png b/static/img/fly/cmd-6.png
deleted file mode 100644
index 1e31d898ad..0000000000
Binary files a/static/img/fly/cmd-6.png and /dev/null differ
diff --git a/static/img/fly/cmd-7.png b/static/img/fly/cmd-7.png
deleted file mode 100644
index e0cd7db27c..0000000000
Binary files a/static/img/fly/cmd-7.png and /dev/null differ
diff --git a/static/img/fly/cmd-8.png b/static/img/fly/cmd-8.png
deleted file mode 100644
index cceac2ca52..0000000000
Binary files a/static/img/fly/cmd-8.png and /dev/null differ
diff --git a/static/img/fly/cmd-9.png b/static/img/fly/cmd-9.png
deleted file mode 100644
index bca8cf4de3..0000000000
Binary files a/static/img/fly/cmd-9.png and /dev/null differ
diff --git a/static/img/fly/cmd-arch.png b/static/img/fly/cmd-arch.png
deleted file mode 100644
index 86a0a7628f..0000000000
Binary files a/static/img/fly/cmd-arch.png and /dev/null differ
diff --git a/static/img/fly/git-download-progress.png b/static/img/fly/git-download-progress.png
deleted file mode 100644
index dedc151677..0000000000
Binary files a/static/img/fly/git-download-progress.png and /dev/null differ
diff --git a/static/img/fly/git-download.png b/static/img/fly/git-download.png
deleted file mode 100644
index 1d50cd0b24..0000000000
Binary files a/static/img/fly/git-download.png and /dev/null differ
diff --git a/static/img/fly/git-install-1.png b/static/img/fly/git-install-1.png
deleted file mode 100644
index 139f85db64..0000000000
Binary files a/static/img/fly/git-install-1.png and /dev/null differ
diff --git a/static/img/fly/git-install-10.png b/static/img/fly/git-install-10.png
deleted file mode 100644
index d3a6f10c1c..0000000000
Binary files a/static/img/fly/git-install-10.png and /dev/null differ
diff --git a/static/img/fly/git-install-11.png b/static/img/fly/git-install-11.png
deleted file mode 100644
index b1f7956b15..0000000000
Binary files a/static/img/fly/git-install-11.png and /dev/null differ
diff --git a/static/img/fly/git-install-12.png b/static/img/fly/git-install-12.png
deleted file mode 100644
index db3475ecd7..0000000000
Binary files a/static/img/fly/git-install-12.png and /dev/null differ
diff --git a/static/img/fly/git-install-13.png b/static/img/fly/git-install-13.png
deleted file mode 100644
index 229ea829d2..0000000000
Binary files a/static/img/fly/git-install-13.png and /dev/null differ
diff --git a/static/img/fly/git-install-14.png b/static/img/fly/git-install-14.png
deleted file mode 100644
index 42a0cc72c9..0000000000
Binary files a/static/img/fly/git-install-14.png and /dev/null differ
diff --git a/static/img/fly/git-install-15.png b/static/img/fly/git-install-15.png
deleted file mode 100644
index 6ca1980d04..0000000000
Binary files a/static/img/fly/git-install-15.png and /dev/null differ
diff --git a/static/img/fly/git-install-16.png b/static/img/fly/git-install-16.png
deleted file mode 100644
index 5518320f19..0000000000
Binary files a/static/img/fly/git-install-16.png and /dev/null differ
diff --git a/static/img/fly/git-install-17.png b/static/img/fly/git-install-17.png
deleted file mode 100644
index 29f1bc7a9f..0000000000
Binary files a/static/img/fly/git-install-17.png and /dev/null differ
diff --git a/static/img/fly/git-install-18.png b/static/img/fly/git-install-18.png
deleted file mode 100644
index 525b68fc48..0000000000
Binary files a/static/img/fly/git-install-18.png and /dev/null differ
diff --git a/static/img/fly/git-install-19.png b/static/img/fly/git-install-19.png
deleted file mode 100644
index b09b117861..0000000000
Binary files a/static/img/fly/git-install-19.png and /dev/null differ
diff --git a/static/img/fly/git-install-2.png b/static/img/fly/git-install-2.png
deleted file mode 100644
index 89b8aab3ec..0000000000
Binary files a/static/img/fly/git-install-2.png and /dev/null differ
diff --git a/static/img/fly/git-install-3.png b/static/img/fly/git-install-3.png
deleted file mode 100644
index df742723bc..0000000000
Binary files a/static/img/fly/git-install-3.png and /dev/null differ
diff --git a/static/img/fly/git-install-4.png b/static/img/fly/git-install-4.png
deleted file mode 100644
index 2ee24734b2..0000000000
Binary files a/static/img/fly/git-install-4.png and /dev/null differ
diff --git a/static/img/fly/git-install-5.png b/static/img/fly/git-install-5.png
deleted file mode 100644
index abaa25935c..0000000000
Binary files a/static/img/fly/git-install-5.png and /dev/null differ
diff --git a/static/img/fly/git-install-6.png b/static/img/fly/git-install-6.png
deleted file mode 100644
index 1af8808bd6..0000000000
Binary files a/static/img/fly/git-install-6.png and /dev/null differ
diff --git a/static/img/fly/git-install-7.png b/static/img/fly/git-install-7.png
deleted file mode 100644
index d05d6e02bd..0000000000
Binary files a/static/img/fly/git-install-7.png and /dev/null differ
diff --git a/static/img/fly/git-install-8.png b/static/img/fly/git-install-8.png
deleted file mode 100644
index 258192a9c2..0000000000
Binary files a/static/img/fly/git-install-8.png and /dev/null differ
diff --git a/static/img/fly/git-install-9.png b/static/img/fly/git-install-9.png
deleted file mode 100644
index 7a434df1b4..0000000000
Binary files a/static/img/fly/git-install-9.png and /dev/null differ
diff --git a/static/img/fly/[email protected] b/static/img/fly/[email protected]
new file mode 100644
index 0000000000..042431770b
Binary files /dev/null and b/static/img/fly/[email protected] differ
diff --git a/static/img/fly/[email protected] b/static/img/fly/[email protected]
new file mode 100644
index 0000000000..609d1afaff
Binary files /dev/null and b/static/img/fly/[email protected] differ
diff --git a/static/img/fly/[email protected] b/static/img/fly/[email protected]
new file mode 100644
index 0000000000..affd385f0e
Binary files /dev/null and b/static/img/fly/[email protected] differ
diff --git a/static/img/fly/[email protected] b/static/img/fly/[email protected]
new file mode 100644
index 0000000000..64f16f0914
Binary files /dev/null and b/static/img/fly/[email protected] differ
diff --git a/static/img/fly/[email protected] b/static/img/fly/[email protected]
new file mode 100644
index 0000000000..9681cc9dfc
Binary files /dev/null and b/static/img/fly/[email protected] differ
diff --git a/static/img/fly/fly-install-1.png b/static/img/fly/windows-install-1.png
similarity index 100%
rename from static/img/fly/fly-install-1.png
rename to static/img/fly/windows-install-1.png
diff --git a/static/img/fly/fly-install-2.png b/static/img/fly/windows-install-2.png
similarity index 100%
rename from static/img/fly/fly-install-2.png
rename to static/img/fly/windows-install-2.png
diff --git a/static/img/fly/fly-install-3.png b/static/img/fly/windows-install-3.png
similarity index 100%
rename from static/img/fly/fly-install-3.png
rename to static/img/fly/windows-install-3.png
diff --git a/static/img/fly/windows-start-1.png b/static/img/fly/windows-start-1.png
deleted file mode 100644
index 6418607609..0000000000
Binary files a/static/img/fly/windows-start-1.png and /dev/null differ
diff --git a/static/img/fly/windows-start-2.png b/static/img/fly/windows-start-2.png
deleted file mode 100644
index b50ed47d9b..0000000000
Binary files a/static/img/fly/windows-start-2.png and /dev/null differ
diff --git a/static/img/migrating/[email protected] b/static/img/migrating/[email protected]
new file mode 100644
index 0000000000..e8629db423
Binary files /dev/null and b/static/img/migrating/[email protected] differ
diff --git a/static/img/migrating/actual-config-10.png b/static/img/migrating/actual-import-1.png
similarity index 100%
rename from static/img/migrating/actual-config-10.png
rename to static/img/migrating/actual-import-1.png
diff --git a/static/img/migrating/actual-config-12.png b/static/img/migrating/actual-import-2.png
similarity index 100%
rename from static/img/migrating/actual-config-12.png
rename to static/img/migrating/actual-import-2.png