Skip to content

Commit 39285ff

Browse files
committed
Run make config-rebuild
1 parent 7f257f5 commit 39285ff

File tree

2 files changed

+52
-66
lines changed

2 files changed

+52
-66
lines changed

doc/source/admin/galaxy_options.rst

Lines changed: 30 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2502,9 +2502,9 @@
25022502

25032503
:Description:
25042504
Serve static content, which must be enabled if you're not serving
2505-
it via a proxy server. These options should be self explanatory
2506-
and so are not documented individually. You can use these paths
2507-
(or ones in the proxy server) to point to your own styles.
2505+
it via a proxy server. You can use these paths (or ones in the
2506+
proxy server) to point to your own styles. The static_* options
2507+
that refer to paths are relative to the current working directory.
25082508
:Default: ``true``
25092509
:Type: bool
25102510

@@ -2514,10 +2514,8 @@
25142514
~~~~~~~~~~~~~~~~~~~~~
25152515

25162516
:Description:
2517-
Serve static content, which must be enabled if you're not serving
2518-
it via a proxy server. These options should be self explanatory
2519-
and so are not documented individually. You can use these paths
2520-
(or ones in the proxy server) to point to your own styles.
2517+
Value of cache time for static content served by Galaxy. Ignored
2518+
if static_enabled is false.
25212519
:Default: ``360``
25222520
:Type: int
25232521

@@ -2527,24 +2525,32 @@
25272525
~~~~~~~~~~~~~~
25282526

25292527
:Description:
2530-
Serve static content, which must be enabled if you're not serving
2531-
it via a proxy server. These options should be self explanatory
2532-
and so are not documented individually. You can use these paths
2533-
(or ones in the proxy server) to point to your own styles.
2528+
Path to the static content dir. Ignored if static_enabled is
2529+
false.
25342530
:Default: ``static/``
25352531
:Type: str
25362532

25372533

2534+
~~~~~~~~~~~~~~~~~~~
2535+
``static_dist_dir``
2536+
~~~~~~~~~~~~~~~~~~~
2537+
2538+
:Description:
2539+
Path to the built Galaxy client application, static/dist/ in the
2540+
Galaxy source code after the build is complete. Ignored if
2541+
static_enabled is false.
2542+
:Default: ``static/dist/``
2543+
:Type: str
2544+
2545+
25382546
~~~~~~~~~~~~~~~~~~~~~
25392547
``static_images_dir``
25402548
~~~~~~~~~~~~~~~~~~~~~
25412549

25422550
:Description:
2543-
Serve static content, which must be enabled if you're not serving
2544-
it via a proxy server. These options should be self explanatory
2545-
and so are not documented individually. You can use these paths
2546-
(or ones in the proxy server) to point to your own styles.
2547-
:Default: ``static/images``
2551+
Path to the static images directory. Ignored if static_enabled is
2552+
false.
2553+
:Default: ``static/images/``
25482554
:Type: str
25492555

25502556

@@ -2553,10 +2559,8 @@
25532559
~~~~~~~~~~~~~~~~~~~~~~
25542560

25552561
:Description:
2556-
Serve static content, which must be enabled if you're not serving
2557-
it via a proxy server. These options should be self explanatory
2558-
and so are not documented individually. You can use these paths
2559-
(or ones in the proxy server) to point to your own styles.
2562+
Path to favicon.ico, not the directory that contains it (the name
2563+
is a misnomer). Ignored if static_enabled is false.
25602564
:Default: ``static/favicon.ico``
25612565
:Type: str
25622566

@@ -2566,10 +2570,8 @@
25662570
~~~~~~~~~~~~~~~~~~~~~~
25672571

25682572
:Description:
2569-
Serve static content, which must be enabled if you're not serving
2570-
it via a proxy server. These options should be self explanatory
2571-
and so are not documented individually. You can use these paths
2572-
(or ones in the proxy server) to point to your own styles.
2573+
Path to the static scripts directory. Ignored if static_enabled is
2574+
false.
25732575
:Default: ``static/scripts/``
25742576
:Type: str
25752577

@@ -2579,11 +2581,9 @@
25792581
~~~~~~~~~~~~~~~~~~~~
25802582

25812583
:Description:
2582-
Serve static content, which must be enabled if you're not serving
2583-
it via a proxy server. These options should be self explanatory
2584-
and so are not documented individually. You can use these paths
2585-
(or ones in the proxy server) to point to your own styles.
2586-
:Default: ``static/style``
2584+
Path to the static style directory. Ignored if static_enabled is
2585+
false.
2586+
:Default: ``static/style/``
25872587
:Type: str
25882588

