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.

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

make apps availble on deSEC #2422

Open
wants to merge 26 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
694e063
make apps availble on deSEC
enoch85 Dec 28, 2022
3461bb4
Rename apps/collabora_docker_desec.sh to addons/deSEC/collabora_docke…
enoch85 Dec 28, 2022
1ef7641
add new function
enoch85 Dec 28, 2022
aa3111a
update menu
enoch85 Dec 28, 2022
0305773
talk
enoch85 Dec 28, 2022
af3c677
add onlyoffice
enoch85 Dec 28, 2022
febe625
Rename onlyoffice_docker._desec.sh to onlyoffice_docker_desec.sh
enoch85 Dec 28, 2022
298dbeb
Create onlyoffice_docker.sh
enoch85 Dec 28, 2022
6955314
Update collabora_docker_desec.sh
enoch85 Dec 28, 2022
9098598
Create talk_desec.sh
enoch85 Dec 28, 2022
fb5331f
Update onlyoffice_docker_desec.sh
enoch85 Dec 28, 2022
c7c73ca
typo
enoch85 Dec 28, 2022
d243cdf
typo
enoch85 Dec 28, 2022
282b6b6
Merge branch 'master' into desec-apps
enoch85 Dec 28, 2022
27c6035
fix comment
enoch85 Dec 28, 2022
0293172
change order
enoch85 Dec 29, 2022
617cb8e
collabora now generates as it should
enoch85 Dec 29, 2022
b72446d
onlyffice same as collabora
enoch85 Dec 29, 2022
1ce5053
stop at first occurance
enoch85 Dec 29, 2022
589f0e3
same changes as collabora and onlyoffice
enoch85 Dec 29, 2022
2669632
Merge branch 'master' into desec-apps
enoch85 Jan 5, 2023
cc92db9
Merge branch 'master' into desec-apps
enoch85 Jan 20, 2023
839d9e0
Merge branch 'master' into desec-apps
enoch85 Feb 6, 2023
22551e6
Merge branch 'master' into desec-apps
enoch85 Mar 17, 2023
1d61047
Merge branch 'master' into desec-apps
enoch85 Apr 2, 2023
3792d1d
Merge branch 'master' into desec-apps
enoch85 Apr 8, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
talk
Signed-off-by: Daniel Hansson <mailto@danielhansson.nu>
  • Loading branch information
enoch85 authored Dec 28, 2022
commit 0305773ae54d41d0cba7d81b3f5ace985872c79a
2 changes: 1 addition & 1 deletion menu/additional_apps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ to finish the setup once this script is done." "$SUBTITLE"
;;&
*"Talk"*)
print_text_in_color "$ICyan" "Downloading the Talk script..."
run_script APP talk
desec_app_tls_menu "DESEC talk_desec" "APP talk"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

honestly, I find it a bit strange that this will now always go through this menu. It will be yet another step

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you have a better proposal?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ping @szaimen

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we maybe check for the dessec folder and only show that menu if dessec is already configured?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, should work.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thought about this, what about users that doesn't have deSEC installed and wants to use it?

;;&
*"Webmin"*)
print_text_in_color "$ICyan" "Downloading the Webmin script..."
Expand Down