LemmyNet
/
lemmy
3
2
Fork 3
Code Pull Requests 1 Releases Wiki Activity

Fixing some front end pictshare to pictrs conversions, removing unecessary nginx. #49

Closed
dessalines wants to merge 30 commits from use-pictrs-1 into use-pictrs
pull from: use-pictrs-1
merge into: LemmyNet:use-pictrs
Conversation 4 Commits 30 Files Changed 42 +581 -509
dessalines commented 2020-06-09 21:20:29 +00:00
Owner
Copy Link
No description provided.
dessalines reviewed 2020-06-09 21:20:52 +00:00
ansible/lemmy.yml
@ -41,1 +41,4 @@
lemmy_docker_image: "dessalines/lemmy:{{ lookup('file', 'VERSION') }}"
lemmy_port: "8536"
pictshare_port: "8537"
iframely_port: "8538"
dessalines commented 2020-06-09 21:20:52 +00:00
Author
Owner
Copy Link

I'm not sure if these need to stay here or not.

I'm not sure if these need to stay here or not.
nutomic commented 2020-06-09 21:39:03 +00:00
Owner
Copy Link

They dont seem to be used anywhere. If the playbook still works after removing them, they are useless.

They dont seem to be used anywhere. If the playbook still works after removing them, they are useless.
dessalines reviewed 2020-06-09 21:21:13 +00:00
ansible/templates/nginx.conf Outdated
@ -79,3 +83,3 @@
location /iframely/ {
proxy_pass http://0.0.0.0:8538/;
proxy_pass http://0.0.0.0:8061/;
dessalines commented 2020-06-09 21:21:13 +00:00
Author
Owner
Copy Link

Going back to its original, all these are the default in master

Going back to its original, all these are the default in master
dessalines commented 2020-06-10 22:27:26 +00:00
Author
Owner
Copy Link

Just added the embed and url caching.

Just added the embed and url caching.
nutomic commented 2020-06-11 13:33:40 +00:00
Owner
Copy Link

Based on the pict-rs readme, we need to block POST /import in nginx. Otherwise this looks good, and you can merge it directly into master.

I also created the migration script (untested so far), but I'm not sure where to put it.

https://gist.github.com/Nutomic/1facbbb966754cb31e05d3fbdedd0a4d

Based on the [pict-rs readme](https://git.asonix.dog/asonix/pict-rs/), we need to block POST /import in nginx. Otherwise this looks good, and you can merge it directly into master. I also created the migration script (untested so far), but I'm not sure where to put it. https://gist.github.com/Nutomic/1facbbb966754cb31e05d3fbdedd0a4d
dessalines commented 2020-06-11 13:41:29 +00:00
Author
Owner
Copy Link

Another thing, is it possible to add an nginx redirect for current pictshares?

IE this link: https://communism.lemmy.ml/pictshare/uszyuc.png

Needs to get redirected.

Another thing, is it possible to add an nginx redirect for current pictshares? IE this link: https://communism.lemmy.ml/pictshare/uszyuc.png Needs to get redirected.
nutomic commented 2020-06-11 15:06:01 +00:00
Owner
Copy Link

I guess the cleanest option is something like this (untested).

location /pictshare/ {
    rewrite 301 some-regex-here;
}

https://www.nginx.com/blog/creating-nginx-rewrite-rules/

I guess the cleanest option is something like this (untested). ``` location /pictshare/ { rewrite 301 some-regex-here; } ``` https://www.nginx.com/blog/creating-nginx-rewrite-rules/
nutomic closed this pull request 2020-06-22 16:26:16 +00:00

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: LemmyNet/lemmy#49
No description provided.
Delete Branch "use-pictrs-1"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?