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

Automatic instance setup based on config variables (fixes #404) #26

Manually merged
dessalines merged 1 commits from nutomic/lemmy:auto-setup into master 2020-03-31 20:55:27 +00:00
Conversation 1 Commits 1 Files Changed 5 +75 -18
nutomic commented 2020-03-26 14:34:20 +00:00
Owner
Copy Link

I decided to use this approach because it just seems easier.

I decided to use this approach because it just seems easier.
dessalines requested changes 2020-03-28 22:11:09 +00:00
dessalines left a comment
Owner
Copy Link

Looks good besides that one thing.

Looks good besides that one thing.
docker/lemmy.hjson Outdated
@ -2,0 +7,4 @@
admin_password: "lemmy"
# name of the site (can be changed later)
site_name: "Lemmy Test"
}
dessalines commented 2020-03-28 22:10:29 +00:00
Owner
Copy Link

We should comment out this section too. I want the standard docker install to let admins pick their own usernames and site name through the web interface.

We should comment out this section too. I want the standard docker install to let admins pick their own usernames and site name through the web interface.
server/src/api/site.rs
@ -284,1 +309,4 @@
Some(SiteView::read(&conn)?)
} else {
None
};
dessalines commented 2020-03-28 22:10:46 +00:00
Owner
Copy Link

Nice, looks great.

Nice, looks great.
nutomic commented 2020-03-28 23:13:45 +00:00
Author
Owner
Copy Link

Updated.

Updated.
dessalines requested changes 2020-03-29 17:18:53 +00:00
docker/lemmy.hjson
@ -45,0 +50,4 @@
# # name of the site (can be changed later)
# site_name: "Lemmy Test"
# }
# # optional: email sending configuration
dessalines commented 2020-03-29 17:18:29 +00:00
Owner
Copy Link

There's still a setup section at the top of the file, its in here twice now.

There's still a setup section at the top of the file, its in here twice now.
nutomic commented 2020-03-30 23:36:51 +00:00
Author
Owner
Copy Link

It looks fine in the diff. Maybe its cause you pulled this before I did a force push? Then your local version might be wrong.

It looks fine in the diff. Maybe its cause you pulled this before I did a force push? Then your local version might be wrong.
dessalines commented 2020-03-31 20:29:29 +00:00
Owner
Copy Link

Hrm yeah that was weird. force push generally messes things up, bc it didn't have a correct diff, so it had two sections. I deleted the branch and repulled it and it looks good.

Hrm yeah that was weird. force push generally messes things up, bc it didn't have a correct diff, so it had two sections. I deleted the branch and repulled it and it looks good.
nutomic commented 2020-03-31 22:44:51 +00:00
Author
Owner
Copy Link

Will try to avoid it then. But in that case, please squash my changes before merging when they are messy (or just use the squash + merge button on here).

Will try to avoid it then. But in that case, please squash my changes before merging when they are messy (or just use the squash + merge button on here).
server/config/defaults.hjson
@ -2,0 +9,4 @@
# admin_email: ""
# # name of the site (can be changed later)
# site_name: ""
# }
dessalines commented 2020-03-29 17:18:43 +00:00
Owner
Copy Link

This one looks okay.

This one looks okay.
dessalines closed this pull request 2020-03-31 20:55:27 +00:00
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#26
No description provided.
Delete Branch "nutomic/lemmy:auto-setup"

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?