From 8f432e1b1d42d1a45597c32256af9b611b422000 Mon Sep 17 00:00:00 2001
From: Jonas Gunz <himself@jonasgunz.de>
Date: Mon, 24 Jul 2023 14:38:43 +0200
Subject: move container files to subfolder, add nginx conf

---
 nginx/arch.conf            | 15 ---------------
 nginx/arch_ssl.conf        | 24 ------------------------
 nginx/aurbuilder.conf      |  8 ++++++++
 scripts/build_container.sh |  2 +-
 4 files changed, 9 insertions(+), 40 deletions(-)
 delete mode 100644 nginx/arch.conf
 delete mode 100644 nginx/arch_ssl.conf
 create mode 100644 nginx/aurbuilder.conf

diff --git a/nginx/arch.conf b/nginx/arch.conf
deleted file mode 100644
index c66ad85..0000000
--- a/nginx/arch.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-# vi: ft=nginx
-
-server {
-    listen 80;
-    #server_name  localhost;
-
-    location / {
-        root /srv/arch/;
-
-        autoindex on;
-        autoindex_exact_size off;
-        autoindex_format html;
-        autoindex_localtime on;
-    }
-}
diff --git a/nginx/arch_ssl.conf b/nginx/arch_ssl.conf
deleted file mode 100644
index 40ec2b7..0000000
--- a/nginx/arch_ssl.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-# vi: ft=nginx
-
-server {
-    listen 443 ssl;
-    #server_name  localhost;
-
-    ssl_certificate      cert.pem;
-    ssl_certificate_key  cert.key;
-
-    ssl_session_cache    shared:SSL:1m;
-    ssl_session_timeout  5m;
-
-    ssl_ciphers  HIGH:!aNULL:!MD5;
-    ssl_prefer_server_ciphers  on;
-
-    location / {
-        root /srv/arch/;
-
-        autoindex on;
-        autoindex_exact_size off;
-        autoindex_format html;
-        autoindex_localtime on;
-    }
-}
diff --git a/nginx/aurbuilder.conf b/nginx/aurbuilder.conf
new file mode 100644
index 0000000..601318a
--- /dev/null
+++ b/nginx/aurbuilder.conf
@@ -0,0 +1,8 @@
+# vi: ft=nginx
+
+root /srv/pkg;
+
+autoindex on;
+autoindex_exact_size off;
+autoindex_format html;
+autoindex_localtime on;
diff --git a/scripts/build_container.sh b/scripts/build_container.sh
index 614d34c..2e7a6e2 100755
--- a/scripts/build_container.sh
+++ b/scripts/build_container.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PODMAN=$(which podman)
-DIR=${DIR:-/usr/share/aurbuilder}
+DIR=${DIR:-/usr/share/aurbuilder/container}
 
 $PODMAN pull archlinux:base-devel
 $PODMAN build --no-cache -t aurbuilder "$DIR"
-- 
cgit v1.2.3