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

make apps availble on deSEC #2422

Open
wants to merge 26 commits into
base: main
Choose a base branch
from
Open

make apps availble on deSEC #2422

wants to merge 26 commits into from

Conversation

enoch85
Copy link
Member

@enoch85 enoch85 commented Dec 28, 2022 •
edited
Loading

Signed-off-by: Daniel Hansson mailto@danielhansson.nu

Fix #1980

  • Double check that TLS certs are generated for the subdomain. Right now I get this in the logs: cURL error 60: SSL: no alternative certificate subject name matches target host name 'onlyoffice.testingdomainenoch85.dedyn.io' (see https://curl.haxx.se/libcurl/c/libcurl-errors.html) for https://onlyoffice.testingdomainenoch85.dedyn.io/ConvertService.ashx

Nice to have

  • If a specific port is set, also set this port in the docker run command.

@enoch85
make apps availble on deSEC
694e063 
Signed-off-by: Daniel Hansson <mailto@danielhansson.nu>
@enoch85
Rename apps/collabora_docker_desec.sh to addons/deSEC/collabora_docke…
3461bb4 
…r_desec.sh

Signed-off-by: Daniel Hansson <mailto@danielhansson.nu>
@enoch85
add new function
1ef7641 
Signed-off-by: Daniel Hansson <mailto@danielhansson.nu>
@enoch85
update menu
aa3111a 
Signed-off-by: Daniel Hansson <mailto@danielhansson.nu>
@enoch85
talk
0305773 
Signed-off-by: Daniel Hansson <mailto@danielhansson.nu>
@enoch85
add onlyoffice
af3c677 
Signed-off-by: Daniel Hansson <mailto@danielhansson.nu>
@enoch85
Rename onlyoffice_docker._desec.sh to onlyoffice_docker_desec.sh
febe625 
Signed-off-by: Daniel Hansson <mailto@danielhansson.nu>
@enoch85
Create onlyoffice_docker.sh
298dbeb 
Signed-off-by: Daniel Hansson <mailto@danielhansson.nu>
@enoch85 enoch85 requested a review from szaimen December 28, 2022 16:19
@enoch85
Copy link
Member Author

enoch85 commented Dec 28, 2022

This is still WIP.

@szaimen
Copy link
Collaborator

szaimen commented Dec 28, 2022

This is still WIP.

Okay

@enoch85
Update collabora_docker_desec.sh
6955314 
Signed-off-by: Daniel Hansson <mailto@danielhansson.nu>
@enoch85
Create talk_desec.sh
9098598 
Signed-off-by: Daniel Hansson <mailto@danielhansson.nu>
@enoch85
Update onlyoffice_docker_desec.sh
fb5331f 
Signed-off-by: Daniel Hansson <mailto@danielhansson.nu>
@enoch85
typo
c7c73ca 
Signed-off-by: Daniel Hansson <mailto@danielhansson.nu>
@enoch85
typo
d243cdf 
Signed-off-by: Daniel Hansson <mailto@danielhansson.nu>
@enoch85
Merge branch 'master' into desec-apps
282b6b6
@enoch85
Copy link
Member Author

enoch85 commented Dec 28, 2022

@szaimen Feel free to begin initial tests if you want. 👍

@enoch85
fix comment
27c6035 
Signed-off-by: Daniel Hansson <mailto@danielhansson.nu>
szaimen
szaimen reviewed Dec 29, 2022
View reviewed changes
menu/additional_apps.sh
@@ -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?

szaimen
szaimen reviewed Dec 29, 2022
View reviewed changes
lib.sh Outdated Show resolved Hide resolved
@enoch85
change order
0293172 
Signed-off-by: Daniel Hansson <mailto@danielhansson.nu>
@enoch85
collabora now generates as it should
617cb8e 
Signed-off-by: Daniel Hansson <mailto@danielhansson.nu>
@enoch85
onlyffice same as collabora
b72446d 
Signed-off-by: Daniel Hansson <mailto@danielhansson.nu>
@enoch85
stop at first occurance
1ce5053 
Signed-off-by: Daniel Hansson <mailto@danielhansson.nu>
@enoch85
same changes as collabora and onlyoffice
589f0e3 
Signed-off-by: Daniel Hansson <mailto@danielhansson.nu>
@enoch85
Copy link
Member Author

enoch85 commented Dec 29, 2022

Talk works out of the box.

Onlyoffice gets 504 timeout, but everything is generated as it should.

Collabora is OK when hitting "Save" in the UI, but no document is loaded when opening it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@szaimen szaimen szaimen requested changes

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
2. developing 3. to review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Implement deSEC in Collabora | OnlyOffice docker versions
2 participants
@enoch85 @szaimen