bug fix #27

Dockerfile

@@ -9,6 +9,8 @@ COPY resources/docker/nginx-ui.conf /usr/etc/nginx/conf.d/nginx-ui.conf
 COPY resources/docker/nginx-ui.conf /etc/nginx/conf.d/nginx-ui.conf
 COPY nginx-ui /app/nginx-ui
 
-RUN cd /app && chmod a+x /app/start.sh  && rm -f /etc/nginx/conf.d/default.conf
+RUN cd /app && chmod a+x /app/start.sh  \
+    && rm -f /etc/nginx/conf.d/default.conf  \
+    && rm -f /usr/etc/nginx/conf.d/default.conf
 
 ENTRYPOINT ["./start.sh"]

frontend/src/version.json

@@ -1 +1 @@
-{"version":"1.5.0","build_id":25,"total_build":95}
+{"version":"1.5.0","build_id":29,"total_build":99}

frontend/src/views/domain/ngx_conf/NgxConfigEditor.vue

@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import DirectiveEditor from '@/views/domain/ngx_conf/directive/DirectiveEditor'
-import LocationEditor from '@/views/domain/ngx_conf/LocationEditor'
-import {computed, defineEmits, ref} from 'vue'
-import {useRoute} from 'vue-router'
+import DirectiveEditor from '@/views/domain/ngx_conf/directive/DirectiveEditor.vue'
+import LocationEditor from '@/views/domain/ngx_conf/LocationEditor.vue'
+import {computed, ref} from 'vue'
+import {useRoute, useRouter} from 'vue-router'
 import {useGettext} from 'vue3-gettext'
 import Cert from '@/views/domain/cert/Cert.vue'
 

frontend/src/views/other/Install.vue

@@ -3,7 +3,7 @@ import {Form, message} from 'ant-design-vue'
 import SetLanguage from '@/components/SetLanguage/SetLanguage.vue'
 import {reactive, ref} from 'vue'
 import gettext from '@/gettext'
-import install from '@/api'
+import install from '@/api/install'
 import {useRoute, useRouter} from 'vue-router'
 import {MailOutlined, UserOutlined, LockOutlined, DatabaseOutlined} from '@ant-design/icons-vue'
 

frontend/src/views/other/Login.vue

@@ -9,10 +9,17 @@ import {useRoute, useRouter} from 'vue-router'
 import gettext from '@/gettext'
 import {Form, message} from 'ant-design-vue'
 import auth from '@/api/auth'
+import install from '@/api/install'
 
 const route = useRoute()
 const router = useRouter()
 
+install.get_lock().then(async (r: { lock: boolean }) => {
+    if (!r.lock) {
+        await router.push('/install')
+    }
+})
+
 const {$gettext} = gettext
 const loading = ref(false)
 

frontend/version.json

@@ -1 +1 @@
-{"version":"1.5.0","build_id":25,"total_build":95}
+{"version":"1.5.0","build_id":29,"total_build":99}

server/tool/cert.go

@@ -123,7 +123,7 @@ func IssueCert(domain string) error {
     if settings.ServerSettings.Demo {
         config.CADirURL = "https://acme-staging-v02.api.letsencrypt.org/directory"
     }
-    
+
     config.Certificate.KeyType = certcrypto.RSA2048
 
     // A client facilitates communication with the CA server.