mirrors/nginx-ui
1
0
Fork 0
mirror of https://github.com/0xJacky/nginx-ui.git synced 2025-05-11 10:25:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

bug fix #27

Browse source
This commit is contained in:
0xJacky 2022-08-04 20:44:18 +08:00
parent 7849ef76bc
commit dd18011b2b
No known key found for this signature in database
GPG key ID: B6E4A6E4A561BAF0
8 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Dockerfile
View file

@ -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"]

0
frontend/src/api/index.ts → frontend/src/api/install.ts
View file

2
frontend/src/version.json
View file

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

8
frontend/src/views/domain/ngx_conf/NgxConfigEditor.vue
View file

@ -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'

2
frontend/src/views/other/Install.vue
View file

@ -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'

7
frontend/src/views/other/Login.vue
View file

@ -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)

2
frontend/version.json
View file

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

2
server/tool/cert.go
View file

@ -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.