make it more clear this is actually a fork
Some checks reported errors
continuous-integration/drone/push Build encountered an error
Some checks reported errors
continuous-integration/drone/push Build encountered an error
Signed-off-by: Sam Therapy <sam@samtherapy.net>
This commit is contained in:
parent
097b5316e8
commit
7398ce6880
6 changed files with 44 additions and 43 deletions
27
.drone.yml
27
.drone.yml
|
@ -38,10 +38,13 @@ depends_on:
|
|||
|
||||
steps:
|
||||
- name: Build
|
||||
image: plugins/docker
|
||||
image: thegeeklab/drone-docker-buildx
|
||||
settings:
|
||||
repo: git.froth.zone/sam/birdsitelive
|
||||
dry_run: true
|
||||
platforms:
|
||||
- linux/amd64
|
||||
- linux/arm64
|
||||
when:
|
||||
event:
|
||||
- pull_request
|
||||
|
@ -49,18 +52,22 @@ steps:
|
|||
- "clone"
|
||||
|
||||
- name: Build & Publish
|
||||
image: plugins/docker
|
||||
image: thegeeklab/drone-docker-buildx
|
||||
settings:
|
||||
auto_tag: true
|
||||
repo: git.froth.zone/sam/birdsitelive
|
||||
registry: git.froth.zone
|
||||
username: sam
|
||||
password:
|
||||
from_secret: password
|
||||
repo: git.froth.zone/sam/birdsitelive
|
||||
tags: latest
|
||||
when:
|
||||
branch:
|
||||
- master
|
||||
event:
|
||||
- push
|
||||
depends_on:
|
||||
- "clone"
|
||||
platforms:
|
||||
- linux/amd64
|
||||
- linux/arm64
|
||||
when:
|
||||
branch:
|
||||
- master
|
||||
event:
|
||||
- push
|
||||
depends_on:
|
||||
- "clone"
|
|
@ -10,10 +10,10 @@ Your instance will need [docker](https://docs.docker.com/engine/install/) and [d
|
|||
|
||||
## Setup
|
||||
|
||||
Download the [docker-compose file](https://git.gamers.exposed/pasture/BirdsiteLIVE/raw/branch/master/docker-compose.yml):
|
||||
Download the [docker-compose file](https://git.froth.zone/sam/BirdsiteLIVE/raw/branch/master/docker-compose.yml):
|
||||
|
||||
```
|
||||
sudo curl -L https://git.gamers.exposed/pasture/BirdsiteLIVE/raw/branch/master/docker-compose.yml -o docker-compose.yml
|
||||
sudo curl -L https://git.froth.zone/sam/BirdsiteLIVE/raw/branch/master/docker-compose.yml -o docker-compose.yml
|
||||
```
|
||||
|
||||
Then edit file:
|
||||
|
@ -26,7 +26,7 @@ sudo nano docker-compose.yml
|
|||
|
||||
#### Personal info
|
||||
|
||||
* `Instance:Domain` the domain name you'll be using, for example use `birdsite.live` for the URL `https://birdsite.live`
|
||||
* `Instance:Domain` the domain name you'll be using, for example use `birdsite.example.com` for the URL `https://birdsite.example.com`
|
||||
* `Instance:AdminEmail` the admin's email, will be displayed in the instance /.well-known/nodeinfo endpoint
|
||||
* `Twitter:ConsumerKey` the Twitter API key
|
||||
* `Twitter:ConsumerSecret` the Twitter API secret key
|
||||
|
@ -55,35 +55,14 @@ docker-compose up -d
|
|||
|
||||
By default the app will be available on the port 5000
|
||||
|
||||
## Nginx
|
||||
## Nginx configuration
|
||||
|
||||
On a Debian based distrib:
|
||||
|
||||
```
|
||||
sudo apt update
|
||||
sudo apt install nginx
|
||||
```
|
||||
|
||||
Check nginx status:
|
||||
|
||||
```
|
||||
sudo systemctl status nginx
|
||||
```
|
||||
|
||||
### Create nginx configuration
|
||||
|
||||
Create your nginx configuration
|
||||
|
||||
```
|
||||
sudo nano /etc/nginx/sites-enabled/{your-domain-name.com}
|
||||
```
|
||||
|
||||
And fill your service block as follow:
|
||||
Fill your service block as follow:
|
||||
|
||||
```
|
||||
server {
|
||||
listen 80;
|
||||
server_name {your-domain-name.com};
|
||||
server_name birdsite.example.com;
|
||||
location / {
|
||||
proxy_pass http://localhost:5000;
|
||||
proxy_http_version 1.1;
|
||||
|
@ -111,16 +90,31 @@ After having a domain name pointing to your instance, install and setup certbot:
|
|||
|
||||
```
|
||||
sudo apt install certbot python3-certbot-nginx
|
||||
sudo certbot --nginx -d {your-domain-name.com}
|
||||
sudo certbot --nginx -d birdsite.example.com
|
||||
```
|
||||
|
||||
Make sure you're redirecting all traffic to https when asked.
|
||||
|
||||
Finally check that the auto-revewal will work as espected:
|
||||
Finally check that the auto-renewal will work as expected:
|
||||
|
||||
```
|
||||
sudo certbot renew --dry-run
|
||||
```
|
||||
## Caddy
|
||||
|
||||
|
||||
Or, you can use [caddy](https://caddyserver.com)
|
||||
|
||||
```caddyfile
|
||||
birdsite.example.com {
|
||||
encode gzip
|
||||
header ?Cache-Control "max-age=3600"
|
||||
reverse_proxy http://localhost:5000 {
|
||||
header_down -Server
|
||||
}
|
||||
}
|
||||
```
|
||||
Everything
|
||||
|
||||
### Set the firewall
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
<TargetFramework>net6.0</TargetFramework>
|
||||
<UserSecretsId>d21486de-a812-47eb-a419-05682bb68856</UserSecretsId>
|
||||
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
|
||||
<Version>0.19.1</Version>
|
||||
<Version>0.20.0</Version>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
@ -12,7 +12,7 @@ namespace BirdsiteLive
|
|||
{
|
||||
public static string VERSION =
|
||||
System.Reflection.Assembly.GetEntryAssembly().GetName().Version.ToString(3)
|
||||
+ "+pasture+fishe";
|
||||
+ "+fishe";
|
||||
|
||||
public static void Main(string[] args)
|
||||
{
|
||||
|
|
|
@ -56,7 +56,7 @@
|
|||
|
||||
As this instance's saturation level approaches and exceeds 100%, it will no longer update accounts every 15 minutes and reduce how often it fetches Tweets to stay under Twitter's limits. Essentially, the more saturated a node is, the less efficient it will be.<br /><br />
|
||||
|
||||
When possible, you should <a href="https://git.gamers.exposed/pasture/BirdsiteLIVE/src/branch/master/INSTALLATION.md" target="_blank">start your own BirdsiteLIVE instance</a>. If you cannot, please be courteous and follow a limited number of accounts to keep the service available for everyone.
|
||||
When possible, you should <a href="https://git.froth.zone/sam/BirdsiteLIVE/src/branch/master/INSTALLATION.md" target="_blank">start your own BirdsiteLIVE instance</a>. If you cannot, please be courteous and follow a limited number of accounts to keep the service available for everyone.
|
||||
</p>
|
||||
|
||||
@if (Model.Settings.DiscloseInstanceRestrictions && (Model.ModerationStatus.Followers != BirdsiteLive.Domain.Repository.ModerationTypeEnum.None || Model.ModerationStatus.TwitterAccounts != BirdsiteLive.Domain.Repository.ModerationTypeEnum.None))
|
||||
|
|
|
@ -47,7 +47,7 @@
|
|||
</div>
|
||||
<div class="container">
|
||||
|
||||
<a href="https://git.gamers.exposed/pasture/BirdsiteLIVE">Source code</a> (AGPLv3) @*<a asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>*@
|
||||
<a href="https://git.froth.zone/sam/BirdsiteLIVE">Source code</a> (AGPLv3) @*<a asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>*@
|
||||
|
||||
<span style="float: right;">BirdsiteLIVE @Program.VERSION</span>
|
||||
</div>
|
||||
|
|
Reference in a new issue