Fossil SCM
Move TH1/Tcl settings into their own configsets.
Commit
5d784cf3c1fabd6d32e70df3f1ba080abdc5bfe0ebdf216abfc9bd3d7f6858d5
Parent
a24a790f3d6c0f7…
1 file changed
+21
-24
+21
-24
| --- src/configure.c | ||
| +++ src/configure.c | ||
| @@ -27,31 +27,28 @@ | ||
| 27 | 27 | #if INTERFACE |
| 28 | 28 | /* |
| 29 | 29 | ** Configuration transfers occur in groups. These are the allowed |
| 30 | 30 | ** groupings: |
| 31 | 31 | */ |
| 32 | -#define CONFIGSET_CSS 0x000001 /* Style sheet only */ | |
| 33 | -#define CONFIGSET_SKIN 0x000002 /* WWW interface appearance */ | |
| 34 | -#define CONFIGSET_TKT 0x000004 /* Ticket configuration */ | |
| 35 | -#define CONFIGSET_PROJ 0x000008 /* Project name */ | |
| 36 | -#define CONFIGSET_SHUN 0x000010 /* Shun settings */ | |
| 37 | -#define CONFIGSET_USER 0x000020 /* The USER table */ | |
| 38 | -#define CONFIGSET_ADDR 0x000040 /* The CONCEALED table */ | |
| 39 | -#define CONFIGSET_XFER 0x000080 /* Transfer configuration */ | |
| 40 | -#define CONFIGSET_ALIAS 0x000100 /* URL Aliases */ | |
| 41 | -#define CONFIGSET_SCRIBER 0x000200 /* Email subscribers */ | |
| 42 | -#define CONFIGSET_IWIKI 0x000400 /* Interwiki codes */ | |
| 43 | -#define CONFIGSET_ALL 0x0007ff /* Everything */ | |
| 44 | - | |
| 45 | -#define CONFIGSET_OVERWRITE 0x100000 /* Causes overwrite instead of merge */ | |
| 46 | - | |
| 47 | -/* | |
| 48 | -** This mask is used for the common TH1 configuration settings (i.e. those | |
| 49 | -** that are not specific to one particular subsystem, such as the transfer | |
| 50 | -** subsystem). | |
| 51 | -*/ | |
| 52 | -#define CONFIGSET_TH1 (CONFIGSET_SKIN|CONFIGSET_TKT|CONFIGSET_XFER) | |
| 32 | +#define CONFIGSET_CSS 0x000001 /* Style sheet only */ | |
| 33 | +#define CONFIGSET_SKIN 0x000002 /* WWW interface appearance */ | |
| 34 | +#define CONFIGSET_TKT 0x000004 /* Ticket configuration */ | |
| 35 | +#define CONFIGSET_PROJ 0x000008 /* Project name */ | |
| 36 | +#define CONFIGSET_SHUN 0x000010 /* Shun settings */ | |
| 37 | +#define CONFIGSET_USER 0x000020 /* The USER table */ | |
| 38 | +#define CONFIGSET_ADDR 0x000040 /* The CONCEALED table */ | |
| 39 | +#define CONFIGSET_XFER 0x000080 /* Transfer configuration */ | |
| 40 | +#define CONFIGSET_ALIAS 0x000100 /* URL Aliases */ | |
| 41 | +#define CONFIGSET_SCRIBER 0x000200 /* Email subscribers */ | |
| 42 | +#define CONFIGSET_IWIKI 0x000400 /* Interwiki codes */ | |
| 43 | +#define CONFIGSET_ALL 0x0007ff /* All of the above */ | |
| 44 | + | |
| 45 | +#define CONFIGSET_TH1 0x000800 /* TH1 configuration */ | |
| 46 | +#define CONFIGSET_TCL 0x001000 /* Tcl configuration */ | |
| 47 | + | |
| 48 | +#define CONFIGSET_OVERWRITE 0x100000 /* Causes overwrite instead of merge */ | |
| 49 | +#define CONFIGSET_SENSITIVE 0x200000 /* Used to indicate sensitive settings */ | |
| 53 | 50 | |
| 54 | 51 | #endif /* INTERFACE */ |
| 55 | 52 | |
| 56 | 53 | /* |
| 57 | 54 | ** Names of the configuration sets |
| @@ -117,21 +114,21 @@ | ||
| 117 | 114 | { "default-csp", CONFIGSET_SKIN }, |
| 118 | 115 | { "sitemap-extra", CONFIGSET_SKIN }, |
| 119 | 116 | { "safe-html", CONFIGSET_SKIN }, |
| 120 | 117 | |
| 121 | 118 | #ifdef FOSSIL_ENABLE_TH1_DOCS |
| 122 | - { "th1-docs", CONFIGSET_TH1 }, | |
| 119 | + { "th1-docs", CONFIGSET_TH1 | CONFIGSET_SENSITIVE }, | |
| 123 | 120 | #endif |
| 124 | 121 | #ifdef FOSSIL_ENABLE_TH1_HOOKS |
| 125 | 122 | { "th1-hooks", CONFIGSET_TH1 }, |
| 126 | 123 | #endif |
| 127 | 124 | { "th1-setup", CONFIGSET_TH1 }, |
| 128 | 125 | { "th1-uri-regexp", CONFIGSET_TH1 }, |
| 129 | 126 | |
| 130 | 127 | #ifdef FOSSIL_ENABLE_TCL |
| 131 | - { "tcl", CONFIGSET_TH1 }, | |
| 132 | - { "tcl-setup", CONFIGSET_TH1 }, | |
| 128 | + { "tcl", CONFIGSET_TCL | CONFIGSET_SENSITIVE }, | |
| 129 | + { "tcl-setup", CONFIGSET_TCL | CONFIGSET_SENSITIVE }, | |
| 133 | 130 | #endif |
| 134 | 131 | |
| 135 | 132 | { "project-name", CONFIGSET_PROJ }, |
| 136 | 133 | { "short-project-name", CONFIGSET_PROJ }, |
| 137 | 134 | { "project-description", CONFIGSET_PROJ }, |
| 138 | 135 |
| --- src/configure.c | |
| +++ src/configure.c | |
| @@ -27,31 +27,28 @@ | |
| 27 | #if INTERFACE |
| 28 | /* |
| 29 | ** Configuration transfers occur in groups. These are the allowed |
| 30 | ** groupings: |
| 31 | */ |
| 32 | #define CONFIGSET_CSS 0x000001 /* Style sheet only */ |
| 33 | #define CONFIGSET_SKIN 0x000002 /* WWW interface appearance */ |
| 34 | #define CONFIGSET_TKT 0x000004 /* Ticket configuration */ |
| 35 | #define CONFIGSET_PROJ 0x000008 /* Project name */ |
| 36 | #define CONFIGSET_SHUN 0x000010 /* Shun settings */ |
| 37 | #define CONFIGSET_USER 0x000020 /* The USER table */ |
| 38 | #define CONFIGSET_ADDR 0x000040 /* The CONCEALED table */ |
| 39 | #define CONFIGSET_XFER 0x000080 /* Transfer configuration */ |
| 40 | #define CONFIGSET_ALIAS 0x000100 /* URL Aliases */ |
| 41 | #define CONFIGSET_SCRIBER 0x000200 /* Email subscribers */ |
| 42 | #define CONFIGSET_IWIKI 0x000400 /* Interwiki codes */ |
| 43 | #define CONFIGSET_ALL 0x0007ff /* Everything */ |
| 44 | |
| 45 | #define CONFIGSET_OVERWRITE 0x100000 /* Causes overwrite instead of merge */ |
| 46 | |
| 47 | /* |
| 48 | ** This mask is used for the common TH1 configuration settings (i.e. those |
| 49 | ** that are not specific to one particular subsystem, such as the transfer |
| 50 | ** subsystem). |
| 51 | */ |
| 52 | #define CONFIGSET_TH1 (CONFIGSET_SKIN|CONFIGSET_TKT|CONFIGSET_XFER) |
| 53 | |
| 54 | #endif /* INTERFACE */ |
| 55 | |
| 56 | /* |
| 57 | ** Names of the configuration sets |
| @@ -117,21 +114,21 @@ | |
| 117 | { "default-csp", CONFIGSET_SKIN }, |
| 118 | { "sitemap-extra", CONFIGSET_SKIN }, |
| 119 | { "safe-html", CONFIGSET_SKIN }, |
| 120 | |
| 121 | #ifdef FOSSIL_ENABLE_TH1_DOCS |
| 122 | { "th1-docs", CONFIGSET_TH1 }, |
| 123 | #endif |
| 124 | #ifdef FOSSIL_ENABLE_TH1_HOOKS |
| 125 | { "th1-hooks", CONFIGSET_TH1 }, |
| 126 | #endif |
| 127 | { "th1-setup", CONFIGSET_TH1 }, |
| 128 | { "th1-uri-regexp", CONFIGSET_TH1 }, |
| 129 | |
| 130 | #ifdef FOSSIL_ENABLE_TCL |
| 131 | { "tcl", CONFIGSET_TH1 }, |
| 132 | { "tcl-setup", CONFIGSET_TH1 }, |
| 133 | #endif |
| 134 | |
| 135 | { "project-name", CONFIGSET_PROJ }, |
| 136 | { "short-project-name", CONFIGSET_PROJ }, |
| 137 | { "project-description", CONFIGSET_PROJ }, |
| 138 |
| --- src/configure.c | |
| +++ src/configure.c | |
| @@ -27,31 +27,28 @@ | |
| 27 | #if INTERFACE |
| 28 | /* |
| 29 | ** Configuration transfers occur in groups. These are the allowed |
| 30 | ** groupings: |
| 31 | */ |
| 32 | #define CONFIGSET_CSS 0x000001 /* Style sheet only */ |
| 33 | #define CONFIGSET_SKIN 0x000002 /* WWW interface appearance */ |
| 34 | #define CONFIGSET_TKT 0x000004 /* Ticket configuration */ |
| 35 | #define CONFIGSET_PROJ 0x000008 /* Project name */ |
| 36 | #define CONFIGSET_SHUN 0x000010 /* Shun settings */ |
| 37 | #define CONFIGSET_USER 0x000020 /* The USER table */ |
| 38 | #define CONFIGSET_ADDR 0x000040 /* The CONCEALED table */ |
| 39 | #define CONFIGSET_XFER 0x000080 /* Transfer configuration */ |
| 40 | #define CONFIGSET_ALIAS 0x000100 /* URL Aliases */ |
| 41 | #define CONFIGSET_SCRIBER 0x000200 /* Email subscribers */ |
| 42 | #define CONFIGSET_IWIKI 0x000400 /* Interwiki codes */ |
| 43 | #define CONFIGSET_ALL 0x0007ff /* All of the above */ |
| 44 | |
| 45 | #define CONFIGSET_TH1 0x000800 /* TH1 configuration */ |
| 46 | #define CONFIGSET_TCL 0x001000 /* Tcl configuration */ |
| 47 | |
| 48 | #define CONFIGSET_OVERWRITE 0x100000 /* Causes overwrite instead of merge */ |
| 49 | #define CONFIGSET_SENSITIVE 0x200000 /* Used to indicate sensitive settings */ |
| 50 | |
| 51 | #endif /* INTERFACE */ |
| 52 | |
| 53 | /* |
| 54 | ** Names of the configuration sets |
| @@ -117,21 +114,21 @@ | |
| 114 | { "default-csp", CONFIGSET_SKIN }, |
| 115 | { "sitemap-extra", CONFIGSET_SKIN }, |
| 116 | { "safe-html", CONFIGSET_SKIN }, |
| 117 | |
| 118 | #ifdef FOSSIL_ENABLE_TH1_DOCS |
| 119 | { "th1-docs", CONFIGSET_TH1 | CONFIGSET_SENSITIVE }, |
| 120 | #endif |
| 121 | #ifdef FOSSIL_ENABLE_TH1_HOOKS |
| 122 | { "th1-hooks", CONFIGSET_TH1 }, |
| 123 | #endif |
| 124 | { "th1-setup", CONFIGSET_TH1 }, |
| 125 | { "th1-uri-regexp", CONFIGSET_TH1 }, |
| 126 | |
| 127 | #ifdef FOSSIL_ENABLE_TCL |
| 128 | { "tcl", CONFIGSET_TCL | CONFIGSET_SENSITIVE }, |
| 129 | { "tcl-setup", CONFIGSET_TCL | CONFIGSET_SENSITIVE }, |
| 130 | #endif |
| 131 | |
| 132 | { "project-name", CONFIGSET_PROJ }, |
| 133 | { "short-project-name", CONFIGSET_PROJ }, |
| 134 | { "project-description", CONFIGSET_PROJ }, |
| 135 |