internetstandards / Internet.nl

Internet standards compliance test suite
https://internet.nl
164 stars 36 forks source link

Allow enabling news, about page and multiple languages #1418

Closed aequitas closed 2 weeks ago

aequitas commented 1 month ago

To resolve https://github.com/internetstandards/Internet.nl/issues/1341 but not go as far as https://github.com/internetstandards/Internet.nl/issues/1188. Currently some parts of the site/installation are disabled by default as they contain internet.nl specific content or references.

apio-sys commented 1 month ago

That would be great @aequitas . Especially the first part. To configure additional languages is already OK with some manual tweaking. I have that working on my POC here: https://conformite-internet.fr/ . But better conf options would be better since as it is I need to tweak certbot.sh also for the languages and thus once in a while resolve merge conflicts manually since I want to keep my fork up2date with the core all the time. So option 1 would be my priority and the 2nd nice2have. The POC still might change for the domain name since we are currently deciding how to present this to the French speaking public and with which graphical representation. Most likely this will be done together with afnic.fr but more to follow on that in due course.

aequitas commented 4 weeks ago

@apio-sys I've just pushed https://github.com/internetstandards/Internet.nl/pull/1427, can you see if this works for you? The documentation/Customize.md should contain the required instructions.

apio-sys commented 3 weeks ago

Thanks for the update @aequitas . I need to find some time this week to setup a separate fork for testing this since I have only main setup for the moment. Will revert asap.

apio-sys commented 3 weeks ago

Hi Johan @aequitas . I have merged the translations branch to my forked repo and solved the conflicts and went through your instructions. This works very well like this with all language flags as vars, great thanks! Security.txt also OK as well as the custom.po translations which all show correctly. Many thanks for this, this is a great step forward. I'm just having a few test jobs fail now it Github actions,

integration-test batch-integration-test test development-environment-test

all failing with: ENOENT: no such file or directory, open 'test-results.xml'

This doesn't stop from deploying and testing though.

apio-sys commented 3 weeks ago

OK I see there is already this commit for the tests failing https://github.com/internetstandards/Internet.nl/commit/e94de9ac2924d68a5fed94d8862be164df32c1d7 so that should be fine when all merged to main.

apio-sys commented 2 weeks ago

I have merged all from main again seen all the recent commits and solved the conflicts I had on integration_tests/common/test_basic.py and docker/docker-compose-integration-tests.yml . Most tests work again except for development-environment-test that fails as follows:

integration_tests/develop/test_basic.py:31: AssertionError
----------------- generated xml file: /source/test-results.xml -----------------
=========================== short test summary info ============================
SKIPPED [1] integration_tests/develop/test_website.py:26: IPv6 networking not available
SKIPPED [1] integration_tests/develop/test_resolvers.py:21: IPv6 networking not available
FAILED integration_tests/develop/test_basic.py::test_security_txt[http://host-gateway:8080-chromium]
=================== 1 failed, 10 passed, 2 skipped in 34.19s ===================
make: *** [Makefile:563: develop-tests] Error 1
Error: Process completed with exit code 2.

But also my build process now fails as follows:

no configuration file provided: not found

I can't really understand why, the defaults.env, host.env and local.env are all there as well as the docker-compose.yml...

aequitas commented 2 weeks ago

This is due to changes in multiple recent versions of Compose, please refer to this section for the currently supported versions of Docker and Compose: https://github.com/internetstandards/Internet.nl/blob/main/documentation/Docker-getting-started.md#prerequisites. My guess is you are running a to old version of Compose (see: docker compose version), 2.27.0 is the best version at the moment, the newer 2.27.1 contains a new bug that will hopefully soon be resolved.

For context: https://github.com/internetstandards/Internet.nl/pull/1419

apio-sys commented 2 weeks ago

Thanks for the explanation. I'm running the latest available for Ubuntu 22.04:

docker compose version
Docker Compose version v2.27.1

I read the notes about the 2.27.1 issue which seems already solved so I shall await the fix and continue to keep running latest (and then maybe pin it once working again?).

aequitas commented 2 weeks ago

If you follow the instructions in https://github.com/internetstandards/Internet.nl/blob/main/documentation/Docker-deployment.md#server-setup you can disable unsupported versions using Apt pinning. You can then downgrade to 2.27.0 by using apt remove docker-compose-plugin; apt install docker-compose-plugin.

aequitas commented 2 weeks ago

Please let me know if it works as expected so I can close this issue.

apio-sys commented 2 weeks ago

Thanks for the doc. Indeed I can now build successfully again! I still have the development-environment-test job failing though but that looks more GitHub related seen the msg IPv6 networking not available. But that doesn't prevent me from building though so I guess we can close this topic here.

aequitas commented 2 weeks ago

The IPv6 networking not available message is the reason why those tests were skipped. This is normal and can be ignored.

I do see FAILED integration_tests/develop/test_basic.py::test_security_txt[http://host-gateway:8080-chromium] which indicates a security.txt test failed, I think that is due to you having adding security.txt file content, which is to be expected. I will remove that test because it doesn't add much value in this case. https://github.com/internetstandards/Internet.nl/pull/1437

aequitas commented 2 weeks ago

1437 has been merged

apio-sys commented 2 weeks ago

Excellent, thanks! Indeed I had personalized my security.txt already. I have merged from main upstream again and all tests pass fine again as well as the build.