external
/
mailinabox
mirror of https://github.com/mail-in-a-box/mailinabox.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into nextcloud11

This commit is contained in:
yodax 2017-05-24 10:06:06 +02:00
parent 857a98092e 18f1689f45
commit 532df12175
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
conf/nginx-primaryonly.conf
View File

@ -1,6 +1,9 @@
# Control Panel # Control Panel
# Proxy /admin to our Python based control panel daemon. It is # Proxy /admin to our Python based control panel daemon. It is
# listening on IPv4 only so use an IP address and not 'localhost'. # listening on IPv4 only so use an IP address and not 'localhost'.
location /admin/assets {
alias /usr/local/lib/mailinabox/vendor/assets;
}
rewrite ^/admin$ /admin/; rewrite ^/admin$ /admin/;
rewrite ^/admin/munin$ /admin/munin/ redirect; rewrite ^/admin/munin$ /admin/munin/ redirect;
location /admin/ { location /admin/ {

8
management/templates/index.html
View File

@ -9,7 +9,7 @@
<meta name="robots" content="noindex, nofollow"> <meta name="robots" content="noindex, nofollow">
<link rel="stylesheet" href="/assets/bootstrap.min.css"> <link rel="stylesheet" href="/admin/assets/bootstrap.min.css">
<style> <style>
body { body {
overflow-y: scroll; overflow-y: scroll;
@ -63,7 +63,7 @@
margin-bottom: 1em; margin-bottom: 1em;
} }
</style> </style>
<link rel="stylesheet" href="/assets/bootstrap-theme.min.css"> <link rel="stylesheet" href="/admin/assets/bootstrap-theme.min.css">
</head> </head>
<body> <body>
@ -191,8 +191,8 @@
</div> </div>
</div> </div>
<script src="/assets/jquery.min.js"></script> <script src="/admin/assets/jquery.min.js"></script>
<script src="/assets/bootstrap.min.js"></script> <script src="/admin/assets/bootstrap.min.js"></script>
<script> <script>
var global_modal_state = null; var global_modal_state = null;

2
setup/management.sh
View File

@ -65,7 +65,7 @@ fi
# Download jQuery and Bootstrap local files # Download jQuery and Bootstrap local files
# Make sure we have the directory to save to. # Make sure we have the directory to save to.
assets_dir=$STORAGE_ROOT/www/default/assets assets_dir=/usr/local/lib/mailinabox/vendor/assets
mkdir -p $assets_dir mkdir -p $assets_dir
# jQuery CDN URL # jQuery CDN URL