Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ajout de Cosmic CMS #3

Open
wants to merge 40 commits into
base: main
Choose a base branch
from
Open

Conversation

TheRevenge
Copy link

Voilà enfin la PR d'ajout de Cosmic !

  • Bug fix dans la configuration du client/des swfs
  • Ajout de Cosmic ainsi que scripts pour son installation complète (DB et CMS)
  • Changements au niveau de la configuration du réseau docker afin d'utiliser le RCON (pour Cosmic)
  • PASSAGE SUR LA BRANCHE DEV pour nitro-react, la branche est en réalité bien plus stable que la branche main

N.B. : J'ai retiré le "patch sass" car c'était un bidouillage pour les machines avec un proc arm. Puis il est pas difficile à refaire :p

Si vous voyez des améliorations à faire, n'hésitez pas !

@musotec
Copy link

musotec commented Jul 6, 2022

This commit definitely breaks networking for me.
I cannot get inside my VM with pings and the out of box configuration breaks the http://127.0.0.1:1080/?sso=123 of the default guide.

It kinda half works when you migrate from an existing install and then run the container, but only when you do not do a just clean-docker. So something isn't quite right.

The resulting deployment does not result in something that lets me access cosmic cms from http://127.0.0.1/cms as the code would imply- due to some php error I did not bother to look into.
I think it has something to do with the sql tables and the lack/presence of a missing "template" column (probably added here)

EDIT: just to be clear, the issue probably is with apache configuration, which seems to be included in the php container. Regardless, I cannot get to the main landing page from outside of my VM due to how it's setting up things in iptables/apache.

@TheRevenge
Copy link
Author

I'll run some tests and see if I encounter the same issues. Thanks for your feedback!

@musotec
Copy link

musotec commented Jul 12, 2022

I'll run some tests and see if I encounter the same issues. Thanks for your feedback!

I looked into this again, turns out the problem is with the static ip configuration you're doing.
The problem is that the main project you're merging into uses the default docker networking stack, but you are assigning an IP that only works for your configuration.

Docker on my machine creates a network in the 172.16.0.0/12 subnet and automatically assigns the IPs 172.16.0.2-4 for the containers. When I remove the 192.x.x.x/24 static ip you assign in the docker-compose.yaml there is no issue with the configuration.

I am not sure why you're doing that, but it shouldn't be necessary in the out of the box implementation. You should perhaps remove your custom networking and retry a build from scratch. Leave any custom configuration to users who clone the repo.

@TheRevenge
Copy link
Author

TheRevenge commented Jul 13, 2022

I remember it had to do something with the RCON connection (which wasn't working untill I put the static IP thing). I couldn't run tests on my computer (unrelated problems, the regular didn't work either) but I'll get on my macbook to fix this.

Edit: the problem is that the emulator ( Arcturus MS) has an IP whitelist for RCON. That's why I needed a static IP for the php-apache image. I thought the edit I made in the network configuration would have forced the subnet to stick to the given ip and range.

@Pi-Bouf
Copy link
Contributor

Pi-Bouf commented Jul 24, 2022

@TheRevenge it works or nope ?

Now you removed static ipv4 and RCON only use comet, it allow RCON connection ?

@TheRevenge
Copy link
Author

Well I have a shitty internet (I'm on vacation) so I can't really run my tests

Copy link
Contributor

@Pi-Bouf Pi-Bouf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You just clear the file mysql/dumps/arcturus_3.0.0-stable_base_database--compact.sql and change rights.

We need to keep this file AND make an another one like cosmic_2.6_update.sql with all Cosmic's change.

Not just make one big file called cosmic2.6.sql

It's not the Cosmic database, it's the Arcturus database with a cosmic update :D

emulator/scripts/build.sh Outdated Show resolved Hide resolved
@TheRevenge
Copy link
Author

@Pi-Bouf Actually there are 3 .sql :

  • The base sql for acturus 3.0.0
  • The update for arcturus (3.0.0 -> 3.5.0)
  • And the base sql for cosmic
    What would you like to change ?

@musotec
Copy link

musotec commented Jul 28, 2022

I believe @Pi-Bouf is saying that the "base sql for cosmic" that you have included is actually a "arcturus + cosmic" sql database. When they would prefer that the cosmic sql be only the sql needed to migrate from arcturus 3.5.0 -> cosmic.

@Nigcra
Copy link

Nigcra commented Aug 24, 2023

With this patch, the external dependencies would also still need to be removed. I have tried the state and it requires a login for the external Gitlab server.

Klone nach '/therevenge/cms/cosmic'...
Username for 'https://git.krews.org':
Password for 'https://git.krews.org':
remote: HTTP Basic: Access denied. The provided password or token is incorrect or your account has 2FA enabled and you must use a personal access token instead of a password. See https://git.krews.org/help/topics/git/troubleshooting_git#error-on-git-fetch-http-basic-access-denied
Schwerwiegend: Authentifizierung fehlgeschlagen für 'https://git.krews.org/Raizer/Cosmic.git/'
Schwerwiegend: Klonen von 'https://git.krews.org/Raizer/Cosmic.git' in Submodul-Pfad '/therevenge/cms/cosmic' fehlgeschlagen.

@Pi-Bouf
Copy link
Contributor

Pi-Bouf commented Aug 24, 2023

Is-it really useful to have a cosmic ?

@Nigcra
Copy link

Nigcra commented Aug 24, 2023

I think that would be useful. I would like to test a few things that I could already do via SQL. But it would be much more relaxed via a CMS. But I would not care which CMS.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants