Skip to content

Commit 5d16ed3

Browse files
committed
webplatform/ops#163 solved. Removed ssh too
1 parent f47f462 commit 5d16ed3

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

code/files/discuss/app.yml.jinja

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,10 @@
99

1010
templates:
1111
- "templates/web.template.yml"
12-
- "templates/sshd.template.yml"
1312
- "templates/web.ratelimited.template.yml"
1413

1514
expose:
1615
- "{{ upstream_port }}:80" # fwd host port 8001 to container port 80 (http)
17-
- "2222:22" # fwd host port 2222 to container port 22 (ssh)
1816

1917
params:
2018
db_default_text_search_config: "pg_catalog.english"
@@ -47,9 +45,14 @@ hooks:
4745
- mkdir -p plugins
4846
- git clone https://github.com/discourse/docker_manager.git
4947

50-
run:
51-
- exec: echo "Beginning of custom commands"
52-
- exec: ssh-import-id gh:renoirb
53-
- exec: echo "End of custom commands"
54-
- exec: awk -F\# '{print $1;}' ~/.ssh/authorized_keys | awk 'BEGIN { print "Authorized SSH keys for this container:"; } NF>=2 {print $NF;}'
48+
##
49+
## We don’t rely on allowing ssh to container, if you really need, go to the runner VM and do:
50+
##
51+
## ./launcher enter app
52+
##
53+
#run:
54+
# - exec: echo "Beginning of custom commands"
55+
# - exec: ssh-import-id gh:renoirb
56+
# - exec: echo "End of custom commands"
57+
# - exec: awk -F\# '{print $1;}' ~/.ssh/authorized_keys | awk 'BEGIN { print "Authorized SSH keys for this container:"; } NF>=2 {print $NF;}'
5558

discourse/files/nginx.frontend.conf.jinja

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ server {
6464
# Use internal Docker runner instance exposed port
6565
location / {
6666
proxy_pass http://upstream_discourse;
67-
include proxy_params;
6867
proxy_intercept_errors on;
6968

7069
# Backend keepalive

0 commit comments

Comments
 (0)