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

Bugfixing & Upgrading #30

Merged
merged 6 commits into from
Oct 9, 2018
Merged

Conversation

nupplaphil
Copy link
Collaborator

This is a major change which addresses #29 and #28

  • upgrade version

  • fixing alpine Dockerfile (openssl to libressl)

  • adding examples for SSMTP

  • README updates & bugfixing

  • Removed shell-script "friendica"

  • Removed old .htconfig

  • Adding SMTP example

  • Upgrading docker-compose files

  • Added upgrade.exclude list

  • Adding daemon.php --foreground instead of worker.php

Maybe @MrPetovan or @annando can just have a look if I made something completely wrong ;-)
I'm currently upgrading the images so I can update both of my nodes (and therefore test it)

- upgrade version
- fixing alpine Dockerfile (openssl to libressl)
- adding examples for SSMTP
- README updates & bugfixing
- Removed shell-script "friendica"
- Removed old .htconfig
- Adding SMTP example
- Upgrading docker-compose files
- Added upgrade.exclude list
@nupplaphil nupplaphil added Bug Something isn't working Enhancement New feature or request labels Oct 4, 2018
@nupplaphil nupplaphil self-assigned this Oct 4, 2018
@nupplaphil
Copy link
Collaborator Author

And I changed from \r\n to \n so the diff doesn't work in github itself (but some IDEs support the diff nevertheless :-/ )

@nupplaphil
Copy link
Collaborator Author

nupplaphil commented Oct 4, 2018

Some Workarounds which I cannot solve yet (maybe follow up PRs):

  • There are sleeps before the automatic installation starts (bin/console autoinstall) because the database is too fast (and Friendica just throws an error that it cannot connect)
  • The Parameter for URL is wrongly set with the PHP-Binary-Environment variable in AutomaticInstallation.php so I deactivated it for now (=> I will create an issue for it in Friendica)
  • I'm sometimes using addon.ini.php for additional system settings because I create the local.ini.php with the automatic installation but I'm not able to automatically add new lines in the local.ini.php without tricky replacing mechanism
  • the stack.yml doesn't has a possibility to automatically deactivate the email/url validation, so it will currently fail

@MrPetovan
Copy link
Collaborator

I'm sometimes using addon.ini.php for additional system settings because I create the local.ini.php with the automatic installation but I'm not able to automatically add new lines in the local.ini.php without tricky replacing mechanism

Why is it easier with addon.ini.php?


### insecure

This examples should only be used for **testing** on the local network because it uses a unencrypted http connection.
Copy link
Collaborator

Choose a reason for hiding this comment

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

These examples or This example.

@nupplaphil
Copy link
Collaborator Author

nupplaphil commented Oct 5, 2018

I'm sometimes using addon.ini.php for additional system settings because I create the local.ini.php with the automatic installation but I'm not able to automatically add new lines in the local.ini.php without tricky replacing mechanism

Why is it easier with addon.ini.php?

Because I'm creating the local.ini.php with environment variables and the help of the console autoinstall at startup.

But not every option in Friendica is possible as an environment variable (just the required and some often needed options). So I need a second way to add other options (f.e. cache driver).

At first. I thought about a script to "inject" the existing local.ini.php with options from of an additional file, but this seemed like a bad idea.

I also thought about using the console cache set mechanism, but then I have to check if the database is already set up correctly, which seemed complicated too.

In both ways, I have to read options from somewhere at startup so I need code to read ini-files or at least key-value strings. Which will result in more code than I want to have (=> KISS).

=> In the end, I used the addon.ini.php which works without additional checks/code out of the box ..

@MrPetovan
Copy link
Collaborator

thanks for the elaboration. For a fire-and-forget install, using addon.ini.php for core settings is fine, but it still is a liability for future manual maintenance. Not sure if it's relevant in the case of a Docker container.

@nupplaphil
Copy link
Collaborator Author

You can add additional options at any time in copying addon.ini.php to the host or editing it inside the container (like in an "normal" environment).

=> Because once copied to /config/ it won't get overwritten with new images or at startups.

@MrPetovan
Copy link
Collaborator

What I mean is that some configuration keys could be overlooked because they're missing from the expected local.ini.php and not expected in addon.ini.php, but is it a problem?

@nupplaphil
Copy link
Collaborator Author

Ah, I see.

Not for "normal" setups. But you're right, It's not the cleanest way to set system configuration keys in the addon.ini.php... I wish I have a better idea for it..

@nupplaphil
Copy link
Collaborator Author

What about looping over /config/ and reading every *.ini.php which aren't the standard ones (local, setting, config) so we name it "additional.ini.php" or "cache.ini.php" rather than "addon"?

@nupplaphil
Copy link
Collaborator Author

@MrPetovan what do you think? Can I merge it? :-)

@MrPetovan
Copy link
Collaborator

Sorry I missed it. I'm interested in looping over all config files in config/, then you could have your specialized config file.

@nupplaphil
Copy link
Collaborator Author

But because of 2018.09 compatibility, I'd prefer to use addon.ini.php until the next release..

@nupplaphil
Copy link
Collaborator Author

@elrido I'm sorry I totally oversaw your comment.
Plz have a look at #36 and #37 . It is fixed already :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Something isn't working Enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants