diff options
| -rwxr-xr-x | bin/dhparam-gen.sh | 2 | ||||
| -rw-r--r-- | roles/clients/files/apache-casper-site.service | 2 | ||||
| -rw-r--r-- | roles/clients/files/php-fpm-casper-site.service | 2 | ||||
| -rw-r--r-- | roles/clients/tasks/config.yml | 3 | ||||
| -rw-r--r-- | roles/torrelay/templates/torrc.j2 | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/bin/dhparam-gen.sh b/bin/dhparam-gen.sh index 2f21a2a..a632f92 100755 --- a/bin/dhparam-gen.sh +++ b/bin/dhparam-gen.sh @@ -1,7 +1,7 @@ #!/usr/bin/bash -SERIAL="14" +SERIAL="16" MAXNEWFILE="1" SERVERHOST="blackbird falcon manchester sd-128718 sd-94125 sd-126263" diff --git a/roles/clients/files/apache-casper-site.service b/roles/clients/files/apache-casper-site.service index c7cb7b4..10def2e 100644 --- a/roles/clients/files/apache-casper-site.service +++ b/roles/clients/files/apache-casper-site.service @@ -11,7 +11,7 @@ ExecStart=/usr/bin/docker run -i -p 127.0.0.1:8101:80 \ -v /contener/%p/etc/pki/tls/certs:/etc/pki/tls/certs:Z \ -v /contener/%p/var/log/httpd:/var/log/httpd:Z \ -v /contener/php-fpm-casper-site/run/php-fpm:/run/php-fpm:z \ - apache-single:2.4.34-1 + apache-single:2.4.43-1 ExecReload=/usr/bin/kill -HUP $MAINPID KillSignal=SIGINT diff --git a/roles/clients/files/php-fpm-casper-site.service b/roles/clients/files/php-fpm-casper-site.service index 1508946..4bb5695 100644 --- a/roles/clients/files/php-fpm-casper-site.service +++ b/roles/clients/files/php-fpm-casper-site.service @@ -4,7 +4,7 @@ After=docker.service [Service] Restart=always -ExecStart=/usr/bin/docker run -i --dns 163.172.211.128 \ +ExecStart=/usr/bin/docker run -i --dns 192.168.7.1 \ -v /contener/%p/etc/php-fpm.d:/etc/php-fpm.d:Z \ -v /contener/%p/run/php-fpm:/run/php-fpm:z \ -v /contener/%p/var/log/php-fpm:/var/log/php-fpm:Z \ diff --git a/roles/clients/tasks/config.yml b/roles/clients/tasks/config.yml index e596b3e..5fa03d0 100644 --- a/roles/clients/tasks/config.yml +++ b/roles/clients/tasks/config.yml @@ -36,7 +36,7 @@ mode: 0644 with_nested: - [ 'apache', 'mariadb', 'memcached', 'php-fpm' ] - - [ 'casper-site', 'cirrus', 'jays-site' ] + - [ 'casper-site', 'jays-site' ] notify: reload systemd - name: Installation des variables credentials @@ -46,7 +46,6 @@ mode: 0400 loop: - casper-site - - cirrus - jays-site notify: reload systemd diff --git a/roles/torrelay/templates/torrc.j2 b/roles/torrelay/templates/torrc.j2 index f87785c..1178a67 100644 --- a/roles/torrelay/templates/torrc.j2 +++ b/roles/torrelay/templates/torrc.j2 @@ -50,8 +50,10 @@ RelayBandwidthBurst {{ bpburst }} {% if maxadvertised is defined %} MaxAdvertisedBandwidth {{ maxadvertised }} {% endif %} +{% if dirport is defined %} DirPortFrontPage /usr/local/share/tor/tor-exit-notice.html {% endif %} +{% endif %} ContactInfo {{ contactinfo }} |