Merge branch 'master' of github.com:MajorMJR/factorio-server-manager

Author: mroote

docker/Dockerfile

@@ -4,7 +4,7 @@ FROM frolvlad/alpine-glibc
 MAINTAINER Jannik Kolodziej <[email protected]>
 
 ENV FACTORIO_VERSION=0.12.33 \
-    MANAGER_VERSION=0.3.1 \
+    MANAGER_VERSION=0.4.1 \
     ADMIN_PASSWORD=
 
 VOLUME /opt/factorio/saves /opt/factorio/mods /security

docker/nginx.conf

@@ -42,8 +42,8 @@ http {
         ssl_ciphers "HIGH:!aNULL:!MD5 or HIGH:!aNULL:!MD5:!3DES";
         ssl_prefer_server_ciphers on;
 
-	auth_basic "restricted";
-	auth_basic_user_file /security/passwords.conf;
+        auth_basic "restricted";
+        auth_basic_user_file /security/passwords.conf;
 
         location /api {
                 proxy_pass              http://127.0.0.1:8080;
@@ -58,7 +58,7 @@ http {
 
         location / {
                 root /opt/factorio-server/app;
-		try_files $uri /index.html;
+                try_files $uri /index.html;
         }
 
     }

src/server.go

@@ -7,6 +7,7 @@ import (
 	"os/exec"
 	"strconv"
 	"syscall"
+	"path/filepath"
 )
 
 type FactorioServer struct {
@@ -53,7 +54,7 @@ func initFactorio() *FactorioServer {
 func (f *FactorioServer) Run() error {
 	var err error
 
-	args := []string{"--start-server", f.Savefile,
+	args := []string{"--start-server", filepath.Join(config.FactorioSavesDir, f.Savefile),
 		"--latency-ms", strconv.Itoa(f.Latency),
 		"--autosave-interval", strconv.Itoa(f.AutosaveInterval),
 		"--autosave-slots", strconv.Itoa(f.AutosaveSlots),

ui/App/components/Sidebar.jsx

@@ -44,12 +44,12 @@ class Sidebar extends React.Component {
 
                 <ul className="sidebar-menu">
                     <li className="header">MENU</li>
-                    <li><IndexLink to="/" activeClassName="active"><i className="fa fa-link"></i><span>Server Control</span></IndexLink></li>
-                    <li><Link to="/mods" activeClassName="active"><i className="fa fa-link"></i><span>Mods</span></Link></li>
-                    <li><Link to="/logs" activeClassName="active"><i className="fa fa-link"></i> <span>Logs</span></Link></li>
-                    <li><Link to="/saves" activeClassName="active"><i className="fa fa-link"></i> <span>Saves</span></Link></li>
-                    <li><Link to="/config" activeClassName="active"><i className="fa fa-link"></i> <span>Game Configuration</span></Link></li>
-                    <li><Link to="/settings" activeClassName="active"><i className="fa fa-link"></i> <span>Settings</span></Link></li>
+                    <li><IndexLink to="/" activeClassName="active"><i className="fa fa-tachometer"></i><span>Server Control</span></IndexLink></li>
+                    <li><Link to="/mods" activeClassName="active"><i className="fa fa-pencil"></i><span>Mods</span></Link></li>
+                    <li><Link to="/logs" activeClassName="active"><i className="fa fa-file-text-o"></i> <span>Logs</span></Link></li>
+                    <li><Link to="/saves" activeClassName="active"><i className="fa fa-floppy-o"></i> <span>Saves</span></Link></li>
+                    <li><Link to="/config" activeClassName="active"><i className="fa fa-cogs"></i> <span>Game Configuration</span></Link></li>
+                    <li><Link to="/settings" activeClassName="active"><i className="fa fa-cog"></i> <span>Settings</span></Link></li>
                 </ul>
                 </section>
                 <div style={{height: "100%"}}></div>