From 8721eaae2cfa15d83edf969d72acf178b328b3db Mon Sep 17 00:00:00 2001
From: akanealw <akanealw@gmail.com>
Date: Sun, 9 Apr 2023 00:06:39 -0500
Subject: [PATCH] restored to default

---
 docker-compose.yml | 86 ++++++++++++++++++----------------------------
 1 file changed, 34 insertions(+), 52 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 0fadc49..1d85459 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -296,40 +296,22 @@ services:
       - ./appdata/mstream:/config
       - /mnt/storage/music:/music
 
-#  nginxproxymanager:
-#    container_name: nginxproxymanager
-#    hostname: nginxproxymanager
-#    image: jc21/nginx-proxy-manager:2.9.22
-#    environment:
-#      - X_FRAME_OPTIONS=sameorigin
-#      - DB_SQLITE_FILE=/data/database.sqlite
-#    ports:
-#      - 8443:443/tcp
-#      - 8080:80/tcp
-#      - 8081:81/tcp
-#    restart: always
-#    volumes:
-#     - ./appdata/nginxproxymanager/data:/data
-#      - ./appdata/nginxproxymanager/letsencrypt:/etc/letsencrypt
-#      - ./appdata/nginxproxymanager/snippets:/snippets:ro
-#      - /etc/localtime:/etc/localtime:ro
-
-  npm:
-    container_name: npm
-    hostname: npm
+  nginxproxymanager:
+    container_name: nginxproxymanager
+    hostname: nginxproxymanager
     image: jc21/nginx-proxy-manager:2.9.22
     environment:
       - X_FRAME_OPTIONS=sameorigin
       - DB_SQLITE_FILE=/data/database.sqlite
     ports:
-      - 443:443/tcp
-      - 80:80/tcp
-      - 81:81/tcp
+      - 8443:443/tcp
+      - 8080:80/tcp
+      - 8081:81/tcp
     restart: always
     volumes:
-      - ./appdata/npm/data:/data
-      - ./appdata/npm/letsencrypt:/etc/letsencrypt
-      - ./appdata/npm/snippets:/snippets:ro
+     - ./appdata/nginxproxymanager/data:/data
+      - ./appdata/nginxproxymanager/letsencrypt:/etc/letsencrypt
+      - ./appdata/nginxproxymanager/snippets:/snippets:ro
       - /etc/localtime:/etc/localtime:ro
 
   nzbhydra2:
@@ -349,32 +331,32 @@ services:
       - /mnt/data/downloads:/downloads
       - /etc/localtime:/etc/localtime:ro
 
-#  openvpn:
-#    container_name: openvpn
-#    hostname: openvpn
-#    image: kylemanna/openvpn    
-#    cap_add:
-#     - NET_ADMIN
-#    ports:
-#     - "1194:1194/tcp"
-#    restart: always
-#    volumes:
-#     - ./appdata/openvpn/conf:/etc/openvpn
+  openvpn:
+    container_name: openvpn
+    hostname: openvpn
+    image: kylemanna/openvpn    
+    cap_add:
+     - NET_ADMIN
+    ports:
+     - "1194:1194/tcp"
+    restart: always
+    volumes:
+     - ./appdata/openvpn/conf:/etc/openvpn
 
-#  openssh-server:
-#    container_name: openssh-server
-#    hostname: openssh-server
-#    image: lscr.io/linuxserver/openssh-server:latest
-#    environment:
-#      - PUID=${PUID}
-#      - PGID=${PGID}
-#      - TZ=${TZ}
-#      - USER_NAME=akanealw
-#    ports:
-#      - 2222:2222
-#    restart: always
-#    volumes:
-#      - ./appdata/openssh-server/config:/config
+  openssh-server:
+    container_name: openssh-server
+    hostname: openssh-server
+    image: lscr.io/linuxserver/openssh-server:latest
+    environment:
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - TZ=${TZ}
+      - USER_NAME=akanealw
+    ports:
+      - 2222:2222
+    restart: always
+    volumes:
+      - ./appdata/openssh-server/config:/config
 
   organizr:
     container_name: organizr