Add teleport_opts for flags not available in config file

woohgit · Nov 2, 2017 · 246ea7d · 246ea7d
1 parent c7d1a5a
commit 246ea7d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/templates/teleport.service.j2 b/templates/teleport.service.j2
@@ -5,7 +5,7 @@ After=network.target
 [Service]
 Type=simple
 Restart=always
-ExecStart=/usr/local/bin/teleport start --config={{ teleport_config_path }}
+ExecStart=/usr/local/bin/teleport start --config={{ teleport_config_path }} {{ teleport_opts | default('') }}
 
 [Install]
 WantedBy=multi-user.target
diff --git a/templates/teleport.sysvinit.j2 b/templates/teleport.sysvinit.j2
@@ -20,7 +20,7 @@ test -x $TELEPORT_BIN || exit 5
 
 TELEPORT_PIDFILE={{ teleport_pidfile }}
 
-TELEPORT_OPTS="start --config={{ teleport_config_path }}"
+TELEPORT_OPTS="start --config={{ teleport_config_path }} {{ teleport_opts | default('') }}"
 
 . /etc/rc.status
 
@@ -67,10 +67,11 @@ case "$1" in
         else
             soft_stop
         fi
-        
+
         # Remember status and be verbose
         rc_status -v
         ;;
+
     soft-stop)
         ## Stop the listener daemon process with killproc(8) and if this
         ## fails set echo the echo return value.
@@ -87,15 +88,15 @@ case "$1" in
         rc_status -v
         ;;
     try-restart)
-        ## Stop the service and if this succeeds (i.e. the 
+        ## Stop the service and if this succeeds (i.e. the
         ## service was running before), start it again.
         $0 status >/dev/null &&  $0 restart
 
         # Remember status and be quiet
         rc_status
         ;;
     restart)
-        ## Stop the service without closing live connections 
+        ## Stop the service without closing live connections
         ## and start it again regardless of whether it was
         ## running or not
         $0 soft-stop

diff --git a/templates/teleport.upstart.j2 b/templates/teleport.upstart.j2
@@ -4,6 +4,6 @@ author  "Adam Papai <wooh@wooh.hu>"
 start on (started networking)
 stop on runlevel [016]
 
-exec /usr/local/bin/teleport start --config={{ teleport_config_path }}
+exec /usr/local/bin/teleport start --config={{ teleport_config_path }} {{ teleport_opts | default('') }}
 
-respawn
+respawn