Skip to content

Commit

Permalink
Removed mentions of IHP Cloud
Browse files Browse the repository at this point in the history
Fixes #1599
  • Loading branch information
mpscholten committed Apr 8, 2023
1 parent 9f3e22a commit 651931c
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 30 deletions.
2 changes: 1 addition & 1 deletion Guide/authentication.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ To block login (requires `isConfirmed` boolean field in `Users` table):
instance Sessions.SessionsControllerConfig User where
beforeLogin user = do
unless user.isConfirmed do
setErrorMessage "Please click the confirmation link we sent to your email before you can use IHP Cloud"
setErrorMessage "Please click the confirmation link we sent to your email before you can use the App"
redirectTo NewSessionAction
```

Expand Down
2 changes: 1 addition & 1 deletion Guide/auto-refresh.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Auto Refresh offers a way to re-render views of your application when the underl

**Use Cases:**

1. This is used in the IHP Cloud to display the current deployment status. Whenever e.g. the deployment progress or status changes, the view gets updated automatically.
1. This is used in Shipnix to display the current deployment status. Whenever e.g. the deployment progress or status changes, the view gets updated automatically.
2. When building a monitoring tool for background job workers. Using auto refresh the view can always represent the current state of all the job queues.
3. When building a small social media site: Automatically display new posts in the feed when they become available.

Expand Down
10 changes: 1 addition & 9 deletions Guide/deployment.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ Shipnix is a service for deploying NixOS web servers on DigitalOcean with first-

Generating a base NixOS configuration for your specific project, Shipnix provides full freedom to configure with ease of use.

Apart from the technical differences, the deployment experience in Shipnix is similar to IHP Cloud.

### Account Setup

Register a new account on [shipnix.io](https://shipnix.io) and follow the instructions to connect to your DigitalOcean account and upload a NixOS image to it. This one-time process takes about 10 minutes.
Expand All @@ -20,10 +18,6 @@ Register a new account on [shipnix.io](https://shipnix.io) and follow the instru

Provisioning a new IHP project is straightforward with the IHP starter. Read [the IHP starter guide](https://docs.shipnix.io/starters/ihp/) to find out how to set domains, enable https with LetsEncrypt and other common usecases.

### Migrate from IHP Cloud to Shipnix

If you wish to migrate from IHP Cloud, Shipnix has a [migration guide](https://docs.shipnix.io/migrate/ihp-cloud/).

## Deploying with Docker

Deploying IHP with docker is a good choice for a professional production setup.
Expand Down Expand Up @@ -373,7 +367,7 @@ scripts = do

### Updating your Deployment Process

**If you're using IHP Cloud:** Nothing to do. The command `make static/prod.js static/prod.css` is automatically executed during deployment.
**If you're using Nix:** Nothing to do. The command `make static/prod.js static/prod.css` is automatically executed during deployment.

**If you're deploying manually:** Make sure that `make static/prod.js static/prod.css` is called.

Expand Down Expand Up @@ -435,8 +429,6 @@ config = do

Now sentry is set up.

**When running on IHP Cloud:** You also need to update the `Config.hs` inside your IHP Cloud project settings.

## Building with Nix

You can use `nix-build` to make a full build of your IHP app:
Expand Down
3 changes: 0 additions & 3 deletions Guide/examples.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ Check out these example apps to gain real-world knowledge on how IHP apps are bu
**💬 IHP Chat: Basic slack-like chat application**

- [Source Code on GitHub](https://github.com/digitallyinduced/ihp-chat-example-app)
- [Live Demo on IHP Cloud](https://ihpchatexampleapp.ihpapp.com) Log in with `[email protected]` / `demo`
- [Develop this project on GitPod](https://gitpod.io/#https://github.com/digitallyinduced/ihp-chat-example-app)

[![IHP Chat App](https://github.com/digitallyinduced/ihp-chat-example-app/raw/master/static/screenshot.png)](https://ihpchatexampleapp.ihpapp.com)
Expand All @@ -29,7 +28,6 @@ Here are some open-source IHP apps created by the community:

- [Source Code on GitHub](https://github.com/rametta/retros)
- by [@rametta](https://github.com/rametta)
- [Demo on IHP Cloud](https://retros.ihpapp.com/)

**🎧 Attics -- Thousands of live concerts at your fingertips**
- [Source Code on GitHub](https://github.com/zacwood9/Attics)
Expand All @@ -42,5 +40,4 @@ Here are some open-source IHP apps created by the community:
- [Source Code on GitHub](https://github.com/philschonholzer/co2db)
- by [@philschonholzer](https://github.com/philschonholzer)
- What are the CO2 emissions of things. How can we as a society fight the climate crisis if we hardly know the opponent (CO2).
- [Demo on IHP Cloud](https://co2db.ihpapp.com/)
- [YouTube](https://www.youtube.com/watch?v=7q2PJuPkVVc&t)
6 changes: 3 additions & 3 deletions Guide/purescript.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ This will generate a ready-to-go IHP app with PureScript + Halogen set up. To ch

If you don't see "PureScript + Halogen is also working!" right away, check the terminal if you see `[info] Success! Waiting for next file change.`, otherwise it could be compiling with logs such as `Compiling Module.Name`. Try refreshing once the PureScript code is done compiling.

## Deploying to IHP Cloud
## Deployment

If you decide to deploy your app to IHP Cloud you will need to make some adjustments to your project files in order to get the app compiling. Specifically, add these packages to `otherDeps` in your `default.nix` file:
If you decide to deploy your app with nix you will need to make some adjustments to your project files in order to get the app compiling. Specifically, add these packages to `otherDeps` in your `default.nix` file:

```
otherDeps = p: with p; [
Expand All @@ -45,7 +45,7 @@ Run this command to ensure spago plays nicely with the new version of Purescript
spago upgrade-set
```

Finally, add this to the end of your `Makefile` to tell IHP Cloud how to build and bundle your app into the index.js file:
Finally, add this to the end of your `Makefile` to tell the build process how to build and bundle your app into the index.js file:

```
static/halogen/index.js:
Expand Down
2 changes: 1 addition & 1 deletion Guide/tailwindcss.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -226,4 +226,4 @@ make static/prod.css

`Make` will automatically detect that `static/app.css` is missing and will run `make static/app.css` to produce that missing file. This will then trigger the tailwind production build.

This means you don't need to make any changes to your existing deployment process or your IHP Cloud settings.
This means you don't need to make any changes to your existing deployment process.
4 changes: 2 additions & 2 deletions Guide/your-first-project.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -1178,7 +1178,7 @@ Go to your server dashboard and find the **Public IP** address.
Copy and paste it in your browser, and you should see your application on the web 🙂
![IHP Cloud Deployment Started](images/first-project/ihp-cloud-deployment-4.png)
![Deployment Started](images/first-project/ihp-cloud-deployment-4.png)
**Congratulations!** You just shipped your first haskell application to production 🚀
Expand All @@ -1193,6 +1193,6 @@ You now understand enough of IHP and Haskell to be dangerous. The best way to co
- [Leave a Star on the IHP-GitHub repo](https://github.com/digitallyinduced/ihp) and join the IHP community to work on the future of typesafe, FP-based software development.
- [To stay in the loop, subscribe to the IHP release emails.](https://ihp.digitallyinduced.com/MailingList)
- Questions, or need help with Haskell type errors? Join our Slack: [Join IHP Slack](https://ihp.digitallyinduced.com/Slack)
- Want to put your IHP app online? [Check out IHP Cloud](https://ihpcloud.com/). It will take a few clicks and your app is online in two minutes :)
- Want to put your IHP app online? [Check out Shipnix](https://shipnix.io/). It will take a few clicks and your app is online in two minutes :)
_Good to know for playing with IHP: When you want to delete a project just delete the project directory and it's gone._
2 changes: 1 addition & 1 deletion IHP/AuthSupport/Controller/Sessions.hs
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ class ( Typeable record
--
-- > beforeLogin user = do
-- > unless (get #isConfirmed user) do
-- > setErrorMessage "Please click the confirmation link we sent to your email before you can use IHP Cloud"
-- > setErrorMessage "Please click the confirmation link we sent to your email before you can use the App"
-- > redirectTo NewSessionAction
beforeLogin :: (?context :: ControllerContext, ?modelContext :: ModelContext) => record -> IO ()
beforeLogin _ = pure ()
Expand Down
9 changes: 1 addition & 8 deletions IHP/FrameworkConfig.hs
Original file line number Diff line number Diff line change
Expand Up @@ -253,12 +253,8 @@ instance EnvVarReader RequestLogger.IPAddrSource where

initAssetVersion :: ConfigBuilder
initAssetVersion = do
ihpCloudContainerId <- envOrNothing "IHP_CLOUD_CONTAINER_ID"
ihpAssetVersion <- envOrNothing "IHP_ASSET_VERSION"
let assetVersion = [ ihpCloudContainerId, ihpAssetVersion]
|> catMaybes
|> head
|> fromMaybe "dev"
let assetVersion = fromMaybe "dev" ihpAssetVersion
option (AssetVersion assetVersion)

findOption :: forall option. Typeable option => State.StateT TMap.TMap IO option
Expand Down Expand Up @@ -446,9 +442,6 @@ data FrameworkConfig = FrameworkConfig

-- | The asset version is used for cache busting
--
-- On IHP Cloud IHP automatically uses the @IHP_CLOUD_CONTAINER_ID@ env variable
-- as the asset version. So when running there, you don't need to do anything.
--
-- If you deploy IHP on your own, you should provide the IHP_ASSET_VERSION
-- env variable with e.g. the git commit hash of the production build.
--
Expand Down
2 changes: 1 addition & 1 deletion IHP/Mail/Types.hs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ data MailServer =
, secretKey :: ByteString
-- | E.g. @"us-east-1"@ or @"eu-west-1"@
, region :: Text }
-- | Uses the local Sendmail binary for sending emails. Avoid this with IHP Cloud
-- | Uses the local Sendmail binary for sending emails
| Sendmail
-- | Uses SendGrid for sending emails
| SendGrid { apiKey :: Text
Expand Down

0 comments on commit 651931c

Please sign in to comment.