cleaning up docker file and other various things before starting on a…

…ngular

.dockerignore

@@ -21,5 +21,7 @@
 **/obj
 **/secrets.dev.yaml
 **/values.dev.yaml
+**/env.acme-companion
+**/.nginx
 LICENSE
 README.md

.env.acme-companion-example

@@ -0,0 +1 @@
+DEFAULT_EMAIL=<Fill email for letsencypt https>

.gitignore

@@ -13,6 +13,10 @@ config.json
 *.userosscache
 *.sln.docstates
 
+# nginx-proxy
+.env.acme-companion
+.nginx
+
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
 
@@ -455,3 +459,4 @@ $RECYCLE.BIN/
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
+/Dockerfile.original

Program.cs

@@ -1,6 +1,5 @@
 using luke_site_mvc.Data;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
@@ -40,7 +39,7 @@ public static async Task Main(string[] args)
             }
         }
 
-        // right now this isn't used to do any seeding of data, it is only setting up tables
+        // right now this isn't used to do any seeding of data, it is only setting up tables for miniprofiler
         private static async Task RunSeedingAsync(IHost host)
         {
             var scopeFactory = host.Services.GetService<IServiceScopeFactory>();

Startup.cs

@@ -3,7 +3,6 @@
 using luke_site_mvc.Services.BackgroundServices;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.HttpLogging;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Configuration;
@@ -66,7 +65,7 @@ public void ConfigureServices(IServiceCollection services)
             services.AddStackExchangeRedisCache(options =>
             {
                 options.Configuration = Configuration.GetConnectionString("Redis");
-                options.InstanceName = "IRCTube_";
+                options.InstanceName = "LukeTube_";
             });
 
             services.AddDbContext<SubredditContext>(options =>
@@ -105,18 +104,6 @@ public void ConfigureServices(IServiceCollection services)
                 options.IgnoredPaths.Add("/lib/");
             }).AddEntityFramework();
 
-            // TODO: not sure what this is yet
-            //services.AddW3CLogging(logging =>
-            //{
-            //    logging.LoggingFields = W3CLoggingFields.All;
-
-            //    logging.FileSizeLimit = 5 * 1024 * 1024;
-            //    logging.RetainedFileCountLimit = 2;
-            //    logging.FileName = "MyLogFile";
-            //    logging.LogDirectory = @"C:\logs";
-            //    logging.FlushInterval = TimeSpan.FromSeconds(2);
-            //});
-
             services.AddResponseCaching();
 
             services.AddDatabaseDeveloperPageExceptionFilter();
@@ -147,9 +134,6 @@ public void ConfigureServices(IServiceCollection services)
 
                 app.UseMiniProfiler();
 
-                // TODO: not sure what this is yet
-                //app.UseW3CLogging();
-
                 app.UseStatusCodePages();
             }
             else
@@ -158,6 +142,7 @@ public void ConfigureServices(IServiceCollection services)
                 // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
                 app.UseHsts();
 
+                // not sure if this is needed since nginx is handling https
                 app.UseForwardedHeaders(new ForwardedHeadersOptions
                 {
                     ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto

Views/subreddit/Index.cshtml

@@ -5,7 +5,7 @@
 
 <div class="columns">
 
-    @foreach (string subreddit in Model)
+    @foreach (var subreddit in Model)
     {
         if (counter > 0 && counter % 4 == 0)
         {
@@ -14,7 +14,7 @@
         }
         <div class="column text-center">
             @*TODO: how to get rid of subreddit and just make it default*@
-            <a href="~/Subreddit/@subreddit/Links/desc">@subreddit</a>
+            <a href="~/Subreddit/@subreddit/Links">@subreddit</a>
         </div>
 
         counter++;

appsettings.json

@@ -8,6 +8,6 @@
   },
   "ConnectionStrings": {
     "PostgreSQL": "host=db;database=SubredditDb;username=postgres;password=postgres",
-    "Redis": "redis:6379,abortConnect=False"
+    "Redis": "redis,abortConnect=False"
   }
 }

docker-compose.override.yml

@@ -4,10 +4,6 @@ services:
   luke_site_mvc:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
-      - ASPNETCORE_URLS=https://+:443;http://+:80
+      - ASPNETCORE_URLS=http://+:80
     ports:
-      - "80"
-      - "443"
-    volumes:
-      - ${APPDATA}/Microsoft/UserSecrets:/root/.microsoft/usersecrets:ro
-      - ${APPDATA}/ASP.NET/Https:/root/.aspnet/https:ro
+      - "80"

docker-compose.yml

@@ -11,7 +11,7 @@ services:
       - redis
     restart: always
     environment:
-      - LETSENCRYPT_HOST=luketube.net
+      - LETSENCRYPT_HOST=luketube.net, www.luketube.net
       - VIRTUAL_HOST=luketube.net
       - VIRTUAL_PORT=80
 
@@ -21,16 +21,12 @@ services:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
       POSTGRES_DB: SubredditDb
-    ports:
-      - 5432:5432
     restart: always
     volumes:
       - ./postgres-data:/var/lib/postgresql/data
 
   redis:
     image: redis:6.2.6
-    ports:
-      - 6379:6379
     restart: always
 
   nginx-proxy:

nlog.config

@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
 	  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	  autoReload="true"
-	  internalLogLevel="Info"
-	  internalLogFile="c:\temp\internal-nlog-AspNetCore.txt">
+	  autoReload="true">
 
 	<!-- enable asp.net core layout renderers -->
 	<extensions>
@@ -29,13 +27,5 @@
 		<!--All logs, including from Microsoft-->
 		<logger name="*" minlevel="Debug" writeTo="lifetimeConsole" />
 
-		<!--Output hosting lifetime messages to console target for faster startup detection -->
-		<logger name="Microsoft.Hosting.Lifetime" minlevel="Info" writeTo="lifetimeConsole, ownFile-web" final="true" />
-
-		<!--Skip non-critical Microsoft logs and so log only own logs (BlackHole) -->
-		<logger name="Microsoft.*" maxlevel="Info" final="true" />
-		<logger name="System.Net.Http.*" maxlevel="Info" final="true" />
-
-		<logger name="*" minlevel="Trace" writeTo="ownFile-web" />
 	</rules>
 </nlog>