From 2c855deda9245ea7e470fc4902225ae36974bdba Mon Sep 17 00:00:00 2001 From: Benjamin Renard Date: Wed, 7 Dec 2022 10:31:18 +0100 Subject: [PATCH] Test --- conf/.env | 6 +++--- conf/000-default.conf | 2 +- conf/awstats.dachs.conf | 4 ++-- conf/dachs-dockerfile | 4 ++-- conf/docker-compose.yml | 6 +++--- conf/gavo.rc | 6 +++--- conf/id_rsa-phamy.prive | 1 - conf/rsa.prive | 0 8 files changed, 14 insertions(+), 15 deletions(-) delete mode 100644 conf/id_rsa-phamy.prive create mode 100644 conf/rsa.prive diff --git a/conf/.env b/conf/.env index d8bf779..62279e6 100644 --- a/conf/.env +++ b/conf/.env @@ -1,6 +1,6 @@ # enter here all key = value you need to path in docker-compose.yaml file VERSION=10 -SERVER=voparis-tap-planeto +SERVER=cdpp-epntap # depot sans l'extension .git -GIT=voparis-tap-planeto -GITURL=https://gitlab.obspm.fr/phamy +GIT=cdpp-epn-tap-server +GITURL=https://gitlab.irap.omp.eu/CDPP/ diff --git a/conf/000-default.conf b/conf/000-default.conf index f9c5101..0437e29 100644 --- a/conf/000-default.conf +++ b/conf/000-default.conf @@ -4,7 +4,7 @@ # ************************************ - ServerAdmin pierre.lesidaner@obspm.fr + ServerAdmin benjamin.renard@irap.omp.eu ## Vhost docroot DocumentRoot "/var/www" ## Alias declarations for resources outside the DocumentRoot diff --git a/conf/awstats.dachs.conf b/conf/awstats.dachs.conf index f3b84ab..9c7ccdf 100644 --- a/conf/awstats.dachs.conf +++ b/conf/awstats.dachs.conf @@ -153,7 +153,7 @@ LogSeparator=" " # Example: "ftp.domain.com" # Example: "domain.com" # -SiteDomain="myserver.mydomain" +SiteDomain="cdpp-epntap.irap.omp.eu" # Enter here all other possible domain names, addresses or virtual host @@ -168,7 +168,7 @@ SiteDomain="myserver.mydomain" # Note: You can also use @/mypath/myfile if list of aliases are in a file. # Example: "www.myserver.com localhost 127.0.0.1 REGEX[mydomain\.(net|org)$]" # -HostAliases="localhost 127.0.0.1 myserver.mydomain mydomain" +HostAliases="localhost 127.0.0.1 cdpp-epntap.irap.omp.eu" # If you want to have hosts reported by name instead of ip address, AWStats diff --git a/conf/dachs-dockerfile b/conf/dachs-dockerfile index db484fa..314a0e8 100644 --- a/conf/dachs-dockerfile +++ b/conf/dachs-dockerfile @@ -37,12 +37,12 @@ RUN apt-get install -y git openssh-server openssh-client apache2 w3m net-tools v ### RUN mkdir -p /root/.ssh -RUN echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCx1IuqhW3UJmKWc6ODuhXu58CSdHGavVJaTUILUsR3ig359wRQ7GEpwXdk5dcTNOS16xVVx8KP7SEqsOOGRQ14jy2z3rJLZ0tRKzceCk1nXrFgipJ8qU0sFDc+dvXgJ94XvHlZzgQDT/iLeIZ6lhDEHn6O+EdfNf1g32LqIFXEe4fqRsKsM4ssYcHigdh3cdVDU350ACNxRrVEzCRE9lcGcfouwjSNMeWZO5SnCIzl7sOGJroYmL/c17P1YPIE1HzW3FjNI98FxJR2K/TmcUWJYDc7wDalN6HXyquoFsew7Sn/BZH0aprdaTLO1F820MTUIzcF/oKvhMd/Ihz355srm//a4PGQE7RDPdvPSjOr9KSiM/PU0GiARARex1AYl/a4CY5HnKeIs/sJfOADFJTpDcF7TSqKYq51JN1itWNmVMv8zZ/rfHMiEHKiDxLXZsflmdKPynHLI/Wk+uQqLNyORQ5MWJwKRGOp5haoCKxUtHPU68woVO1uk4FawXI0yLp84iXO7RJrr5MMas+Cjzv/azWA/K1WXOjiiWIqAoOHAYKWS2embavVHgIpbK/0wn8q5BF18QBOlqlpkBICOLTXpBLB+tAjmw998nYMF5PKI8synjzHGytd79OtrphO+ADWrCQuWDSxqkzbisJUMn3m1a4Z5CaaX1kjIL0P4RlvLw== phamy" >> /root/.ssh/authorized_keys +RUN echo "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL8LvPlnTGHhoqSARTPjjlxxHJPJ9oS+vvx7TmpC51e4 GitLab OBSPM" >> /root/.ssh/authorized_keys RUN chmod 700 /root/.ssh RUN chmod 600 /root/.ssh/authorized_keys RUN mkdir -p /home/dachsroot/.ssh -RUN echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCx1IuqhW3UJmKWc6ODuhXu58CSdHGavVJaTUILUsR3ig359wRQ7GEpwXdk5dcTNOS16xVVx8KP7SEqsOOGRQ14jy2z3rJLZ0tRKzceCk1nXrFgipJ8qU0sFDc+dvXgJ94XvHlZzgQDT/iLeIZ6lhDEHn6O+EdfNf1g32LqIFXEe4fqRsKsM4ssYcHigdh3cdVDU350ACNxRrVEzCRE9lcGcfouwjSNMeWZO5SnCIzl7sOGJroYmL/c17P1YPIE1HzW3FjNI98FxJR2K/TmcUWJYDc7wDalN6HXyquoFsew7Sn/BZH0aprdaTLO1F820MTUIzcF/oKvhMd/Ihz355srm//a4PGQE7RDPdvPSjOr9KSiM/PU0GiARARex1AYl/a4CY5HnKeIs/sJfOADFJTpDcF7TSqKYq51JN1itWNmVMv8zZ/rfHMiEHKiDxLXZsflmdKPynHLI/Wk+uQqLNyORQ5MWJwKRGOp5haoCKxUtHPU68woVO1uk4FawXI0yLp84iXO7RJrr5MMas+Cjzv/azWA/K1WXOjiiWIqAoOHAYKWS2embavVHgIpbK/0wn8q5BF18QBOlqlpkBICOLTXpBLB+tAjmw998nYMF5PKI8synjzHGytd79OtrphO+ADWrCQuWDSxqkzbisJUMn3m1a4Z5CaaX1kjIL0P4RlvLw== phamy" >> /home/dachsroot/.ssh/authorized_keys +RUN echo "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL8LvPlnTGHhoqSARTPjjlxxHJPJ9oS+vvx7TmpC51e4 GitLab OBSPM" >> /home/dachsroot/.ssh/authorized_keys RUN chmod 700 /home/dachsroot/.ssh RUN chmod 600 /home/dachsroot/.ssh/authorized_keys RUN chown dachsroot:gavo -R /home/dachsroot/.ssh diff --git a/conf/docker-compose.yml b/conf/docker-compose.yml index d21a159..1d0996c 100644 --- a/conf/docker-compose.yml +++ b/conf/docker-compose.yml @@ -2,8 +2,8 @@ version: "3.7" services: dachs: - container_name: dachs-voparis - image: dachs-voparis + container_name: dachs-cdpp + image: dachs-cdpp tty: true expose: - "80" @@ -26,4 +26,4 @@ services: secrets: id_rsa: - file: id_rsa-phamy.prive + file: rsa.prive diff --git a/conf/gavo.rc b/conf/gavo.rc index 05a67fe..07b098b 100644 --- a/conf/gavo.rc +++ b/conf/gavo.rc @@ -1,13 +1,13 @@ [general] rootDir: /var/gavo -maintainerAddress: pierre.lesidaner@obspm.fr +maintainerAddress: benjamin.renard@irap.omp.eu [web] bindAddress: serverPort: 80 #serverURL: http://145.238.197.199:81 serverURL: http://127.0.0.1:80 -sitename: portablelp +sitename: CDPP EPN-TAP server corsOriginPat: http.* logFormat: combined [ivoa] -authority: vopdc.obspm +authority: cdpp diff --git a/conf/id_rsa-phamy.prive b/conf/id_rsa-phamy.prive deleted file mode 100644 index 8b13789..0000000 --- a/conf/id_rsa-phamy.prive +++ /dev/null @@ -1 +0,0 @@ - diff --git a/conf/rsa.prive b/conf/rsa.prive new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/conf/rsa.prive -- libgit2 0.21.2