AkkomaGang/akkoma
AkkomaGang
/
akkoma
12
63
Fork 83
Code Issues 172 Pull Requests 17 Packages Projects 2 Releases 12 Wiki Activity

Update sample config files #48

Merged
floatingghost merged 19 commits from norm/akkoma:config-files into develop 2022-07-06 18:50:02 +00:00
Conversation 2 Commits 19 Files Changed 29 +189 -210
norm commented 2022-07-05 11:12:36 +00:00
Contributor
Copy Link

Also includes:

  • Update Caddyfile to Caddy v2 (9b69ccb35b)
  • Adding /etc/akkoma/config.exs into the config search path. The old /etc/pleroma/config.exs path is kept for backwards compatibility.

Resolves #36

Also includes: - Update Caddyfile to Caddy v2 (https://git.pleroma.social/pleroma/pleroma/-/commit/9b69ccb35b8521efa58d40931b9a83266ad2f686) - Adding `/etc/akkoma/config.exs` into the config search path. The old `/etc/pleroma/config.exs` path is kept for backwards compatibility. Resolves https://akkoma.dev/AkkomaGang/akkoma/issues/36
norm added 16 commits 2022-07-05 11:12:37 +00:00
fd9670e250 Add /etc/akkoma in the config search path 
Keeping /etc/pleroma to ease migration from Pleroma.
ci/woodpecker/pr/release Pipeline was successful Details
ci/woodpecker/pr/lint Pipeline was successful Details
ci/woodpecker/pr/test Pipeline failed Details
8a46daec4f move caddyfile to caddy subdirectory
norm commented 2022-07-05 11:24:45 +00:00
Author
Contributor
Copy Link

The config file path thing might not be correct so that may need to be corrected.

The config file path thing might not be correct so that may need to be corrected.
norm added 1 commit 2022-07-05 11:33:57 +00:00
ci/woodpecker/pr/lint Pipeline was successful Details
ci/woodpecker/pr/release Pipeline was successful Details
ci/woodpecker/pr/test Pipeline failed Details
271e08fa48 Fix config path lookup
floatingghost reviewed 2022-07-06 18:33:02 +00:00
floatingghost left a comment
Owner
Copy Link

two little things but will be good to go after that

two little things but will be good to go after that
installation/openbsd/relayd.conf Outdated
@ -26,3 +26,3 @@
# Append a bunch of headers
match request header append "X-Forwarded-For" value "$REMOTE_ADDR" # This two header and the next one are not strictl required by pleroma but adding them won't hurt
match request header append "X-Forwarded-For" value "$REMOTE_ADDR" # This two header and the next one are not strictl required by akkoma but adding them won't hurt
floatingghost commented 2022-07-06 18:31:46 +00:00
Owner
Copy Link

not your change, but typo here - strictly

not your change, but typo here - `strictly`
norm commented 2022-07-06 18:49:09 +00:00
Author
Contributor
Copy Link

done: 97657088e8

done: https://akkoma.dev/AkkomaGang/akkoma/commit/97657088e854bbf26ed5ba2eaf830be9f57fcef7
norm marked this conversation as resolved
lib/pleroma/config/release_runtime_provider.ex
@ -13,3 +13,3 @@
config_path =
opts[:config_path] || System.get_env("PLEROMA_CONFIG_PATH") || "/etc/pleroma/config.exs"
cond do
floatingghost commented 2022-07-06 18:32:17 +00:00
Owner
Copy Link

you can probably merge in the other change to remove this from the diff

you can probably merge in the other change to remove this from the diff
norm marked this conversation as resolved
norm added 2 commits 2022-07-06 18:47:51 +00:00
floatingghost commented 2022-07-06 18:49:57 +00:00
Owner
Copy Link

thankthank

thankthank
floatingghost merged commit c0e6f30e4d into develop 2022-07-06 18:50:02 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
approved, awaiting change

   
bug

Something is not working

  
configuration

This requires config changes

  
documentation

This is about human-readable docs

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
extremely low priority

   
feature request

Something new?

  
Fix it yourself

Support has been attempted

  
help wanted

Need some help

  
invalid

Something is wrong

  
mastodon_api

   
needs docs

   
needs tests

   
not a bug

   
planned

   
pleroma_api

   
privacy

   
question

More information is needed

  
static_fe

   
triage

   
wontfix

This won't be fixed

No Label
approved, awaiting change
bug
configuration
documentation
duplicate
enhancement
extremely low priority
feature request
Fix it yourself
help wanted
invalid
mastodon_api
needs docs
needs tests
not a bug
planned
pleroma_api
privacy
question
static_fe
triage
wontfix
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
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: AkkomaGang/akkoma#48
No description provided.
Delete Branch "norm/akkoma:config-files"

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?