Changeset 2317

Show
Ignore:
Timestamp:
10/06/08 23:13:11 (1 month ago)
Author:
anarcat
Message:

remove alternc/mynetwork debconf parameter, stop overriding it in
postfix

also split the config prompts between slave and non-slave package

See: #1029

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • alternc/trunk/debian/alternc-slave.config

    • Property svn:mergeinfo set
    r2266 r2317  
    77db_title AlternC 
    88 
    9 db_input critical alternc/welcomeconfirm || true 
     9db_input critical alternc-slave/welcomeconfirm || true 
    1010 
    1111db_go 
    1212# Check the answer. 
    13 db_get alternc/welcomeconfirm || true 
     13db_get alternc-slave/welcomeconfirm || true 
    1414 
    1515if [ "$RET" = "false" ]; then 
    1616        # reset the welcomeconfirm flag if user refuses so it gets asked again next time 
    17         db_reset alternc/welcomeconfirm || true 
    18         db_fset alternc/welcomeconfirm "seen" "false" || true 
     17        db_reset alternc-slave/welcomeconfirm || true 
     18        db_fset alternc-slave/welcomeconfirm "seen" "false" || true 
    1919        exit 1 
    2020fi 
    …… 
    5353 
    5454# mettre les valeurs de local.sh comme "default" pour debconf 
    55 db_get alternc/hostingname 
     55db_get alternc-slave/hostingname 
    5656if [ -z "$RET" ] 
    5757    then 
    58     db_set alternc/hostingname "$HOSTING" 
     58    db_set alternc-slave/hostingname "$HOSTING" 
    5959fi 
    6060 
    61 db_get alternc/desktopname 
     61db_get alternc-slave/desktopname 
    6262if [ -z "$RET" ] 
    6363    then 
    64 db_set alternc/desktopname "$FQDN" 
     64db_set alternc-slave/desktopname "$FQDN" 
    6565fi 
    6666 
    67 db_get alternc/public_ip 
     67db_get alternc-slave/public_ip 
    6868if [ -z "$RET" ] 
    6969    then 
    70 db_set alternc/public_ip "$PUBLIC_IP" 
     70db_set alternc-slave/public_ip "$PUBLIC_IP" 
    7171fi 
    7272 
    73 db_get alternc/internal_ip 
     73db_get alternc-slave/internal_ip 
    7474if [ -z "$RET" ] 
    7575    then 
    76 db_set alternc/internal_ip "$INTERNAL_IP" 
     76db_set alternc-slave/internal_ip "$INTERNAL_IP" 
    7777fi 
    7878 
    79 db_get alternc/monitor_ip 
     79db_get alternc-slave/monitor_ip 
    8080if [ -z "$RET" ] 
    8181    then 
    82 db_set alternc/monitor_ip "$MONITOR_IP" 
     82db_set alternc-slave/monitor_ip "$MONITOR_IP" 
    8383fi 
    8484 
    85 db_get alternc/ns1 
     85db_get alternc-slave/ns1 
    8686if [ -z "$RET" ] 
    8787    then 
    88 db_set alternc/ns1 "$NS1_HOSTNAME" 
     88db_set alternc-slave/ns1 "$NS1_HOSTNAME" 
    8989fi 
    9090 
    91 db_get alternc/ns2 
     91db_get alternc-slave/ns2 
    9292if [ -z "$RET" ] 
    9393    then 
    94 db_set alternc/ns2 "$NS2_HOSTNAME" 
     94db_set alternc-slave/ns2 "$NS2_HOSTNAME" 
    9595fi 
    9696 
    97 db_get alternc/bind_internal 
     97db_get alternc-slave/bind_internal 
    9898if [ -z "$RET" ] 
    9999    then 
    100 db_set alternc/bind_internal "$BIND_INTERNAL" 
     100db_set alternc-slave/bind_internal "$BIND_INTERNAL" 
    101101fi 
    102102 
    103 db_get alternc/default_mx 
     103db_get alternc-slave/default_mx 
    104104if [ -z "$RET" ] 
    105105    then 
    106 db_set alternc/default_mx "$DEFAULT_MX" 
     106db_set alternc-slave/default_mx "$DEFAULT_MX" 
    107107fi 
    108108 
    109 db_get alternc/mysql/host 
     109db_get alternc-slave/mysql/host 
    110110if [ -z "$RET" ] 
    111111    then 
    112 db_set alternc/mysql/host "$MYSQL_HOST" 
     112db_set alternc-slave/mysql/host "$MYSQL_HOST" 
    113113fi 
    114114 
    115 db_get alternc/mysql/db 
     115db_get alternc-slave/mysql/db 
    116116if [ -z "$RET" ] 
    117117    then 
    118 db_set alternc/mysql/db "$MYSQL_DATABASE" 
     118db_set alternc-slave/mysql/db "$MYSQL_DATABASE" 
    119119fi 
    120120 
    121 db_get alternc/mysql/user 
     121db_get alternc-slave/mysql/user 
    122122if [ -z "$RET" ] 
    123123    then 
    124 db_set alternc/mysql/user "$MYSQL_USER" 
     124db_set alternc-slave/mysql/user "$MYSQL_USER" 
    125125fi 
    126126 
    127 db_get alternc/mysql/password 
     127db_get alternc-slave/mysql/password 
    128128if [ -z "$RET" ] 
    129129    then 
    130 db_set alternc/mysql/password "$MYSQL_PASS" 
     130db_set alternc-slave/mysql/password "$MYSQL_PASS" 
    131131fi 
    132132 
    133 db_get alternc/mysql/client 
     133db_get alternc-slave/mysql/client 
    134134if [ -z "$RET" ] 
    135135    then 
    136 db_set alternc/mysql/client "$MYSQL_CLIENT" 
     136db_set alternc-slave/mysql/client "$MYSQL_CLIENT" 
    137137fi 
    138138 
    139 db_get alternc/sql/backup_type 
     139db_get alternc-slave/sql/backup_type 
    140140if [ -z "$RET" ] 
    141141    then 
    142 db_set alternc/sql/backup_type "$SQLBACKUP_TYPE" 
     142db_set alternc-slave/sql/backup_type "$SQLBACKUP_TYPE" 
    143143fi 
    144144 
    145 db_get alternc/sql/backup_overwrite 
     145db_get alternc-slave/sql/backup_overwrite 
    146146if [ -z "$RET" ] 
    147147    then 
    148 db_set alternc/sql/backup_overwrite "$SQLBACKUP_OVERWRITE" 
     148db_set alternc-slave/sql/backup_overwrite "$SQLBACKUP_OVERWRITE" 
    149149fi 
    150150 
    151 db_get alternc/alternc_location 
     151db_get alternc-slave/alternc_location 
    152152if [ -z "$RET" ] 
    153153    then 
    154 db_set alternc/alternc_location "$ALTERNC_LOC" 
     154db_set alternc-slave/alternc_location "$ALTERNC_LOC" 
    155155fi 
    156156 
    157 db_get alternc/mynetwork 
    158 if [ -z "$RET" ] 
    159     then 
    160 db_set alternc/mynetwork "$SMTP_RELAY_NETWORKS" 
    161 fi 
    162  
    163 db_input medium alternc/desktopname || true 
    164 db_input medium alternc/hostingname || true 
    165 db_input medium alternc/internal_ip || true 
    166 db_input medium alternc/public_ip || true 
    167 db_input medium alternc/default_mx || true 
    168 db_input medium alternc/ns1 || true 
    169 db_input medium alternc/ns2 || true 
    170 db_input low alternc/alternc_location || true 
    171 db_input low alternc/mysql/host || true 
    172 db_input low alternc/mysql/db || true 
    173 db_input low alternc/mysql/user || true 
    174 db_input low alternc/mysql/password || true 
    175 db_input low alternc/mysql/client || true 
    176 db_input low alternc/sql/backup_type || true 
    177 db_input low alternc/sql/overwrite || true 
    178 db_input low alternc/monitor_ip || true 
    179 db_input low alternc/bind_internal || true 
    180 db_input low alternc/mynetwork || true 
     157db_input medium alternc-slave/desktopname || true 
     158db_input medium alternc-slave/hostingname || true 
     159db_input medium alternc-slave/internal_ip || true 
     160db_input medium alternc-slave/public_ip || true 
     161db_input medium alternc-slave/default_mx || true 
     162db_input medium alternc-slave/ns1 || true 
     163db_input medium alternc-slave/ns2 || true 
     164db_input low alternc-slave/alternc_location || true 
     165db_input low alternc-slave/mysql/host || true 
     166db_input low alternc-slave/mysql/db || true 
     167db_input low alternc-slave/mysql/user || true 
     168db_input low alternc-slave/mysql/password || true 
     169db_input low alternc-slave/mysql/client || true 
     170db_input low alternc-slave/sql/backup_type || true 
     171db_input low alternc-slave/sql/overwrite || true 
     172db_input low alternc-slave/monitor_ip || true 
     173db_input low alternc-slave/bind_internal || true 
    181174db_go 
    182175 

  • alternc/trunk/debian/alternc-slave.postinst

    r2316 r2317  
    9393# Folder holding data (used for quota management) 
    9494ALTERNC_LOC="" 
    95  
    96 # Networks that SMTP should relay, separated with spaces 
    97 SMTP_RELAY_NETWORKS="" 
    9895 
    9996# the type of backup created by the sql backup script 
    …… 
    130127    update_var alternc/sql/backup_overwrite SQLBACKUP_OVERWRITE 
    131128    update_var alternc/alternc_location ALTERNC_LOC 
    132     update_var alternc/mynetwork SMTP_RELAY_NETWORKS 
    133129    sed -e "$SED_SCRIPT" < $CONFIGFILE > $CONFIGFILE.tmp 
    134130    mv -f $CONFIGFILE.tmp $CONFIGFILE 

  • alternc/trunk/debian/alternc.config

    • Property svn:mergeinfo set
    r2266 r2317  
    155155fi 
    156156 
    157 db_get alternc/mynetwork 
    158 if [ -z "$RET" ] 
    159     then 
    160 db_set alternc/mynetwork "$SMTP_RELAY_NETWORKS" 
    161 fi 
    162  
    163157db_input medium alternc/desktopname || true 
    164158db_input medium alternc/hostingname || true 
    …… 
    178172db_input low alternc/monitor_ip || true 
    179173db_input low alternc/bind_internal || true 
    180 db_input low alternc/mynetwork || true 
    181174db_go 
    182175 

  • alternc/trunk/debian/alternc.postinst

    r2316 r2317  
    9393# Folder holding data (used for quota management) 
    9494ALTERNC_LOC="" 
    95  
    96 # Networks that SMTP should relay, separated with spaces 
    97 SMTP_RELAY_NETWORKS="" 
    9895 
    9996# the type of backup created by the sql backup script 
    …… 
    130127    update_var alternc/sql/backup_overwrite SQLBACKUP_OVERWRITE 
    131128    update_var alternc/alternc_location ALTERNC_LOC 
    132     update_var alternc/mynetwork SMTP_RELAY_NETWORKS 
    133129    sed -e "$SED_SCRIPT" < $CONFIGFILE > $CONFIGFILE.tmp 
    134130    mv -f $CONFIGFILE.tmp $CONFIGFILE 

  • alternc/trunk/debian/changelog

    r2312 r2317  
    2020    * make a new alternc-slave package that eases installation on NFS-backed 
    2121      frontend nodes 
     22  * other changes: 
     23    * deprecate the mynetwork modification in Postfix, this is now left to the 
     24      admin 
    2225 
    2326 -- Antoine Beaupré <anarcat@koumbit.org>  Tue, 15 Apr 2008 11:52:56 -0400 

  • alternc/trunk/debian/templates

    r2314 r2317  
    149149 delimited by ';', optional. 
    150150 
    151 Template: alternc/mynetwork 
    152 Type: string 
    153 _Description: SMTP authorized networks: 
    154  IP addresses of the networks authorized in SMTP, space-delimited. 
    155  
    156151Template: alternc/pop_before_smtp_warning 
    157152Type: note 
    …… 
    338333 delimited by ';', optional. 
    339334 
    340 Template:alternc-slave/mynetwork 
    341 Type: string 
    342 _Description: SMTP authorized networks: 
    343  IP addresses of the networks authorized in SMTP, space-delimited. 
    344  
    345335Template:alternc-slave/pop_before_smtp_warning 
    346336Type: note 

  • alternc/trunk/etc/alternc/templates/postfix/main.cf

    r801 r2317  
    2424myhostname = %%fqdn%% 
    2525myorigin = %%fqdn%% 
    26 mynetworks = 127.0.0.1 %%mynetwork%% 
    2726 
    2827 

  • alternc/trunk/install/alternc.install

    r2305 r2317  
    137137s\\%%dbpwd%%\\$MYSQL_PASS\\; 
    138138s\\%%ALTERNC_LOC%%\\$ALTERNC_LOC\\; 
    139 s\\%%mynetwork%%\\$SMTP_RELAY_NETWORKS\\; 
    140139s\\%%warning_message%%\\$WARNING\\; 
    141140s\\%%fqdn_lettre%%\\$FQDN_LETTER\\;