Merge branch 'main' of https://gitlab.comwork.io/comwork_public/comwork_cloud into main

.docker/docusaurus/docusaurus.config.js

@@ -134,10 +134,20 @@ const config = {
                         position: 'right',
                     },
                     {
-                        to: 'https://comwork-cloud.slack.com',
+                        to: 'https://mastodon.comwork.io',
+                        label: 'Mastodon',
+                        position: 'right',
+                    },
+                    {
+                        to: 'https://join.slack.com/t/comwork-cloud/shared_invite/zt-1h04v2jp0-cF9p53MzfzxuChVobWKQEQ',
                         label: 'Slack',
                         position: 'right',
                     },
+                    {
+                        to: 'https://discord.gg/CXskxxPauz',
+                        label: 'Discord',
+                        position: 'right',
+                    },
                 ],
             },
             footer: {
@@ -154,6 +164,19 @@ const config = {
                                 label: 'Cloud console',
                                 to: 'https://cloud.comwork.io',
                             },
+                            {
+                                label: 'Mastodon',
+                                to: 'https://mastodon.comwork.io',
+                            },
+                            {
+                                label: 'Slack',
+                                to: 'https://join.slack.com/t/uprodit-tech/shared_invite/zt-1h3hh21tf-Rxb4zbSiRz8GFVwXvqLHMA',
+                            },
+                            {
+                                to: 'https://discord.gg/CXskxxPauz',
+                                label: 'Discord',
+                                position: 'right',
+                            },
                         ],
                     },
                 ],

.gitlab-ci.yml

 stages:
+  - publish
   - generate
   - build
   - deploy
 
+mirror:
+  stage: publish
+  script:
+    - setsid ./ci/mirror.sh
+  only:
+    - /^(main.*)$/
+  tags:
+    - mirror
+
 pricing:
   stage: generate
   script:

README.md

