finished setting build for aws on prod

Author: jsoneaday

deploy/.gitignore

@@ -1,2 +1,3 @@
 aws
-awscliv2.zip
+awscliv2.zip
+ssl

deploy/Dockerfile

@@ -7,7 +7,6 @@ RUN apt-get update && apt-get install -y \
 COPY server/ /usr/src/syntaxmakersserver/server/
 WORKDIR /usr/src/syntaxmakersserver/server
 RUN cargo build --release
-
 RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && \
     apt-get install -y nodejs
 COPY webclient/ /usr/src/syntaxmakersserver/webclient/
@@ -20,12 +19,13 @@ RUN apt-get update && \
     apt-get install -y \
     nginx \
     libssl3 \
+    curl \
+    jq \
     && apt-get clean
-    
 COPY --from=builder /usr/src/syntaxmakersserver /usr/local/bin/syntaxmakersserver
 RUN rm /etc/nginx/sites-enabled/default
 EXPOSE 80 443
-RUN mv /usr/local/bin/syntaxmakersserver/server/nginx.conf /etc/nginx/conf.d/nginx.conf
-RUN mv /usr/local/bin/syntaxmakersserver/server/.env.production /usr/local/bin/syntaxmakersserver/server/.env
+RUN mv /usr/local/bin/syntaxmakersserver/webclient/nginx.conf /etc/nginx/conf.d/nginx.conf
+# RUN mv /usr/local/bin/syntaxmakersserver/server/.env.production /usr/local/bin/syntaxmakersserver/server/.env
 WORKDIR /usr/local/bin/syntaxmakersserver/server
 CMD ["sh", "-c", "nginx && ./target/release/syntaxmakers-server"]

deploy/build.sh

@@ -1,2 +1,5 @@
-echo build docker container
+docker rmi $(docker images -q) -f
 docker build -f ./Dockerfile -t syntaxmakers:1.0 ..
+docker tag syntaxmakers:1.0 201558611471.dkr.ecr.us-east-2.amazonaws.com/syntaxmakers1
+aws ecr get-login-password --region us-east-2 --profile cli | docker login --username AWS --password-stdin 201558611471.dkr.ecr.us-east-2.amazonaws.com
+docker push 201558611471.dkr.ecr.us-east-2.amazonaws.com/syntaxmakers1

server/nginx.conf

@@ -154,8 +154,7 @@ pub async fn run() -> std::io::Result<()> {
     dotenv().ok();
     let host = env::var("HOST").unwrap();
     let port = env::var("PORT").unwrap().parse::<u16>().unwrap();
-    let allowed_origin1 = env::var("ALLOWED_ORIGIN1").unwrap();
-    info!("ALLOWED_ORIGIN1 {}", &allowed_origin1);
+    let allowed_domain = env::var("ALLOWED_DOMAIN").unwrap();
 
     let app_data = actix_web::web::Data::new(AppState{
         repo: DbRepo::init().await,
@@ -170,7 +169,7 @@ pub async fn run() -> std::io::Result<()> {
             .wrap(Logger::default())
             .wrap(
                 Cors::default()
-                    .allowed_origin(&allowed_origin1)
+                    .allowed_origin(&allowed_domain)
                     .allowed_methods(vec!["GET", "POST"])
                     .allowed_headers(vec![
                         header::CONTENT_TYPE,
@@ -256,7 +255,7 @@ pub async fn run() -> std::io::Result<()> {
     .bind((host, port)).expect("")
     // note: cannot use this for dev as client must also be on https,
     // enable at production
-    // .bind_openssl((host, port), ssl_builder()).expect("SSL not working") 
+   // .bind_openssl((host, port), ssl_builder()).expect("SSL not working") 
     .run()
     .await
 }

server/src/lib.rs

@@ -1 +1 @@
-VITE_API_URL=http://localhost:4003/v1/
+VITE_API_URL=https://syntaxmakers.com/v1/

webclient/.env.production

@@ -22,3 +22,5 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
+
+ssl

webclient/.gitignore

@@ -0,0 +1,46 @@
+server {
+    listen 80;
+    server_name www.syntaxmakers.com;
+
+    location / {
+        return 301 http://syntaxmakers.com$request_uri;
+    }
+}
+
+server {
+    listen 80;
+    server_name syntaxmakers.com;
+    
+    location / {
+        return 301 https://$host$request_uri;
+    }
+}
+
+server {
+    listen 443 ssl;
+    server_name syntaxmakers.com;
+    
+    ssl_certificate /usr/local/bin/syntaxmakersserver/server/ssl/cert.pem;
+    ssl_certificate_key /usr/local/bin/syntaxmakersserver/server/ssl/key.pem;
+    ssl_protocols TLSv1.2 TLSv1.3;
+    ssl_ciphers HIGH:!aNULL:!MD5;
+
+    access_log /dev/stdout;
+    error_log /dev/stderr;
+
+    # Serve static files from React build
+    location / {
+        root /usr/local/bin/syntaxmakersserver/webclient/dist;
+        index index.html;
+        try_files $uri $uri/ /index.html;
+    }
+
+    # Proxy requests to the API server
+    location /v1/ {
+        proxy_pass http://localhost:4003/;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+}