25892589

@@ -2592,10 +2592,7 @@
25922592
~~~~~~~~~~~~~~~~~~~~~
25932593

25942594
:Description:
2595-
Serve static content, which must be enabled if you're not serving
2596-
it via a proxy server. These options should be self explanatory
2597-
and so are not documented individually. You can use these paths
2598-
(or ones in the proxy server) to point to your own styles.
2595+
Path to robots.txt. Ignored if static_enabled is false.
25992596
:Default: ``static/robots.txt``
26002597
:Type: str
26012598

lib/galaxy/config/sample/galaxy.yml.sample

Lines changed: 22 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1533,51 +1533,40 @@ galaxy:
15331533
#terms_url: null
15341534

15351535
# Serve static content, which must be enabled if you're not serving it
1536-
# via a proxy server. These options should be self explanatory and so
1537-
# are not documented individually. You can use these paths (or ones
1538-
# in the proxy server) to point to your own styles.
1536+
# via a proxy server. You can use these paths (or ones in the proxy
1537+
# server) to point to your own styles. The static_* options that refer
1538+
# to paths are relative to the current working directory.
15391539
#static_enabled: true
15401540

1541-
# Serve static content, which must be enabled if you're not serving it
1542-
# via a proxy server. These options should be self explanatory and so
1543-
# are not documented individually. You can use these paths (or ones
1544-
# in the proxy server) to point to your own styles.
1541+
# Value of cache time for static content served by Galaxy. Ignored if
1542+
# static_enabled is false.
15451543
#static_cache_time: 360
15461544

1547-
# Serve static content, which must be enabled if you're not serving it
1548-
# via a proxy server. These options should be self explanatory and so
1549-
# are not documented individually. You can use these paths (or ones
1550-
# in the proxy server) to point to your own styles.
1545+
# Path to the static content dir. Ignored if static_enabled is false.
15511546
#static_dir: static/
15521547

1553-
# Serve static content, which must be enabled if you're not serving it
1554-
# via a proxy server. These options should be self explanatory and so
1555-
# are not documented individually. You can use these paths (or ones
1556-
# in the proxy server) to point to your own styles.
1557-
#static_images_dir: static/images
1548+
# Path to the built Galaxy client application, static/dist/ in the
1549+
# Galaxy source code after the build is complete. Ignored if
1550+
# static_enabled is false.
1551+
#static_dist_dir: static/dist/
15581552

1559-
# Serve static content, which must be enabled if you're not serving it
1560-
# via a proxy server. These options should be self explanatory and so
1561-
# are not documented individually. You can use these paths (or ones
1562-
# in the proxy server) to point to your own styles.
1553+
# Path to the static images directory. Ignored if static_enabled is
1554+
# false.
1555+
#static_images_dir: static/images/
1556+
1557+
# Path to favicon.ico, not the directory that contains it (the name is
1558+
# a misnomer). Ignored if static_enabled is false.
15631559
#static_favicon_dir: static/favicon.ico
15641560

1565-
# Serve static content, which must be enabled if you're not serving it
1566-
# via a proxy server. These options should be self explanatory and so
1567-
# are not documented individually. You can use these paths (or ones
1568-
# in the proxy server) to point to your own styles.
1561+
# Path to the static scripts directory. Ignored if static_enabled is
1562+
# false.
15691563
#static_scripts_dir: static/scripts/
15701564

1571-
# Serve static content, which must be enabled if you're not serving it
1572-
# via a proxy server. These options should be self explanatory and so
1573-
# are not documented individually. You can use these paths (or ones
1574-
# in the proxy server) to point to your own styles.
1575-
#static_style_dir: static/style
1565+
# Path to the static style directory. Ignored if static_enabled is
1566+
# false.
1567+
#static_style_dir: static/style/
15761568

1577-
# Serve static content, which must be enabled if you're not serving it
1578-
# via a proxy server. These options should be self explanatory and so
1579-
# are not documented individually. You can use these paths (or ones
1580-
# in the proxy server) to point to your own styles.
1569+
# Path to robots.txt. Ignored if static_enabled is false.
15811570
#static_robots_txt: static/robots.txt
15821571

15831572
# Incremental Display Options

0 commit comments

Comments
 (0)