[RFC] luci-nginx and luci-ssl-nginx: collect files from nginx and uwsgi-cgi packages#2981
[RFC] luci-nginx and luci-ssl-nginx: collect files from nginx and uwsgi-cgi packages#2981peter-stadler wants to merge 2 commits into
Conversation
|
Sorry for the confusion by opening and closing this PR repeatedly. I wanted to change it to a draft PR. |
feckert
added
the
depends on other pr
| @@ -0,0 +1,16 @@ | |||
| #!/bin/sh | |||
| chmod +x /etc/init.d/luci | |||
There was a problem hiding this comment.
Why do we need this? We could install this file with the right mods during installation in the Makefile
| @@ -0,0 +1,37 @@ | |||
| #!/bin/sh | |||
| chmod +x /etc/init.d/luci | |||
There was a problem hiding this comment.
I am not sure, how to do it. We need a
There was a problem hiding this comment.
Thats right. In LuCI you have to put the files into root with the right subdirectories and with the right mod flags and it will gets installed. See for example https://github.com/openwrt/luci/tree/master/applications/luci-app-adblock/root/etc/uci-defaults
There was a problem hiding this comment.
Oh, now I have a bunch of commits with the wrong username/email. Will continue tomorrow and change the mods of the files, too.
|
Please add a prefix in front of your commits. Have a look at the commit history |
|
Thank you :-) I will change the prefixes. Right now I am changing the PR for the packages repository … |
|
The uwsgi-cgi-plugin would be in the uwsgi Makefile of my other commits in the packages repository. Right now I am redoing them with better commit messages, it will be in https://github.com/peter-stadler/packages/tree/uwsgi – right now I want to change username/email before the PR … |
* depends on PRs for nginx (enable /etc/nginx/conf.d) and uwsgi (modular) * makes nginx-mod-luci obsolete and uses uwsgi-cgi-plugin insted of uwsgi-cgi Signed-off-by: Peter Stadler <peter.stadler@student.uibk.ac.at>
* depends on PRs for nginx (enable /etc/nginx/conf.d) and uwsgi (modular) * makes nginx-mod-luci-ssl obsolete and uses uwsgi-cgi-plugin instead of uwsgi-cgi Signed-off-by: Peter Stadler <peter.stadler@student.uibk.ac.at>
peter-stadler
force-pushed
the
luci-on-nginx-new
branch
from
85a27ec to
15e8fb8
Compare
|
Sorry for the late answer (it took me some time to fix the CircleCI build for the etesync-server). I made the init files executable, changed the commit messages and included luci-app-opkg as dependency (it is in the standard luci collection, too). Thank you @feckert. Both commits depend on the uwsgi-cgi-plugin of the modular uwsgi and that the /etc/nginx/conf.d directory is enabled. |
peter-stadler
changed the title
peter-stadler
changed the title
|
@jow- do you think this is a good idea (regarding also the openwrt guidelines)? |
|
Closing this as its outside of the scope of LuCI. The necessary work appears to have happened in the package repo now. |
3 participants
I am new to contributing and I am not sure if this change is a good idea. I tried to collect the files that are needed to run luci on nginx from the uwsgi-cgi and the nginx package and would move it here. See my other draft PRs in packages, too:
openwrt/packages#9736 ([RFC] package etesync and its dependencies and move luci on nginx)uwsgi: add packages with modules and nginx: enable /etc/nginx/conf.d directory.
I would do this only if Ansuel approves it since it is his project.
See also the topic at:
https://forum.openwrt.org/t/package-etesync-and-its-dependencies/42269
I hope it is understandable what I try to do.