Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Update citadel with the latest commits. Need further review #147

Open
wants to merge 206 commits into
base: citadel_support
Choose a base branch
from
Open

Update citadel with the latest commits. Need further review #147

wants to merge 206 commits into from

Conversation

TrezorHannes
Copy link
Collaborator

No description provided.

blckbx and others added 30 commits November 18, 2022 09:44
@blckbx
worldmap: add description, packages update
9815677
@blckbx
faq: adjust providers
9ae8434
@blckbx
move important info to toast
76c9151
@blckbx
worldmap: popups w/ uptime and ping stats
71c2729
@blckbx
popup: line break
e6b3199
@blckbx
add upptime as used service to faq entry
3a5b2de
@blckbx
rename status page link, remove toast
e2075ef
@blckbx
WorldMap: add text to renew page
1fffcf8
@blckbx
BF discount
96e28a3
@blckbx
fix link, stronger
b7de7b0
@blckbx
bf logo
9e58c99
@blckbx
rebate without reflink
97f78a3
@blckbx
one page + linter fixes
1f5b373
@blckbx
WorldMap: add second EU location
ba40982
@blckbx
rm temporary BF settings
2fbd972
@ziggie1984
separating fwmark to only the last byte of the 4 bytes available
41a7523 
and also allow virtualization
@ziggie1984
bugfix & FAQ changed
24d13a5
@ziggie1984
exit when network rules not applied
6c25f15
@blckbx
systemd-detect-virt check
43a1b02
@blckbx
fix faq toc
6a9ee36
@blckbx
fix-umbrel-CLN-config
fdaa4fc
@blckbx
guide: initial repo adjustment for migration
72dac30
@blckbx
more replacements
8a18e70
@blckbx
no caps, faq
af7b2da
@blckbx
rm citadel from faq
0816364
@TrezorHannes
added fingerprint hakuna
c45b693
@TrezorHannes
Update README.md
f2b139f
@TrezorHannes
Update README.md
c765a48
@TrezorHannes
Create hakuna.asc
0f1a0ed
@blckbx
Merge pull request #82 from Tunnelsats/TrezorHannes-patch-1
fbcd26a 
Trezor hannes patch 1
TrezorHannes and others added 18 commits August 3, 2024 11:00
@TrezorHannes
Remove extra umbrel check
9575f8c
@TrezorHannes
Merge pull request #134 from Tunnelsats/litd-install
dcbfa41 
adding lit integrated mode for baremetal setup
@TrezorHannes
bash-script for TS details
6ea45e9
@TrezorHannes
smarter error handling and compatibility with older configs
876184d
@TrezorHannes
FAQ Updated for the helper script entry
abc2c95
@TrezorHannes
Merge pull request #135 from Tunnelsats/sub-display
bef6588 
bash-script for TS details
@blckbx
fix: kernel version check
896e8ce
@blckbx
Merge pull request #136 from blckbx/main
bbe50d9 
fix: kernel version check
@blckbx
update footer: tg link, x icon
f4a238d
@blckbx
footer: color X white
6666145
@blckbx
Merge pull request #137 from blckbx/update-frontend
9e784fe 
frontend: update footer
@blckbx
setupv2: resolvconf check for non-docker setups
e064299
@TrezorHannes
Merge pull request #138 from blckbx:resolvconf-fix
767dc6b 
setupv2: resolvconf check for non-docker setups
@TrezorHannes
adjust to invite + approval only
2aee709
@TrezorHannes
Merge pull request #139 from Tunnelsats/TG_invite
1951ac3 
adjust to invite + approval only
@TrezorHannes
Make resolvconf mandatory for all systems
fb7301d
@TrezorHannes
patch release change
2cefcad
@TrezorHannes
Merge pull request #141 from Tunnelsats/resolvconf-mandatory
cc3fdb2 
Make resolvconf mandatory for all systems
@TrezorHannes TrezorHannes self-assigned this Nov 15, 2024
@TrezorHannes
Merge pull request #146 from Tunnelsats/data-cleanup
71c2169 
Increase Data Cleanup from 10 min to 1 hour.
@blckbx
Copy link
Collaborator

blckbx commented Nov 15, 2024

Proposal: Instead of resolving various confilcts by merging main branch into citadel branch, we should rather extract citadel specific install and uninstall instructions into new bash scripts and merge them into main. wdyt?

@TrezorHannes
Copy link
Collaborator Author

Proposal: Instead of resolving various confilcts by merging main branch into citadel branch, we should rather extract citadel specific install and uninstall instructions into new bash scripts and merge them into main. wdyt?

So like a separare setupv2_citadel.sh?
Gives me a notion that we should probably think about it for all major systems.

  • a starting script with the OS choice
  • calling nested sub-scripts based on the choice

Benefit would be mostly readability. We could try build this for citadel only (one main, one sub-file) and see how that works.

What do you think?

TrezorHannes and others added 3 commits January 28, 2025 22:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@TrezorHannes TrezorHannes

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@TrezorHannes @blckbx @ziggie1984 @zapomatic