Upload 6 files

Dockerfile

@@ -18,6 +18,7 @@ RUN set -x \
          iproute2 libcap-ng libcurl libevent linux-pam musl nspr nss nss-tools openrc \
          bison flex gcc make libc-dev bsd-compat-headers linux-pam-dev \
          nss-dev libcap-ng-dev libevent-dev curl-dev nspr-dev \
+         python3 py3-pip \
     && cd /sbin \
     && for fn in iptables iptables-save iptables-restore; do ln -fs xtables-legacy-multi "$fn"; done \
     && cd /opt/src \
@@ -45,7 +46,8 @@ RUN wget -t 3 -T 30 -nv -O /opt/src/ikev2.sh https://github.com/hwdsl2/setup-ips
 COPY ./run.sh /opt/src/run.sh
 RUN chmod 755 /opt/src/run.sh
 EXPOSE 500/udp 4500/udp
-CMD ["/opt/src/run.sh"]
+
+CMD ["uvicorn", "app:app", "--host", "0.0.0.0", "--port", "7860"]
 
 ARG BUILD_DATE
 ARG VERSION

app.py

@@ -0,0 +1,127 @@
+from fastapi import FastAPI, HTTPException
+import subprocess
+import os
+import logging
+
+# Set up logging
+logging.basicConfig(level=logging.INFO)
+logger = logging.getLogger(__name__)
+
+app = FastAPI()
+
+def run_docker_compose(command):
+    """Run a docker-compose command and return the result"""
+    try:
+        result = subprocess.run(
+            f"docker-compose {command}",
+            shell=True,
+            capture_output=True,
+            text=True
+        )
+        if result.returncode != 0:
+            logger.error(f"Docker compose {command} failed: {result.stderr}")
+            raise Exception(result.stderr)
+        return result.stdout
+    except Exception as e:
+        logger.error(f"Error running docker-compose {command}: {e}")
+        raise
+
+@app.on_event("startup")
+async def startup_event():
+    try:
+        logger.info("Starting Docker Compose stack...")
+        # Build and start the containers
+        run_docker_compose("up --build -d")
+        logger.info("Docker Compose stack is up")
+        
+        # Execute run.sh inside the container
+        logger.info("Executing run.sh inside the container...")
+        result = subprocess.run(
+            "docker-compose exec -T vpn /opt/src/run.sh",
+            shell=True,
+            capture_output=True,
+            text=True
+        )
+        if result.returncode == 0:
+            logger.info("run.sh executed successfully")
+        else:
+            logger.error(f"run.sh execution failed: {result.stderr}")
+            
+    except Exception as e:
+        logger.error(f"Startup error: {e}")
+        raise
+
+@app.on_event("shutdown")
+async def shutdown_event():
+    try:
+        logger.info("Stopping Docker Compose stack...")
+        run_docker_compose("down")
+        logger.info("Docker Compose stack is down")
+    except Exception as e:
+        logger.error(f"Shutdown error: {e}")
+
+@app.get("/")
+async def root():
+    return {"message": "VPN Server is running"}
+
+@app.get("/status")
+async def status():
+    try:
+        result = subprocess.run(
+            "docker-compose ps --format json",
+            shell=True,
+            capture_output=True,
+            text=True
+        )
+        if result.returncode == 0:
+            return {"status": "running", "details": result.stdout}
+        return {"status": "not_running", "details": result.stderr}
+    except Exception as e:
+        logger.error(f"Status check error: {e}")
+        raise HTTPException(status_code=500, detail=str(e))
+
+@app.get("/logs")
+async def logs():
+    try:
+        return {"logs": run_docker_compose("logs")}
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=str(e))
+
+@app.post("/restart")
+async def restart():
+    try:
+        run_docker_compose("restart")
+        return {"message": "Services restarted successfully"}
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=str(e))
+
+@app.get("/vpn-details")
+async def vpn_details():
+    try:
+        # Get VPN connection details from the container
+        result = subprocess.run(
+            "docker-compose exec -T vpn cat /etc/ipsec.d/vpn-gen.env",
+            shell=True,
+            capture_output=True,
+            text=True
+        )
+        if result.returncode == 0:
+            return {"vpn_details": result.stdout}
+        
+        # If vpn-gen.env doesn't exist, try getting details from container logs
+        logs_result = subprocess.run(
+            "docker-compose logs vpn | grep -A 4 'Connect to your new VPN with these details:'",
+            shell=True,
+            capture_output=True,
+            text=True
+        )
+        if logs_result.returncode == 0:
+            return {"vpn_details": logs_result.stdout}
+            
+        return {"error": "Could not retrieve VPN details"}
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=str(e))
+
+if __name__ == "__main__":
+    import uvicorn
+    uvicorn.run(app, host="0.0.0.0", port=8000)

docker-compose.yml

@@ -5,13 +5,16 @@ volumes:
 
 services:
   vpn:
-    image: hwdsl2/ipsec-vpn-server
+    build:
+      context: .
+      dockerfile: Dockerfile
     restart: always
     env_file:
       - ./vpn.env
     ports:
       - "500:500/udp"
       - "4500:4500/udp"
+      - "8000:8000"
     privileged: true
     hostname: ipsec-vpn-server
     container_name: ipsec-vpn-server

requirements.txt

@@ -0,0 +1,5 @@
+fastapi
+uvicorn
+python-multipart
+docker
+python-dotenv

vpn.env

@@ -0,0 +1,3 @@
+VPN_IPSEC_PSK=your_ipsec_pre_shared_key
+VPN_USER=your_vpn_username
+VPN_PASSWORD=your_vpn_password