Merge branch 'dev-indep' of https://github.com/ytorg/yotter into dev-indep

CHANGELOG.md

@@ -8,6 +8,16 @@
 - Play tweet videos from Parasitter.
 - Create following lists.
 
+## [0.2.6] - 2020.09.20
+### How to update
+See [UPDATE](https://github.com/ytorg/Yotter/blob/dev-indep/SELF-HOSTING.md#updating-the-server) if you are on a manual installation. Docker can be updated normally. 
+
+## Added
+- [x] Admin tools - Delete inactive users.
+
+## Changed
+- [x] Database character limits.
+
 ## [0.2.5] - 2020.09.10
 ### How to update
 1. `sudo supervisorctl stop yotter`

README.md

@@ -17,6 +17,7 @@ Yotter is possible thanks to several open-source projects that are listed on the
 * [Privacy and Security](#privacy)
 * [Public instances](#public-instances)
 * [Self hosting](https://github.com/ytorg/Yotter/blob/dev-indep/SELF-HOSTING.md)
+    * [Update the server](https://github.com/ytorg/Yotter/blob/dev-indep/SELF-HOSTING.md#updating-the-server)
     * [Configure server](#configure-the-server)
 * [Contributing and contact](#contributing)
 * [Powered by](#powered-by)
@@ -71,7 +72,7 @@ I always recommend self-hosting, as you will be the only person with access to t
 # Public Instances
 | name |server location|registrations?|
 | ------------ | ------------ | ------------ |
-| https://yotter.xyz  |Germany| Limited (50 users)|
+| https://yotter.xyz  |Germany| Limited (60 users)|
 | https://yotter.kavin.rocks/  |India| Limited (50 users)|
 
 ## Configure the server
@@ -86,6 +87,8 @@ Currently available config is:
 * **nginxVideoStream**: Wether or not to use Nginx as streaming engine. It is recommended for public instances. [See this link]()
 * **maintenance_mode**: Activates a message on the server warning users of maintenance mode.
 * **show_admin_message**: Shows a message from the admin with title as `admin_message_title` and body as `admin_message`
+* **admin_user**: Username of the admin user.
+* **max_old_user_days**: Maximum days for a user to be inactive, otherwise will be deleted if admin uses the action.
 
 # Contributing
 Contributors are always welcome. You can help in many ways: Coding, organizing, designing, [donating](#donate), maintaining... You choose what you want to help with!

SELF-HOSTING.md

@@ -47,7 +47,7 @@ Now you should be logged in. Make sure to set up a good password. It is recommen
 git clone https://github.com/ytorg/Yotter && cd Yotter
 docker-compose up -d
 ```
-3. Configure Nginx
+3. Configure Nginx with a reverse proxy (Instructions coming soon)
 
 ### Manual installation
 
@@ -80,7 +80,7 @@ If after the MySQL-server installation you have not been prompted to create a pa
 * `pip install cryptography`
 * `pip install -r requirements.txt`
 
-> You can edit the `yotter-config.json` file
+> You can edit the `yotter-config.json` file. [Check out all the options here](https://github.com/ytorg/Yotter/blob/dev-indep/README.md#configure-the-server)
 
 5. Install gunicorn (production web server for Python apps) and pymysql:
 `pip install gunicorn pymysql`
@@ -219,7 +219,7 @@ Updating the server should always be pretty easy. These steps need to be run on
 (venv) $ pip install -r requirements.txt
 (venv) $ sudo supervisorctl start yotter
 ```
-
+* **IMPORTANT**: Make sure you have all set up on `yotter-config.json` once you finish the update.
 ## Other configurations
 
 ### Removing log-in restrictions