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
WIP base: rewrite apache configuration generator #2645
Conversation
6dbf552
to
aaeabfa
Compare
@@ -832,9 +832,9 @@ def _detect_ip_address(): | |||
""" | |||
try: | |||
s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) | |||
s.connect(('invenio-software.org', 0)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would keep the invenio-software.org
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I understand this is not really part of this patch, but I expect google.com
to have a greater uptime. Perhaps the issue is mentioning google in the code?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Perhaps the issue is mentioning google in the code?
invenio-software.org
should be up and running if you want to install demosite hence it should be fine for this case too.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I may be missing something here. What is the relationship between invenio-software.org
being up and someone creating the apache configuration for their website (it doesn't have to be the demosite).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do not mention google in the code.
@dset0x it looks good. If you are done, please remove |
a101558
to
aebe9c9
Compare
try: | ||
from shutil import which | ||
except ImportError: | ||
from distutils.spawn import find_executable as which |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please check and amend invenio.utils.shell:which
. Thank you
Please add |
@dset0x when you are done can you try to enable Apache tests in |
@jirikuncar I have yet to see this run once: @lovasko Any progress with testing this? Are there any tests other than |
That one should be enough for now. |
'login_url': app.config.get('SSO_LOGIN_URL', None) | ||
} | ||
if sso['enabled']: | ||
assert sso.login_url is not None, 'SSO enabled by URL not set' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
s/by /but /
aebe9c9
to
4994955
Compare
@kaplun Thanks for the heads up, but how Edit: The problem is still present in this PR. |
Ah nope sorry, I simply see that Travis succeeds right now. Also around on the web I have seen this was related to a temporary problem... Wasn't this PR blocked by the fact that Travis was not passing? |
I have edited
Yes, but there is also a new problem now: #3077 (comment) . Unfortunately I have not gotten around to working towards some RFC about it, due to working on other modules. |
There has been more than one month of inactivity. Shall we close this PR as someday? |
bf632eb
to
2f3c595
Compare
* Redesigns .travis.yml to use the new container-based infrastructure. This lowers the waiting time for the queue, gives us the ability to use caches for apt and pip and improves testing time down to ~15min. We are not allowed too use `sudo` any more but we should need it, because Apache is not tested anyway. Signed-off-by: Marco Neumann <marco@crepererum.net>
@jirikuncar I understand that this functionality will be moved to the demosite, as I see we no longer want it to be tested in invenio itself (#3371). If you prefer this to be closed for organizational reasons until/if it works, feel free. |
@dset0x the functionality of generating Apache configuration stays in Invenio. It's just hard to review your changes as the codebase is evolving a lot and you are not updating this PR. |
@jirikuncar This PR is not awaiting review - it is not working: There is commentary about the issues above. |
configuration file. Should the user need to enable or disable SSL for
example, the recommended way is to edit the invenio configuration and
re-run
create-config
.apache.py
, even if no operation is performed on them. All logicthat does not logically belong in Jinja2 has been removed from the
template.
are the official CentOS 6.6 packages.
in order to use SSLStaplingCache.
recommendations.
inveniomanage apache create-config
have changed:--force
was dropped as it was a NO-OP.certificates, as the following configuration directives have been
ported from zenodo: 'APACHE_CERTIFICATE_PEM_FILE',
'APACHE_CERTIFICATE_FILE', 'APACHE_CERTIFICATE_KEY_FILE'.
invenio/legacy/inveniocfg.py:_detect_ip_address
exception handlingis improved and it now uses 'google.com' instead of 'invenio.org' to
test connectivity, because of their uptime.
Fixes #2626