@@ -23,11 +23,14 @@ The instances are hosted on [Scaleway](https://www.scaleway.com) or [OVHCloud](h
 * [Portainer as a service](./portainer.md)
 * [Wordpress as a service](./wpaas.md)
 * [Matomo as a service](./matomo.md)
+* [Mastodon as a service](./mastodon.md)
+* [odoo as a service](./odoo.md)
 * [Databases as a service](./dbaas.md)
 * [Gateway as a service](./vps.md)
 * [Object storages and OCI registries](./storage.md)
 * [Sizing and pricing](./sizing_pricing.md)
 * [Subscription procedure](./subscription.md)
+* [Community and support](./community.md)
 * [Licences](./licences.md)
 * [Cloud on premise / selfhosted](./onprem.md)
 

ci/mirror.sh

+#!/bin/bash
+
+REPO_PATH="${PROJECT_HOME}/comwork-cloud-wiki/"
+
+cd "${REPO_PATH}" && git pull origin main || :
+git push github main -f
+git push pgitlab main -f
+git push froggit main -f
+exit 0

ci/notif.sh

@@ -12,5 +12,16 @@ slack_notif() {
     fi
 }
 
+discord_notif() {
+    token="${1}"
+    if [[ $token ]]; then
+        message="${SLACK_USERNAME} has been successfully deployed! version = ${VERSION}"
+        endpoint="https://discord.com/api/webhooks/${token}/slack"
+        payload="{\"text\": \"${message}\", \"username\": \"${SLACK_USERNAME}\"}"
+        curl -X POST "${endpoint}" -H "Accept: application/json" -d "${payload}"
+    fi
+}
+
 slack_notif "${SLACK_TOKEN}"
 slack_notif "${SLACK_TOKEN_PUBLIC}"
+discord_notif "${DISCORD_TOKEN_PUBLIC}"

community.md

+# Community and support
+
+## Git repositories
+
+Here's our git repositories:
+
+* Main repo: https://gitlab.comwork.io/comwork_public/comwork_cloud
+* Github mirror: https://github.com/idrissneumann/comwork-cloud-wiki.git
+* Gitlab mirror: https://gitlab.com/ineumann/comwork-cloud-wiki.git
+* Froggit mirror: https://lab.frogg.it/ineumann/comwork-cloud-wiki.git
+
+You can use all those repositories in order to:
+* Send us pull requests/merge requests if you think there's room of improvments
+* Open tickets for any bug you want to share about cloud.comwork.com or its API, cli, whatever related
+* Ask for new features or evolutions
+
+## Mastodon, slack and discord
+
+You can join our [Mastodon](https://mastodon.comwork.io), [Slack workspace](https://join.slack.com/t/comwork-cloud/shared_invite/zt-1h04v2jp0-cF9p53MzfzxuChVobWKQEQ) or [Discord server](https://discord.gg/CXskxxPauz) in order to ask help or sharing with the community.
+
+You can there directly talk with the team if you're not quick enough on the tickets but also share your technical insights with the rest of the community and get help by the other members.

mastodon.md

+# Mastodon as a service
+
+Mastodon is an OpenSource and Federated software which brings you the ability to provide microblogging features which are similar to Twitter or Reddit social networks.
+
+![mastodon](./img/mastodon.png)
+
+Mastodon is also part of the Fediverse like PeerTube. So it makes more sens to add new instances instead of joining the existing big instances such as [mastodon.social](https://mastodon.social) or [fosstodon](https://fosstodon.org). Moreover, some of them are suffering big increase of charge and needs to scale up without having enough found.
+
+We're proving this [free instance](https://mastodon.comwork.io) for you to test and join mastodon but we'll probably have to close the new registrations at some point. But don't worry, this is also the reason we're providing dedicated instances if you want to promote the Fediverse with this comwork cloud offer.
+
+## Demo and tutorial
+
+You can find demo and tutorials [here](./tutorials/mastodon.md)
+
+## Minimal requirements
+
+We advise to start with an instance >= [DEV1-M](./sizing_pricing.md)
+
+## Sizing and pricing
+
+Check it out [here](./sizing_pricing.md).
+
+You can also choose to do it by yourself, it's completely free, enjoy [our repository](https://gitlab.comwork.io/oss/ansible-iac/mastodon) with the docker images and ansible roles in order to install it by yourself.

odoo.md

+# Odoo as a service
+
+Odoo is an opensource suite of business apps that cover all a company is needing: ERP, CRM, eCommerce, accounting, inventory, point of sale, project management...
+
+![odoo](./img/odoo.png)
+
+## Demo and tutorial
+
+You can find demo and tutorials [here](./tutorials/odoo.md)
+
+## Minimal requirements
+
+We advise to start with an instance >= [DEV1-M](./sizing_pricing.md)
+
+## Sizing and pricing
+
+Check it out [here](./sizing_pricing.md).

storage.md

@@ -8,7 +8,7 @@ This feature is only available for comwork cloud administrator (you can directly
 
 ![oci_registry](./img/oci_registry.png)
 
-For the SaaS version, you can either ask for a quote by email with `cloud@comwork.io` or in our [Slack workspace](https://comwork-cloud.slack.com) (channel `#storage`).
+For the SaaS version, you can either ask for a quote by email with `cloud@comwork.io` or in our [Slack workspace](https://join.slack.com/t/comwork-cloud/shared_invite/zt-1h04v2jp0-cF9p53MzfzxuChVobWKQEQ) or [Discord server](https://discord.gg/CXskxxPauz) (channel `#storage`).
 
 Even if you're not an admin, you'll be able to manage your object storage bucket and OCI registries when there are created and associated with your account.
 

subscription.md

@@ -9,7 +9,7 @@ Firstable, if you want a quote or subscribe, you can:
 Then, once you agree with us on contract terms (including the [sizing/pricing part](./sizing_pricing.md)):
 
 1. Create your account [here](https://cloud.comwork.io/signup)
-2. Send-us an email at `cloud@comwork.io` to notify the email of your account. We'll also send you an invitation on our [Slack workspace](https://comwork-cloud.slack.com). You will be able to invite other people.
+2. Send-us an email at `cloud@comwork.io` or [join our Slack](https://join.slack.com/t/comwork-cloud/shared_invite/zt-1h04v2jp0-cF9p53MzfzxuChVobWKQEQ) or [our Discord server](https://discord.gg/CXskxxPauz) and asks-us there!
 3. An admin will enable your account
 
 ## 2FA / MFA (multiple factor authentication)

tutorials/README.md

@@ -8,6 +8,8 @@
 * [OpenFaaS / Faasd](./faasd.md)
 * [Localtunnel server](./localtunnel.md)
 * [Wordpress and matomo](./wpaas_matomo.md)
+* [Mastodon](./mastodon.md)
+* [Odoo](./odoo.md)
 * [Databases as a service](./dbaas.md)
 * [Overleaf as a service](./overleaf.md)
 * [Connect with SSH](./ssh.md)

tutorials/mastodon.md

+# Mastodon as a service
+
+## Getting started
+
+You've just setup your Mastodon instance and you've got this error on the frontpage serve by the `https://{your_instance_hash}.mastodon.comwork.(cloud|dev|info)`, that's pretty normal. 
+
+![mastodon_error](../img/mastodon_error.png)
+
+It's because your instance is not ready yet, you have to follow those steps first:
+
+**1/** Connect with [ssh](./ssh.md)
+
+**2/** Execute the following command on the SSH session:
+
+```shell
+$ sudo su -
+$ docker-compose -f docker-compose-mastodon.yml run --rm shell bundle exec rake secret
+```
+
+And add the following variable with the output in the ansible environment file (`env/{ instance_hash }.yml`):
+
+```yaml
+mastodon_secret_key: changeit
+```
+
+**3/** Execute the following command on the SSH session:
+
+```shell
+$ sudo su -
+$ docker-compose -f docker-compose-mastodon.yml run --rm shell bundle exec rake mastodon:webpush:generate_vapid_key
+```
+
+And add the following variabls with the output (pick only the values left to the `=` signs) in the ansible environment file (`env/{ instance_hash }.yml`):
+
+```yaml
+mastodon_vapid_private_key: changeit
+mastodon_vapid_public_key: changeit
+```
+
+**4/** Also update this settings (replace `"true"` by `"false"`):
+
+```yaml
+pgsql_first_install: "false"
+```
+
+Push on the `main` branch of your gitlab repo.
+
+**5/** Your instance is ready on `https://{your_instance_hash}.mastodon.comwork.(cloud|dev|info)`, go register your first user account there:
+
+![mastodon_register](../img/mastodon_register.png)
+
+**6/** On the SSH session you've opened earlier, register your user as the admin of instance using our rake task like that:
+
+```shell
+$ sudo su -
+$ docker-compose -f docker-compose-mastodon.yml run -e USERNAME=YOUR_USERNAME --rm shell bundle exec rake comwork:set_admin
+```
+
+Replace `YOUR_USERNAME` by the username you've chosen.
+
+## Settings automation in a gitops way
+
+We also provide this project: [mastodon-term-services](https://gitlab.comwork.io/oss/mastodon-term-services) in order to automatize in a gitops way the following settings:
+
+* Term of services html page
+* List of rules
+* Ban list of not compliant instances
+
+Feel free to fork-it and make your own rules and term of services.

tutorials/odoo.md

+# Odoo
+
+## Getting started
+
+Once you created your odoo instances and it's ready, you'll get on this screen:
+
+![odoo_init](../img/odoo_init.png)
+
+Notes:
+* Use `admin` as database's name
+* Keep the master password somewhere safe

tutorials/onprem.md

@@ -6,7 +6,7 @@ In order to access to our images and releases, you'll need to ask first for beei
 
 You can do-it using:
 * The `cloud@comwork.io` email
-* Our [Slack workspace](https://comwork-cloud.slack.com) (channel `#storage`)
+* Our [Slack workspace](https://join.slack.com/t/comwork-cloud/shared_invite/zt-1h04v2jp0-cF9p53MzfzxuChVobWKQEQ) (channel `#storage`)
 
 ## Using ansible